diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/smp.c | 1 | ||||
-rw-r--r-- | arch/ppc/kernel/idle.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/cpu.c | 4 | ||||
-rw-r--r-- | arch/sparc/kernel/pcic.c | 2 | ||||
-rw-r--r-- | arch/sparc/mm/fault.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/cpu.c | 4 | ||||
-rw-r--r-- | arch/sparc64/kernel/ioctl32.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/sbus.c | 2 | ||||
-rw-r--r-- | arch/sparc64/mm/fault.c | 2 |
9 files changed, 8 insertions, 13 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 5c330c3366e4..36d67a8d7cbb 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
@@ -510,6 +510,7 @@ int __devinit start_secondary(void *unused) | |||
510 | 510 | ||
511 | smp_store_cpu_info(cpu); | 511 | smp_store_cpu_info(cpu); |
512 | set_dec(tb_ticks_per_jiffy); | 512 | set_dec(tb_ticks_per_jiffy); |
513 | preempt_disable(); | ||
513 | cpu_callin_map[cpu] = 1; | 514 | cpu_callin_map[cpu] = 1; |
514 | 515 | ||
515 | smp_ops->setup_cpu(cpu); | 516 | smp_ops->setup_cpu(cpu); |
diff --git a/arch/ppc/kernel/idle.c b/arch/ppc/kernel/idle.c index 3c4e4cb61074..821a75e45602 100644 --- a/arch/ppc/kernel/idle.c +++ b/arch/ppc/kernel/idle.c | |||
@@ -63,7 +63,7 @@ void cpu_idle(void) | |||
63 | int cpu = smp_processor_id(); | 63 | int cpu = smp_processor_id(); |
64 | 64 | ||
65 | for (;;) { | 65 | for (;;) { |
66 | while (need_resched()) { | 66 | while (!need_resched()) { |
67 | if (ppc_md.idle != NULL) | 67 | if (ppc_md.idle != NULL) |
68 | ppc_md.idle(); | 68 | ppc_md.idle(); |
69 | else | 69 | else |
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c index 6a4ebc62193e..d7bfc61d2879 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c | |||
@@ -75,7 +75,7 @@ struct cpu_fp_info linux_sparc_fpu[] = { | |||
75 | { 9, 3, "Fujitsu or Weitek on-chip FPU"}, | 75 | { 9, 3, "Fujitsu or Weitek on-chip FPU"}, |
76 | }; | 76 | }; |
77 | 77 | ||
78 | #define NSPARCFPU (sizeof(linux_sparc_fpu)/sizeof(struct cpu_fp_info)) | 78 | #define NSPARCFPU ARRAY_SIZE(linux_sparc_fpu) |
79 | 79 | ||
80 | struct cpu_iu_info linux_sparc_chips[] = { | 80 | struct cpu_iu_info linux_sparc_chips[] = { |
81 | /* Sun4/100, 4/200, SLC */ | 81 | /* Sun4/100, 4/200, SLC */ |
@@ -120,7 +120,7 @@ struct cpu_iu_info linux_sparc_chips[] = { | |||
120 | { 0xf, 0, "UNKNOWN CPU-VENDOR/TYPE"}, | 120 | { 0xf, 0, "UNKNOWN CPU-VENDOR/TYPE"}, |
121 | }; | 121 | }; |
122 | 122 | ||
123 | #define NSPARCCHIPS (sizeof(linux_sparc_chips)/sizeof(struct cpu_iu_info)) | 123 | #define NSPARCCHIPS ARRAY_SIZE(linux_sparc_chips) |
124 | 124 | ||
125 | char *sparc_cpu_type; | 125 | char *sparc_cpu_type; |
126 | char *sparc_fpu_type; | 126 | char *sparc_fpu_type; |
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 25e31d5ec99b..cccfc12802ed 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
@@ -143,7 +143,7 @@ static struct pcic_ca2irq pcic_i_jk[] = { | |||
143 | * as several PROMs may be installed on the same physical board. | 143 | * as several PROMs may be installed on the same physical board. |
144 | */ | 144 | */ |
145 | #define SN2L_INIT(name, map) \ | 145 | #define SN2L_INIT(name, map) \ |
146 | { name, map, sizeof(map)/sizeof(struct pcic_ca2irq) } | 146 | { name, map, ARRAY_SIZE(map) } |
147 | 147 | ||
148 | static struct pcic_sn2list pcic_known_sysnames[] = { | 148 | static struct pcic_sn2list pcic_known_sysnames[] = { |
149 | SN2L_INIT("SUNW,JavaEngine1", pcic_i_je1a), /* JE1, PROM 2.32 */ | 149 | SN2L_INIT("SUNW,JavaEngine1", pcic_i_je1a), /* JE1, PROM 2.32 */ |
diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c index 2bbd53f3cafb..9eeed3347df3 100644 --- a/arch/sparc/mm/fault.c +++ b/arch/sparc/mm/fault.c | |||
@@ -33,8 +33,6 @@ | |||
33 | #include <asm/kdebug.h> | 33 | #include <asm/kdebug.h> |
34 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
35 | 35 | ||
36 | #define ELEMENTS(arr) (sizeof (arr)/sizeof (arr[0])) | ||
37 | |||
38 | extern int prom_node_root; | 36 | extern int prom_node_root; |
39 | 37 | ||
40 | /* At boot time we determine these two values necessary for setting | 38 | /* At boot time we determine these two values necessary for setting |
diff --git a/arch/sparc64/kernel/cpu.c b/arch/sparc64/kernel/cpu.c index 77ef5df4e5a7..00eed88ef2e8 100644 --- a/arch/sparc64/kernel/cpu.c +++ b/arch/sparc64/kernel/cpu.c | |||
@@ -43,7 +43,7 @@ struct cpu_fp_info linux_sparc_fpu[] = { | |||
43 | { 0x3e, 0x22, 0, "UltraSparc IIIi+ integrated FPU"}, | 43 | { 0x3e, 0x22, 0, "UltraSparc IIIi+ integrated FPU"}, |
44 | }; | 44 | }; |
45 | 45 | ||
46 | #define NSPARCFPU (sizeof(linux_sparc_fpu)/sizeof(struct cpu_fp_info)) | 46 | #define NSPARCFPU ARRAY_SIZE(linux_sparc_fpu) |
47 | 47 | ||
48 | struct cpu_iu_info linux_sparc_chips[] = { | 48 | struct cpu_iu_info linux_sparc_chips[] = { |
49 | { 0x17, 0x10, "TI UltraSparc I (SpitFire)"}, | 49 | { 0x17, 0x10, "TI UltraSparc I (SpitFire)"}, |
@@ -59,7 +59,7 @@ struct cpu_iu_info linux_sparc_chips[] = { | |||
59 | { 0x3e, 0x22, "TI UltraSparc IIIi+ (Serrano)"}, | 59 | { 0x3e, 0x22, "TI UltraSparc IIIi+ (Serrano)"}, |
60 | }; | 60 | }; |
61 | 61 | ||
62 | #define NSPARCCHIPS (sizeof(linux_sparc_chips)/sizeof(struct cpu_iu_info)) | 62 | #define NSPARCCHIPS ARRAY_SIZE(linux_sparc_chips) |
63 | 63 | ||
64 | char *sparc_cpu_type = "cpu-oops"; | 64 | char *sparc_cpu_type = "cpu-oops"; |
65 | char *sparc_fpu_type = "fpu-oops"; | 65 | char *sparc_fpu_type = "fpu-oops"; |
diff --git a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c index c2e96daa5ab3..e62214354bb5 100644 --- a/arch/sparc64/kernel/ioctl32.c +++ b/arch/sparc64/kernel/ioctl32.c | |||
@@ -114,8 +114,6 @@ COMPATIBLE_IOCTL(FBIOGCURPOS) | |||
114 | COMPATIBLE_IOCTL(FBIOGCURMAX) | 114 | COMPATIBLE_IOCTL(FBIOGCURMAX) |
115 | /* Little k */ | 115 | /* Little k */ |
116 | /* Little v, the video4linux ioctls */ | 116 | /* Little v, the video4linux ioctls */ |
117 | COMPATIBLE_IOCTL(_IOR('p', 20, int[7])) /* RTCGET */ | ||
118 | COMPATIBLE_IOCTL(_IOW('p', 21, int[7])) /* RTCSET */ | ||
119 | /* And these ioctls need translation */ | 117 | /* And these ioctls need translation */ |
120 | /* Note SIOCRTMSG is no longer, so this is safe and * the user would have seen just an -EINVAL anyways. */ | 118 | /* Note SIOCRTMSG is no longer, so this is safe and * the user would have seen just an -EINVAL anyways. */ |
121 | HANDLE_IOCTL(FBIOPUTCMAP32, fbiogetputcmap) | 119 | HANDLE_IOCTL(FBIOPUTCMAP32, fbiogetputcmap) |
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index e09ddf927655..96b825055668 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c | |||
@@ -790,7 +790,7 @@ static unsigned long sysio_irq_offsets[] = { | |||
790 | 790 | ||
791 | #undef bogon | 791 | #undef bogon |
792 | 792 | ||
793 | #define NUM_SYSIO_OFFSETS (sizeof(sysio_irq_offsets) / sizeof(sysio_irq_offsets[0])) | 793 | #define NUM_SYSIO_OFFSETS ARRAY_SIZE(sysio_irq_offsets) |
794 | 794 | ||
795 | /* Convert Interrupt Mapping register pointer to associated | 795 | /* Convert Interrupt Mapping register pointer to associated |
796 | * Interrupt Clear register pointer, SYSIO specific version. | 796 | * Interrupt Clear register pointer, SYSIO specific version. |
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index 3be278d916db..6f0539aa44d0 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c | |||
@@ -30,8 +30,6 @@ | |||
30 | #include <asm/sections.h> | 30 | #include <asm/sections.h> |
31 | #include <asm/kdebug.h> | 31 | #include <asm/kdebug.h> |
32 | 32 | ||
33 | #define ELEMENTS(arr) (sizeof (arr)/sizeof (arr[0])) | ||
34 | |||
35 | /* | 33 | /* |
36 | * To debug kernel to catch accesses to certain virtual/physical addresses. | 34 | * To debug kernel to catch accesses to certain virtual/physical addresses. |
37 | * Mode = 0 selects physical watchpoints, mode = 1 selects virtual watchpoints. | 35 | * Mode = 0 selects physical watchpoints, mode = 1 selects virtual watchpoints. |