diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 23:28:01 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 23:28:01 -0400 |
commit | c111d0bda8437d146ccf5101970801fe4ff23ed8 (patch) | |
tree | 3d4a3f0a5b11e2cddfa1f35560a720fe043440ec /arch/ppc64 | |
parent | 7b875f4dc345dc5f6a2c3bd0e1f90bfee46b2258 (diff) |
powerpc: move more iSeries code
Move the iSeries specific parts of misc.S and ppc_ksyms.c
into powerpc/platforms/iseries.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/ppc64')
-rw-r--r-- | arch/ppc64/kernel/misc.S | 38 | ||||
-rw-r--r-- | arch/ppc64/kernel/ppc_ksyms.c | 20 |
2 files changed, 0 insertions, 58 deletions
diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S index a25b59759ddb..d069bbd7f81f 100644 --- a/arch/ppc64/kernel/misc.S +++ b/arch/ppc64/kernel/misc.S | |||
@@ -64,44 +64,6 @@ _GLOBAL(get_srr1) | |||
64 | _GLOBAL(get_sp) | 64 | _GLOBAL(get_sp) |
65 | mr r3,r1 | 65 | mr r3,r1 |
66 | blr | 66 | blr |
67 | |||
68 | #ifdef CONFIG_PPC_ISERIES | ||
69 | /* unsigned long local_save_flags(void) */ | ||
70 | _GLOBAL(local_get_flags) | ||
71 | lbz r3,PACAPROCENABLED(r13) | ||
72 | blr | ||
73 | |||
74 | /* unsigned long local_irq_disable(void) */ | ||
75 | _GLOBAL(local_irq_disable) | ||
76 | lbz r3,PACAPROCENABLED(r13) | ||
77 | li r4,0 | ||
78 | stb r4,PACAPROCENABLED(r13) | ||
79 | blr /* Done */ | ||
80 | |||
81 | /* void local_irq_restore(unsigned long flags) */ | ||
82 | _GLOBAL(local_irq_restore) | ||
83 | lbz r5,PACAPROCENABLED(r13) | ||
84 | /* Check if things are setup the way we want _already_. */ | ||
85 | cmpw 0,r3,r5 | ||
86 | beqlr | ||
87 | /* are we enabling interrupts? */ | ||
88 | cmpdi 0,r3,0 | ||
89 | stb r3,PACAPROCENABLED(r13) | ||
90 | beqlr | ||
91 | /* Check pending interrupts */ | ||
92 | /* A decrementer, IPI or PMC interrupt may have occurred | ||
93 | * while we were in the hypervisor (which enables) */ | ||
94 | ld r4,PACALPPACA+LPPACAANYINT(r13) | ||
95 | cmpdi r4,0 | ||
96 | beqlr | ||
97 | |||
98 | /* | ||
99 | * Handle pending interrupts in interrupt context | ||
100 | */ | ||
101 | li r0,0x5555 | ||
102 | sc | ||
103 | blr | ||
104 | #endif /* CONFIG_PPC_ISERIES */ | ||
105 | 67 | ||
106 | #ifdef CONFIG_IRQSTACKS | 68 | #ifdef CONFIG_IRQSTACKS |
107 | _GLOBAL(call_do_softirq) | 69 | _GLOBAL(call_do_softirq) |
diff --git a/arch/ppc64/kernel/ppc_ksyms.c b/arch/ppc64/kernel/ppc_ksyms.c index 705742f4eec6..84006e26342c 100644 --- a/arch/ppc64/kernel/ppc_ksyms.c +++ b/arch/ppc64/kernel/ppc_ksyms.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <asm/hw_irq.h> | 19 | #include <asm/hw_irq.h> |
20 | #include <asm/abs_addr.h> | 20 | #include <asm/abs_addr.h> |
21 | #include <asm/cacheflush.h> | 21 | #include <asm/cacheflush.h> |
22 | #include <asm/iSeries/HvCallSc.h> | ||
23 | 22 | ||
24 | EXPORT_SYMBOL(strcpy); | 23 | EXPORT_SYMBOL(strcpy); |
25 | EXPORT_SYMBOL(strncpy); | 24 | EXPORT_SYMBOL(strncpy); |
@@ -46,17 +45,6 @@ EXPORT_SYMBOL(__strnlen_user); | |||
46 | 45 | ||
47 | EXPORT_SYMBOL(reloc_offset); | 46 | EXPORT_SYMBOL(reloc_offset); |
48 | 47 | ||
49 | #ifdef CONFIG_PPC_ISERIES | ||
50 | EXPORT_SYMBOL(HvCall0); | ||
51 | EXPORT_SYMBOL(HvCall1); | ||
52 | EXPORT_SYMBOL(HvCall2); | ||
53 | EXPORT_SYMBOL(HvCall3); | ||
54 | EXPORT_SYMBOL(HvCall4); | ||
55 | EXPORT_SYMBOL(HvCall5); | ||
56 | EXPORT_SYMBOL(HvCall6); | ||
57 | EXPORT_SYMBOL(HvCall7); | ||
58 | #endif | ||
59 | |||
60 | EXPORT_SYMBOL(_insb); | 48 | EXPORT_SYMBOL(_insb); |
61 | EXPORT_SYMBOL(_outsb); | 49 | EXPORT_SYMBOL(_outsb); |
62 | EXPORT_SYMBOL(_insw); | 50 | EXPORT_SYMBOL(_insw); |
@@ -77,14 +65,6 @@ EXPORT_SYMBOL(giveup_altivec); | |||
77 | EXPORT_SYMBOL(__flush_icache_range); | 65 | EXPORT_SYMBOL(__flush_icache_range); |
78 | EXPORT_SYMBOL(flush_dcache_range); | 66 | EXPORT_SYMBOL(flush_dcache_range); |
79 | 67 | ||
80 | #ifdef CONFIG_SMP | ||
81 | #ifdef CONFIG_PPC_ISERIES | ||
82 | EXPORT_SYMBOL(local_get_flags); | ||
83 | EXPORT_SYMBOL(local_irq_disable); | ||
84 | EXPORT_SYMBOL(local_irq_restore); | ||
85 | #endif | ||
86 | #endif | ||
87 | |||
88 | EXPORT_SYMBOL(memcpy); | 68 | EXPORT_SYMBOL(memcpy); |
89 | EXPORT_SYMBOL(memset); | 69 | EXPORT_SYMBOL(memset); |
90 | EXPORT_SYMBOL(memmove); | 70 | EXPORT_SYMBOL(memmove); |