diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mm/Kconfig | 2 | ||||
-rw-r--r-- | arch/cris/arch-v10/drivers/pcf8563.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/pcf8563.c | 2 | ||||
-rw-r--r-- | arch/i386/boot/compressed/relocs.c | 9 | ||||
-rw-r--r-- | arch/i386/kernel/topology.c | 2 | ||||
-rw-r--r-- | arch/i386/oprofile/nmi_int.c | 14 | ||||
-rw-r--r-- | arch/ia64/kernel/perfmon.c | 2 | ||||
-rw-r--r-- | arch/m32r/lib/usercopy.c | 4 | ||||
-rw-r--r-- | arch/m68knommu/platform/5307/timers.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/machine_kexec.c | 4 | ||||
-rw-r--r-- | arch/parisc/kernel/topology.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/rtas.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/numa.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2/clock-sh7619.c | 4 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/clock-sh7206.c | 4 | ||||
-rw-r--r-- | arch/v850/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/time.c | 2 |
18 files changed, 32 insertions, 31 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8bf97e0eacdb..4409561ea32c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -427,7 +427,7 @@ source arch/arm/mm/Kconfig | |||
427 | 427 | ||
428 | config IWMMXT | 428 | config IWMMXT |
429 | bool "Enable iWMMXt support" | 429 | bool "Enable iWMMXt support" |
430 | depends CPU_XSCALE || CPU_XSC3 | 430 | depends on CPU_XSCALE || CPU_XSC3 |
431 | default y if PXA27x | 431 | default y if PXA27x |
432 | help | 432 | help |
433 | Enable support for iWMMXt context switching at run time if | 433 | Enable support for iWMMXt context switching at run time if |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 4b277199d0e8..e684e9b38216 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -525,7 +525,7 @@ config CPU_BIG_ENDIAN | |||
525 | of your chipset/board/processor. | 525 | of your chipset/board/processor. |
526 | 526 | ||
527 | config CPU_HIGH_VECTOR | 527 | config CPU_HIGH_VECTOR |
528 | depends !MMU && CPU_CP15 && !CPU_ARM740T | 528 | depends on !MMU && CPU_CP15 && !CPU_ARM740T |
529 | bool "Select the High exception vector" | 529 | bool "Select the High exception vector" |
530 | default n | 530 | default n |
531 | help | 531 | help |
diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c index 107796e50149..d47cfbf98d6e 100644 --- a/arch/cris/arch-v10/drivers/pcf8563.c +++ b/arch/cris/arch-v10/drivers/pcf8563.c | |||
@@ -311,7 +311,7 @@ pcf8563_register(void) | |||
311 | { | 311 | { |
312 | pcf8563_init(); | 312 | pcf8563_init(); |
313 | if (register_chrdev(PCF8563_MAJOR, DEVICE_NAME, &pcf8563_fops) < 0) { | 313 | if (register_chrdev(PCF8563_MAJOR, DEVICE_NAME, &pcf8563_fops) < 0) { |
314 | printk(KERN_INFO "%s: Unable to get major numer %d for RTC device.\n", | 314 | printk(KERN_INFO "%s: Unable to get major number %d for RTC device.\n", |
315 | PCF8563_NAME, PCF8563_MAJOR); | 315 | PCF8563_NAME, PCF8563_MAJOR); |
316 | return -1; | 316 | return -1; |
317 | } | 317 | } |
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c index 544ab0179411..24b919b3821a 100644 --- a/arch/cris/arch-v32/drivers/pcf8563.c +++ b/arch/cris/arch-v32/drivers/pcf8563.c | |||
@@ -171,7 +171,7 @@ pcf8563_init(void) | |||
171 | goto err; | 171 | goto err; |
172 | 172 | ||
173 | if (register_chrdev(PCF8563_MAJOR, DEVICE_NAME, &pcf8563_fops) < 0) { | 173 | if (register_chrdev(PCF8563_MAJOR, DEVICE_NAME, &pcf8563_fops) < 0) { |
174 | printk(KERN_INFO "%s: Unable to get major numer %d for RTC device.\n", | 174 | printk(KERN_INFO "%s: Unable to get major number %d for RTC device.\n", |
175 | PCF8563_NAME, PCF8563_MAJOR); | 175 | PCF8563_NAME, PCF8563_MAJOR); |
176 | return -1; | 176 | return -1; |
177 | } | 177 | } |
diff --git a/arch/i386/boot/compressed/relocs.c b/arch/i386/boot/compressed/relocs.c index 881951ca03e1..ce4fda261aaf 100644 --- a/arch/i386/boot/compressed/relocs.c +++ b/arch/i386/boot/compressed/relocs.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <endian.h> | 11 | #include <endian.h> |
12 | 12 | ||
13 | #define MAX_SHDRS 100 | 13 | #define MAX_SHDRS 100 |
14 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) | ||
14 | static Elf32_Ehdr ehdr; | 15 | static Elf32_Ehdr ehdr; |
15 | static Elf32_Shdr shdr[MAX_SHDRS]; | 16 | static Elf32_Shdr shdr[MAX_SHDRS]; |
16 | static Elf32_Sym *symtab[MAX_SHDRS]; | 17 | static Elf32_Sym *symtab[MAX_SHDRS]; |
@@ -71,7 +72,7 @@ static const char *sym_type(unsigned type) | |||
71 | #undef SYM_TYPE | 72 | #undef SYM_TYPE |
72 | }; | 73 | }; |
73 | const char *name = "unknown sym type name"; | 74 | const char *name = "unknown sym type name"; |
74 | if (type < sizeof(type_name)/sizeof(type_name[0])) { | 75 | if (type < ARRAY_SIZE(type_name)) { |
75 | name = type_name[type]; | 76 | name = type_name[type]; |
76 | } | 77 | } |
77 | return name; | 78 | return name; |
@@ -87,7 +88,7 @@ static const char *sym_bind(unsigned bind) | |||
87 | #undef SYM_BIND | 88 | #undef SYM_BIND |
88 | }; | 89 | }; |
89 | const char *name = "unknown sym bind name"; | 90 | const char *name = "unknown sym bind name"; |
90 | if (bind < sizeof(bind_name)/sizeof(bind_name[0])) { | 91 | if (bind < ARRAY_SIZE(bind_name)) { |
91 | name = bind_name[bind]; | 92 | name = bind_name[bind]; |
92 | } | 93 | } |
93 | return name; | 94 | return name; |
@@ -104,7 +105,7 @@ static const char *sym_visibility(unsigned visibility) | |||
104 | #undef SYM_VISIBILITY | 105 | #undef SYM_VISIBILITY |
105 | }; | 106 | }; |
106 | const char *name = "unknown sym visibility name"; | 107 | const char *name = "unknown sym visibility name"; |
107 | if (visibility < sizeof(visibility_name)/sizeof(visibility_name[0])) { | 108 | if (visibility < ARRAY_SIZE(visibility_name)) { |
108 | name = visibility_name[visibility]; | 109 | name = visibility_name[visibility]; |
109 | } | 110 | } |
110 | return name; | 111 | return name; |
@@ -128,7 +129,7 @@ static const char *rel_type(unsigned type) | |||
128 | #undef REL_TYPE | 129 | #undef REL_TYPE |
129 | }; | 130 | }; |
130 | const char *name = "unknown type rel type name"; | 131 | const char *name = "unknown type rel type name"; |
131 | if (type < sizeof(type_name)/sizeof(type_name[0])) { | 132 | if (type < ARRAY_SIZE(type_name)) { |
132 | name = type_name[type]; | 133 | name = type_name[type]; |
133 | } | 134 | } |
134 | return name; | 135 | return name; |
diff --git a/arch/i386/kernel/topology.c b/arch/i386/kernel/topology.c index 79cf608e14ca..45782356a618 100644 --- a/arch/i386/kernel/topology.c +++ b/arch/i386/kernel/topology.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/i386/kernel/topology.c - Populate driverfs with topology information | 2 | * arch/i386/kernel/topology.c - Populate sysfs with topology information |
3 | * | 3 | * |
4 | * Written by: Matthew Dobson, IBM Corporation | 4 | * Written by: Matthew Dobson, IBM Corporation |
5 | * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL | 5 | * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL |
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c index 3700eef78743..8fda7be9dd4d 100644 --- a/arch/i386/oprofile/nmi_int.c +++ b/arch/i386/oprofile/nmi_int.c | |||
@@ -63,7 +63,7 @@ static struct sys_device device_oprofile = { | |||
63 | }; | 63 | }; |
64 | 64 | ||
65 | 65 | ||
66 | static int __init init_driverfs(void) | 66 | static int __init init_sysfs(void) |
67 | { | 67 | { |
68 | int error; | 68 | int error; |
69 | if (!(error = sysdev_class_register(&oprofile_sysclass))) | 69 | if (!(error = sysdev_class_register(&oprofile_sysclass))) |
@@ -72,15 +72,15 @@ static int __init init_driverfs(void) | |||
72 | } | 72 | } |
73 | 73 | ||
74 | 74 | ||
75 | static void exit_driverfs(void) | 75 | static void exit_sysfs(void) |
76 | { | 76 | { |
77 | sysdev_unregister(&device_oprofile); | 77 | sysdev_unregister(&device_oprofile); |
78 | sysdev_class_unregister(&oprofile_sysclass); | 78 | sysdev_class_unregister(&oprofile_sysclass); |
79 | } | 79 | } |
80 | 80 | ||
81 | #else | 81 | #else |
82 | #define init_driverfs() do { } while (0) | 82 | #define init_sysfs() do { } while (0) |
83 | #define exit_driverfs() do { } while (0) | 83 | #define exit_sysfs() do { } while (0) |
84 | #endif /* CONFIG_PM */ | 84 | #endif /* CONFIG_PM */ |
85 | 85 | ||
86 | static int profile_exceptions_notify(struct notifier_block *self, | 86 | static int profile_exceptions_notify(struct notifier_block *self, |
@@ -385,7 +385,7 @@ static int __init ppro_init(char ** cpu_type) | |||
385 | return 1; | 385 | return 1; |
386 | } | 386 | } |
387 | 387 | ||
388 | /* in order to get driverfs right */ | 388 | /* in order to get sysfs right */ |
389 | static int using_nmi; | 389 | static int using_nmi; |
390 | 390 | ||
391 | int __init op_nmi_init(struct oprofile_operations *ops) | 391 | int __init op_nmi_init(struct oprofile_operations *ops) |
@@ -440,7 +440,7 @@ int __init op_nmi_init(struct oprofile_operations *ops) | |||
440 | return -ENODEV; | 440 | return -ENODEV; |
441 | } | 441 | } |
442 | 442 | ||
443 | init_driverfs(); | 443 | init_sysfs(); |
444 | using_nmi = 1; | 444 | using_nmi = 1; |
445 | ops->create_files = nmi_create_files; | 445 | ops->create_files = nmi_create_files; |
446 | ops->setup = nmi_setup; | 446 | ops->setup = nmi_setup; |
@@ -456,5 +456,5 @@ int __init op_nmi_init(struct oprofile_operations *ops) | |||
456 | void op_nmi_exit(void) | 456 | void op_nmi_exit(void) |
457 | { | 457 | { |
458 | if (using_nmi) | 458 | if (using_nmi) |
459 | exit_driverfs(); | 459 | exit_sysfs(); |
460 | } | 460 | } |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 2ecb20b551e1..9ddf896a137a 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -147,7 +147,7 @@ | |||
147 | * in UP: | 147 | * in UP: |
148 | * - we need to protect against PMU overflow interrupts (local_irq_disable) | 148 | * - we need to protect against PMU overflow interrupts (local_irq_disable) |
149 | * | 149 | * |
150 | * spin_lock_irqsave()/spin_lock_irqrestore(): | 150 | * spin_lock_irqsave()/spin_unlock_irqrestore(): |
151 | * in SMP: local_irq_disable + spin_lock | 151 | * in SMP: local_irq_disable + spin_lock |
152 | * in UP : local_irq_disable | 152 | * in UP : local_irq_disable |
153 | * | 153 | * |
diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c index 896cef1aca5f..82abd159dbef 100644 --- a/arch/m32r/lib/usercopy.c +++ b/arch/m32r/lib/usercopy.c | |||
@@ -293,7 +293,7 @@ long strnlen_user(const char __user *s, long n) | |||
293 | : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101) | 293 | : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101) |
294 | : "r0", "r1", "cbit"); | 294 | : "r0", "r1", "cbit"); |
295 | 295 | ||
296 | /* NOTE: strnlen_user() algorism: | 296 | /* NOTE: strnlen_user() algorithm: |
297 | * { | 297 | * { |
298 | * char *p; | 298 | * char *p; |
299 | * for (p = s; n-- && *p != '\0'; ++p) | 299 | * for (p = s; n-- && *p != '\0'; ++p) |
@@ -369,7 +369,7 @@ long strnlen_user(const char __user *s, long n) | |||
369 | : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101) | 369 | : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101) |
370 | : "r0", "r1", "r2", "r3", "cbit"); | 370 | : "r0", "r1", "r2", "r3", "cbit"); |
371 | 371 | ||
372 | /* NOTE: strnlen_user() algorism: | 372 | /* NOTE: strnlen_user() algorithm: |
373 | * { | 373 | * { |
374 | * char *p; | 374 | * char *p; |
375 | * for (p = s; n-- && *p != '\0'; ++p) | 375 | * for (p = s; n-- && *p != '\0'; ++p) |
diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c index 87b112b363a6..92e58070b016 100644 --- a/arch/m68knommu/platform/5307/timers.c +++ b/arch/m68knommu/platform/5307/timers.c | |||
@@ -104,7 +104,7 @@ unsigned long coldfire_timer_offset(void) | |||
104 | 104 | ||
105 | /* | 105 | /* |
106 | * Choose a reasonably fast profile timer. Make it an odd value to | 106 | * Choose a reasonably fast profile timer. Make it an odd value to |
107 | * try and get good coverage of kernal operations. | 107 | * try and get good coverage of kernel operations. |
108 | */ | 108 | */ |
109 | #define PROFILEHZ 1013 | 109 | #define PROFILEHZ 1013 |
110 | 110 | ||
diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c index e0ad754c7edd..8f42fa85ac9e 100644 --- a/arch/mips/kernel/machine_kexec.c +++ b/arch/mips/kernel/machine_kexec.c | |||
@@ -13,8 +13,8 @@ | |||
13 | #include <asm/cacheflush.h> | 13 | #include <asm/cacheflush.h> |
14 | #include <asm/page.h> | 14 | #include <asm/page.h> |
15 | 15 | ||
16 | const extern unsigned char relocate_new_kernel[]; | 16 | extern const unsigned char relocate_new_kernel[]; |
17 | const extern unsigned int relocate_new_kernel_size; | 17 | extern const unsigned int relocate_new_kernel_size; |
18 | 18 | ||
19 | extern unsigned long kexec_start_address; | 19 | extern unsigned long kexec_start_address; |
20 | extern unsigned long kexec_indirection_page; | 20 | extern unsigned long kexec_indirection_page; |
diff --git a/arch/parisc/kernel/topology.c b/arch/parisc/kernel/topology.c index 068b20d822e7..d71cb018a21e 100644 --- a/arch/parisc/kernel/topology.c +++ b/arch/parisc/kernel/topology.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/parisc/kernel/topology.c - Populate driverfs with topology information | 2 | * arch/parisc/kernel/topology.c - Populate sysfs with topology information |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 76b5d7ebdcc6..9d0735a54564 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
@@ -182,7 +182,7 @@ void rtas_progress(char *s, unsigned short hex) | |||
182 | char *os; | 182 | char *os; |
183 | static int display_character, set_indicator; | 183 | static int display_character, set_indicator; |
184 | static int display_width, display_lines, form_feed; | 184 | static int display_width, display_lines, form_feed; |
185 | const static int *row_width; | 185 | static const int *row_width; |
186 | static DEFINE_SPINLOCK(progress_lock); | 186 | static DEFINE_SPINLOCK(progress_lock); |
187 | static int current_line; | 187 | static int current_line; |
188 | static int pending_newline = 0; /* did last write end with unprinted newline? */ | 188 | static int pending_newline = 0; /* did last write end with unprinted newline? */ |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 262790910ff2..e86c37c82cfd 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -154,7 +154,7 @@ EXPORT_SYMBOL_GPL(of_node_to_nid); | |||
154 | * characteristics relative to its multiple connections. We ignore | 154 | * characteristics relative to its multiple connections. We ignore |
155 | * this for now. We also assume that all cpu and memory sets have | 155 | * this for now. We also assume that all cpu and memory sets have |
156 | * their distances represented at a common level. This won't be | 156 | * their distances represented at a common level. This won't be |
157 | * true for heirarchical NUMA. | 157 | * true for hierarchical NUMA. |
158 | * | 158 | * |
159 | * In any case the ibm,associativity-reference-points should give | 159 | * In any case the ibm,associativity-reference-points should give |
160 | * the correct depth for a normal NUMA system. | 160 | * the correct depth for a normal NUMA system. |
diff --git a/arch/sh/kernel/cpu/sh2/clock-sh7619.c b/arch/sh/kernel/cpu/sh2/clock-sh7619.c index d0440b269702..d2c157917999 100644 --- a/arch/sh/kernel/cpu/sh2/clock-sh7619.c +++ b/arch/sh/kernel/cpu/sh2/clock-sh7619.c | |||
@@ -18,8 +18,8 @@ | |||
18 | #include <asm/freq.h> | 18 | #include <asm/freq.h> |
19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
20 | 20 | ||
21 | const static int pll1rate[]={1,2}; | 21 | static const int pll1rate[] = {1,2}; |
22 | const static int pfc_divisors[]={1,2,0,4}; | 22 | static const int pfc_divisors[] = {1,2,0,4}; |
23 | 23 | ||
24 | #if (CONFIG_SH_CLK_MD == 1) || (CONFIG_SH_CLK_MD == 2) | 24 | #if (CONFIG_SH_CLK_MD == 1) || (CONFIG_SH_CLK_MD == 2) |
25 | #define PLL2 (4) | 25 | #define PLL2 (4) |
diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7206.c b/arch/sh/kernel/cpu/sh2a/clock-sh7206.c index a9ad309c6a33..82d7f991ef6b 100644 --- a/arch/sh/kernel/cpu/sh2a/clock-sh7206.c +++ b/arch/sh/kernel/cpu/sh2a/clock-sh7206.c | |||
@@ -18,8 +18,8 @@ | |||
18 | #include <asm/freq.h> | 18 | #include <asm/freq.h> |
19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
20 | 20 | ||
21 | const static int pll1rate[]={1,2,3,4,6,8}; | 21 | static const int pll1rate[]={1,2,3,4,6,8}; |
22 | const static int pfc_divisors[]={1,2,3,4,6,8,12}; | 22 | static const int pfc_divisors[]={1,2,3,4,6,8,12}; |
23 | #define ifc_divisors pfc_divisors | 23 | #define ifc_divisors pfc_divisors |
24 | 24 | ||
25 | #if (CONFIG_SH_CLK_MD == 2) | 25 | #if (CONFIG_SH_CLK_MD == 2) |
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig index dbfab8fc9b49..50ccc7f57cd0 100644 --- a/arch/v850/Kconfig +++ b/arch/v850/Kconfig | |||
@@ -217,7 +217,7 @@ menu "Processor type and features" | |||
217 | # Some platforms pre-zero memory, in which case the kernel doesn't need to | 217 | # Some platforms pre-zero memory, in which case the kernel doesn't need to |
218 | config ZERO_BSS | 218 | config ZERO_BSS |
219 | bool | 219 | bool |
220 | depends !V850E2_SIM85E2C | 220 | depends on !V850E2_SIM85E2C |
221 | default y | 221 | default y |
222 | 222 | ||
223 | # The crappy-ass zone allocator requires that the start of allocatable | 223 | # The crappy-ass zone allocator requires that the start of allocatable |
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index a87c51705620..c9addcfb96dc 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
@@ -418,7 +418,7 @@ static struct sysdev_class timer_sysclass = { | |||
418 | set_kset_name("timer"), | 418 | set_kset_name("timer"), |
419 | }; | 419 | }; |
420 | 420 | ||
421 | /* XXX this driverfs stuff should probably go elsewhere later -john */ | 421 | /* XXX this sysfs stuff should probably go elsewhere later -john */ |
422 | static struct sys_device device_timer = { | 422 | static struct sys_device device_timer = { |
423 | .id = 0, | 423 | .id = 0, |
424 | .cls = &timer_sysclass, | 424 | .cls = &timer_sysclass, |