git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sparc64
/
prom
/
p1275.c
diff --git
a/arch/sparc64/prom/p1275.c
b/arch/sparc64/prom/p1275.c
index
9eab442
..
2b32c48
100644
(file)
--- a/
arch/sparc64/prom/p1275.c
+++ b/
arch/sparc64/prom/p1275.c
@@
-36,21
+36,15
@@
extern void prom_cif_callback(void);
*/
DEFINE_SPINLOCK(prom_entry_lock);
*/
DEFINE_SPINLOCK(prom_entry_lock);
-long p1275_cmd
(
char *service, long fmt, ...)
+long p1275_cmd
(const
char *service, long fmt, ...)
{
char *p, *q;
unsigned long flags;
int nargs, nrets, i;
va_list list;
long attrs, x;
{
char *p, *q;
unsigned long flags;
int nargs, nrets, i;
va_list list;
long attrs, x;
- long ctx = 0;
p = p1275buf.prom_buffer;
p = p1275buf.prom_buffer;
- ctx = spitfire_get_primary_context ();
- if (ctx) {
- flushw_user ();
- spitfire_set_primary_context (0);
- }
spin_lock_irqsave(&prom_entry_lock, flags);
spin_lock_irqsave(&prom_entry_lock, flags);
@@
-146,9
+140,6
@@
long p1275_cmd (char *service, long fmt, ...)
spin_unlock_irqrestore(&prom_entry_lock, flags);
spin_unlock_irqrestore(&prom_entry_lock, flags);
- if (ctx)
- spitfire_set_primary_context (ctx);
-
return x;
}
return x;
}