aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYoann Padioleau <padator@wanadoo.fr>2007-06-08 16:46:48 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-08 20:23:33 -0400
commita17627ef8833ac30622a7b39b7be390e1b174405 (patch)
tree536eb5292376473627d704ea2281239a1ab5b4fa /arch
parent3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80 (diff)
potential parse error in ifdef part 3
Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs. Signed-off-by: Yoann Padioleau <padator@wanadoo.fr> Cc: Andi Kleen <ak@suse.de> Cc: Paul Mackerras <paulus@samba.org> Acked-by: Paul Mundt <lethal@linux-sh.org> Cc: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/math-emu/fpu_entry.c2
-rw-r--r--arch/ppc/syslib/qspan_pci.c4
-rw-r--r--arch/sh64/kernel/pci_sh5.c8
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/i386/math-emu/fpu_entry.c b/arch/i386/math-emu/fpu_entry.c
index ddf8fa3bbd01..1853524c8b57 100644
--- a/arch/i386/math-emu/fpu_entry.c
+++ b/arch/i386/math-emu/fpu_entry.c
@@ -754,7 +754,7 @@ int save_i387_soft(void *s387, struct _fpstate __user * buf)
754 return -1; 754 return -1;
755 if ( offset ) 755 if ( offset )
756 if (__copy_to_user(d+other, (u_char *)&S387->st_space, offset)) 756 if (__copy_to_user(d+other, (u_char *)&S387->st_space, offset))
757 return -1 757 return -1;
758 RE_ENTRANT_CHECK_ON; 758 RE_ENTRANT_CHECK_ON;
759 759
760 return 1; 760 return 1;
diff --git a/arch/ppc/syslib/qspan_pci.c b/arch/ppc/syslib/qspan_pci.c
index 85053b2816a9..7a97c7440b30 100644
--- a/arch/ppc/syslib/qspan_pci.c
+++ b/arch/ppc/syslib/qspan_pci.c
@@ -365,13 +365,13 @@ int qspan_pcibios_find_class(unsigned int class_code, unsigned short index,
365} 365}
366 366
367void __init 367void __init
368m8xx_pcibios_fixup(void)) 368m8xx_pcibios_fixup(void)
369{ 369{
370 /* Lots to do here, all board and configuration specific. */ 370 /* Lots to do here, all board and configuration specific. */
371} 371}
372 372
373void __init 373void __init
374m8xx_setup_pci_ptrs(void)) 374m8xx_setup_pci_ptrs(void)
375{ 375{
376 set_config_access_method(qspan); 376 set_config_access_method(qspan);
377 377
diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c
index fb51660847c8..3334f99b5835 100644
--- a/arch/sh64/kernel/pci_sh5.c
+++ b/arch/sh64/kernel/pci_sh5.c
@@ -521,10 +521,10 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
521 bus->resource[0]->start = PCIBIOS_MIN_IO; 521 bus->resource[0]->start = PCIBIOS_MIN_IO;
522 bus->resource[1]->start = PCIBIOS_MIN_MEM; 522 bus->resource[1]->start = PCIBIOS_MIN_MEM;
523#else 523#else
524 bus->resource[0]->end = 0 524 bus->resource[0]->end = 0;
525 bus->resource[1]->end = 0 525 bus->resource[1]->end = 0;
526 bus->resource[0]->start =0 526 bus->resource[0]->start =0;
527 bus->resource[1]->start = 0; 527 bus->resource[1]->start = 0;
528#endif 528#endif
529 /* Turn off downstream PF memory address range by default */ 529 /* Turn off downstream PF memory address range by default */
530 bus->resource[2]->start = 1024*1024; 530 bus->resource[2]->start = 1024*1024;