diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 03:58:53 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-16 07:04:58 -0400 |
commit | 27a2ef382c7935a4dd02bff9fd361ce118df98c6 (patch) | |
tree | 046a77f2b63e89222f44b536082e30c73a160e7f /arch/sparc64/kernel/ds.c | |
parent | 8f3fff205071dc1bd3203a0f6a5bf3b30e68e26f (diff) |
[SPARC64]: SMP build fixes.
With the move of ldom_startcpu_cpuid() into smp.c some other
things need to follow along:
1) smp.c is not a driver so we can't use "PFX" macro in the
printk calls.
2) smp.c now needs asm/io.h and asm/hvtramp.h, ds.c no longer
does
3) kimage_addr_to_ra() also needs to move into smp.c
While we're here, update copyright info and my email address
in smp.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/ds.c')
-rw-r--r-- | arch/sparc64/kernel/ds.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c index 2e4114fba142..0cb96dc399b7 100644 --- a/arch/sparc64/kernel/ds.c +++ b/arch/sparc64/kernel/ds.c | |||
@@ -20,8 +20,6 @@ | |||
20 | #include <asm/power.h> | 20 | #include <asm/power.h> |
21 | #include <asm/mdesc.h> | 21 | #include <asm/mdesc.h> |
22 | #include <asm/head.h> | 22 | #include <asm/head.h> |
23 | #include <asm/io.h> | ||
24 | #include <asm/hvtramp.h> | ||
25 | 23 | ||
26 | #define DRV_MODULE_NAME "ds" | 24 | #define DRV_MODULE_NAME "ds" |
27 | #define PFX DRV_MODULE_NAME ": " | 25 | #define PFX DRV_MODULE_NAME ": " |
@@ -392,14 +390,6 @@ struct dr_cpu_resp_entry { | |||
392 | __u32 str_off; | 390 | __u32 str_off; |
393 | }; | 391 | }; |
394 | 392 | ||
395 | /* XXX Put this in some common place. XXX */ | ||
396 | static unsigned long kimage_addr_to_ra(void *p) | ||
397 | { | ||
398 | unsigned long val = (unsigned long) p; | ||
399 | |||
400 | return kern_base + (val - KERNBASE); | ||
401 | } | ||
402 | |||
403 | /* DR cpu requests get queued onto the work list by the | 393 | /* DR cpu requests get queued onto the work list by the |
404 | * dr_cpu_data() callback. The list is protected by | 394 | * dr_cpu_data() callback. The list is protected by |
405 | * ds_lock, and processed by dr_cpu_process() in order. | 395 | * ds_lock, and processed by dr_cpu_process() in order. |