aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS2
-rw-r--r--Documentation/dell_rbu.txt4
-rw-r--r--Documentation/hwmon/abituguru-datasheet6
-rw-r--r--Documentation/laptops/thinkpad-acpi.txt2
-rw-r--r--Documentation/networking/rxrpc.txt2
-rw-r--r--Documentation/networking/tuntap.txt2
-rw-r--r--Documentation/scsi/ChangeLog.lpfc2
-rw-r--r--Documentation/scsi/ChangeLog.ncr53c8xx2
-rw-r--r--Documentation/scsi/ChangeLog.sym53c8xx2
-rw-r--r--MAINTAINERS3
-rw-r--r--Makefile2
-rw-r--r--arch/blackfin/kernel/kgdb.c2
-rw-r--r--arch/cris/arch-v32/kernel/signal.c2
-rw-r--r--arch/ia64/kernel/kprobes.c2
-rw-r--r--arch/m68k/Kconfig2
-rw-r--r--arch/m68k/kernel/traps.c2
-rw-r--r--arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c2
-rw-r--r--arch/powerpc/boot/Makefile2
-rw-r--r--arch/powerpc/kernel/kprobes.c2
-rw-r--r--arch/powerpc/oprofile/cell/spu_profiler.c2
-rw-r--r--arch/s390/Kconfig2
-rw-r--r--arch/s390/kernel/kprobes.c2
-rw-r--r--arch/sparc/kernel/kprobes.c2
-rw-r--r--arch/x86/kernel/kprobes.c2
-rw-r--r--arch/x86/kernel/mfgpt_32.c2
-rw-r--r--drivers/acpi/acpi_memhotplug.c2
-rw-r--r--drivers/acpi/executer/exprep.c2
-rw-r--r--drivers/acpi/executer/exresolv.c2
-rw-r--r--drivers/acpi/executer/exstore.c2
-rw-r--r--drivers/acpi/resources/rscreate.c2
-rw-r--r--drivers/acpi/utilities/utobject.c4
-rw-r--r--drivers/base/Kconfig2
-rw-r--r--drivers/char/epca.c2
-rw-r--r--drivers/cpufreq/Kconfig4
-rw-r--r--drivers/hwmon/fschmd.c2
-rw-r--r--drivers/infiniband/hw/mlx4/cq.c2
-rw-r--r--drivers/input/keyboard/atkbd.c2
-rw-r--r--drivers/macintosh/Kconfig2
-rw-r--r--drivers/message/i2o/i2o_scsi.c2
-rw-r--r--drivers/misc/ibmasm/event.c2
-rw-r--r--drivers/misc/phantom.c2
-rw-r--r--drivers/mtd/devices/pmc551.c2
-rw-r--r--drivers/mtd/ubi/eba.c2
-rw-r--r--drivers/mtd/ubi/io.c2
-rw-r--r--drivers/mtd/ubi/scan.c2
-rw-r--r--drivers/mtd/ubi/ubi-media.h4
-rw-r--r--drivers/mtd/ubi/vtbl.c2
-rw-r--r--drivers/mtd/ubi/wl.c4
-rw-r--r--drivers/net/bnx2x_link.c2
-rw-r--r--drivers/net/e1000/e1000_hw.c4
-rw-r--r--drivers/net/slip.h2
-rw-r--r--drivers/net/tehuti.c4
-rw-r--r--drivers/net/tokenring/smctr.c2
-rw-r--r--drivers/net/wireless/atmel.c2
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c4
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00crypto.c4
-rw-r--r--drivers/net/wireless/strip.c2
-rw-r--r--drivers/rtc/rtc-ds1511.c2
-rw-r--r--drivers/rtc/rtc-stk17ta8.c2
-rw-r--r--drivers/s390/block/dasd_eer.c4
-rw-r--r--drivers/s390/char/vmlogrdr.c4
-rw-r--r--drivers/scsi/a100u2w.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_hbadisc.c4
-rw-r--r--drivers/scsi/lpfc/lpfc_sli.c10
-rw-r--r--drivers/scsi/megaraid.c4
-rw-r--r--drivers/scsi/qla1280.c4
-rw-r--r--drivers/scsi/qla4xxx/ql4_mbx.c2
-rw-r--r--drivers/scsi/scsi_error.c2
-rw-r--r--drivers/serial/8250.c2
-rw-r--r--drivers/serial/crisv10.c4
-rw-r--r--drivers/uwb/i1480/dfu/usb.c2
-rw-r--r--drivers/video/console/vgacon.c2
-rw-r--r--fs/ncpfs/ioctl.c2
-rw-r--r--fs/ocfs2/cluster/heartbeat.c2
-rw-r--r--fs/proc/task_nommu.c2
-rw-r--r--fs/ubifs/Kconfig2
-rw-r--r--fs/ubifs/budget.c4
-rw-r--r--fs/ubifs/gc.c2
-rw-r--r--fs/ubifs/journal.c2
-rw-r--r--fs/ubifs/shrinker.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c2
-rw-r--r--include/acpi/acmacros.h4
-rw-r--r--include/acpi/actypes.h2
-rw-r--r--include/linux/mtd/mtd.h2
-rw-r--r--include/linux/ncp_fs.h2
-rw-r--r--include/linux/spi/spi.h4
-rw-r--r--include/mtd/ubi-user.h2
-rw-r--r--init/main.c3
-rw-r--r--kernel/pid.c2
-rw-r--r--kernel/printk.c2
-rw-r--r--kernel/time/jiffies.c2
-rw-r--r--lib/radix-tree.c11
-rw-r--r--mm/slub.c2
-rw-r--r--net/sctp/auth.c4
-rw-r--r--net/sctp/sm_statefuns.c6
-rw-r--r--net/sctp/socket.c2
-rw-r--r--net/sctp/tsnmap.c2
-rw-r--r--sound/oss/aedsp16.c2
-rw-r--r--sound/usb/usx2y/usbusx2y.c2
99 files changed, 133 insertions, 130 deletions
diff --git a/CREDITS b/CREDITS
index abe05a0be4ed..61186c85d728 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1681,7 +1681,7 @@ E: ajoshi@shell.unixbox.com
1681D: fbdev hacking 1681D: fbdev hacking
1682 1682
1683N: Jesper Juhl 1683N: Jesper Juhl
1684E: jesper.juhl@gmail.com 1684E: jj@chaosbits.net
1685D: Various fixes, cleanups and minor features all over the tree. 1685D: Various fixes, cleanups and minor features all over the tree.
1686D: Wrote initial version of the hdaps driver (since passed on to others). 1686D: Wrote initial version of the hdaps driver (since passed on to others).
1687S: Lemnosvej 1, 3.tv 1687S: Lemnosvej 1, 3.tv
diff --git a/Documentation/dell_rbu.txt b/Documentation/dell_rbu.txt
index 2c0d631de0cf..c11b931f8f98 100644
--- a/Documentation/dell_rbu.txt
+++ b/Documentation/dell_rbu.txt
@@ -81,8 +81,8 @@ Until this step is completed the driver cannot be unloaded.
81Also echoing either mono ,packet or init in to image_type will free up the 81Also echoing either mono ,packet or init in to image_type will free up the
82memory allocated by the driver. 82memory allocated by the driver.
83 83
84If an user by accident executes steps 1 and 3 above without executing step 2; 84If a user by accident executes steps 1 and 3 above without executing step 2;
85it will make the /sys/class/firmware/dell_rbu/ entries to disappear. 85it will make the /sys/class/firmware/dell_rbu/ entries disappear.
86The entries can be recreated by doing the following 86The entries can be recreated by doing the following
87echo init > /sys/devices/platform/dell_rbu/image_type 87echo init > /sys/devices/platform/dell_rbu/image_type
88NOTE: echoing init in image_type does not change it original value. 88NOTE: echoing init in image_type does not change it original value.
diff --git a/Documentation/hwmon/abituguru-datasheet b/Documentation/hwmon/abituguru-datasheet
index aef5a9b36846..4d184f2db0ea 100644
--- a/Documentation/hwmon/abituguru-datasheet
+++ b/Documentation/hwmon/abituguru-datasheet
@@ -74,7 +74,7 @@ a sensor.
74Notice that some banks have both a read and a write address this is how the 74Notice that some banks have both a read and a write address this is how the
75uGuru determines if a read from or a write to the bank is taking place, thus 75uGuru determines if a read from or a write to the bank is taking place, thus
76when reading you should always use the read address and when writing the 76when reading you should always use the read address and when writing the
77write address. The write address is always one (1) more then the read address. 77write address. The write address is always one (1) more than the read address.
78 78
79 79
80uGuru ready 80uGuru ready
@@ -224,7 +224,7 @@ Bit 3: Beep if alarm (RW)
224Bit 4: 1 if alarm cause measured temp is over the warning threshold (R) 224Bit 4: 1 if alarm cause measured temp is over the warning threshold (R)
225Bit 5: 1 if alarm cause measured volt is over the max threshold (R) 225Bit 5: 1 if alarm cause measured volt is over the max threshold (R)
226Bit 6: 1 if alarm cause measured volt is under the min threshold (R) 226Bit 6: 1 if alarm cause measured volt is under the min threshold (R)
227Bit 7: Volt sensor: Shutdown if alarm persist for more then 4 seconds (RW) 227Bit 7: Volt sensor: Shutdown if alarm persist for more than 4 seconds (RW)
228 Temp sensor: Shutdown if temp is over the shutdown threshold (RW) 228 Temp sensor: Shutdown if temp is over the shutdown threshold (RW)
229 229
230* This bit is only honored/used by the uGuru if a temp sensor is connected 230* This bit is only honored/used by the uGuru if a temp sensor is connected
@@ -293,7 +293,7 @@ Byte 0:
293Alarm behaviour for the selected sensor. A 1 enables the described behaviour. 293Alarm behaviour for the selected sensor. A 1 enables the described behaviour.
294Bit 0: Give an alarm if measured rpm is under the min threshold (RW) 294Bit 0: Give an alarm if measured rpm is under the min threshold (RW)
295Bit 3: Beep if alarm (RW) 295Bit 3: Beep if alarm (RW)
296Bit 7: Shutdown if alarm persist for more then 4 seconds (RW) 296Bit 7: Shutdown if alarm persist for more than 4 seconds (RW)
297 297
298Byte 1: 298Byte 1:
299min threshold (scale as bank 0x26) 299min threshold (scale as bank 0x26)
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 71f0fe1fc1b0..898b4987bb80 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -1475,7 +1475,7 @@ Sysfs interface changelog:
1475 1475
14760x020100: Marker for thinkpad-acpi with hot key NVRAM polling 14760x020100: Marker for thinkpad-acpi with hot key NVRAM polling
1477 support. If you must, use it to know you should not 1477 support. If you must, use it to know you should not
1478 start an userspace NVRAM poller (allows to detect when 1478 start a userspace NVRAM poller (allows to detect when
1479 NVRAM is compiled out by the user because it is 1479 NVRAM is compiled out by the user because it is
1480 unneeded/undesired in the first place). 1480 unneeded/undesired in the first place).
14810x020101: Marker for thinkpad-acpi with hot key NVRAM polling 14810x020101: Marker for thinkpad-acpi with hot key NVRAM polling
diff --git a/Documentation/networking/rxrpc.txt b/Documentation/networking/rxrpc.txt
index c3669a3fb4af..60d05eb77c64 100644
--- a/Documentation/networking/rxrpc.txt
+++ b/Documentation/networking/rxrpc.txt
@@ -540,7 +540,7 @@ A client would issue an operation by:
540 MSG_MORE should be set in msghdr::msg_flags on all but the last part of 540 MSG_MORE should be set in msghdr::msg_flags on all but the last part of
541 the request. Multiple requests may be made simultaneously. 541 the request. Multiple requests may be made simultaneously.
542 542
543 If a call is intended to go to a destination other then the default 543 If a call is intended to go to a destination other than the default
544 specified through connect(), then msghdr::msg_name should be set on the 544 specified through connect(), then msghdr::msg_name should be set on the
545 first request message of that call. 545 first request message of that call.
546 546
diff --git a/Documentation/networking/tuntap.txt b/Documentation/networking/tuntap.txt
index 839cbb71388b..c0aab985bad9 100644
--- a/Documentation/networking/tuntap.txt
+++ b/Documentation/networking/tuntap.txt
@@ -118,7 +118,7 @@ As mentioned above, main purpose of TUN/TAP driver is tunneling.
118It is used by VTun (http://vtun.sourceforge.net). 118It is used by VTun (http://vtun.sourceforge.net).
119 119
120Another interesting application using TUN/TAP is pipsecd 120Another interesting application using TUN/TAP is pipsecd
121(http://perso.enst.fr/~beyssac/pipsec/), an userspace IPSec 121(http://perso.enst.fr/~beyssac/pipsec/), a userspace IPSec
122implementation that can use complete kernel routing (unlike FreeS/WAN). 122implementation that can use complete kernel routing (unlike FreeS/WAN).
123 123
1243. How does Virtual network device actually work ? 1243. How does Virtual network device actually work ?
diff --git a/Documentation/scsi/ChangeLog.lpfc b/Documentation/scsi/ChangeLog.lpfc
index ae3f962a7cfc..ff19a52fe004 100644
--- a/Documentation/scsi/ChangeLog.lpfc
+++ b/Documentation/scsi/ChangeLog.lpfc
@@ -733,7 +733,7 @@ Changes from 20040920 to 20041018
733 I/O completion path a little more, especially taking care of 733 I/O completion path a little more, especially taking care of
734 fast-pathing the non-error case. Also removes tons of dead 734 fast-pathing the non-error case. Also removes tons of dead
735 members and defines from lpfc_scsi.h - e.g. lpfc_target is down 735 members and defines from lpfc_scsi.h - e.g. lpfc_target is down
736 to nothing more then the lpfc_nodelist pointer. 736 to nothing more than the lpfc_nodelist pointer.
737 * Added binary sysfs file to issue mbox commands 737 * Added binary sysfs file to issue mbox commands
738 * Replaced #if __BIG_ENDIAN with #if __BIG_ENDIAN_BITFIELD for 738 * Replaced #if __BIG_ENDIAN with #if __BIG_ENDIAN_BITFIELD for
739 compatibility with the user space applications. 739 compatibility with the user space applications.
diff --git a/Documentation/scsi/ChangeLog.ncr53c8xx b/Documentation/scsi/ChangeLog.ncr53c8xx
index a9f721aeb11c..8b278c10edfd 100644
--- a/Documentation/scsi/ChangeLog.ncr53c8xx
+++ b/Documentation/scsi/ChangeLog.ncr53c8xx
@@ -19,7 +19,7 @@ Sun Sep 24 21:30 2000 Gerard Roudier (groudier@club-internet.fr)
19 19
20Wed Jul 26 23:30 2000 Gerard Roudier (groudier@club-internet.fr) 20Wed Jul 26 23:30 2000 Gerard Roudier (groudier@club-internet.fr)
21 * version ncr53c8xx-3.4.1 21 * version ncr53c8xx-3.4.1
22 - Provide OpenFirmare path through the proc FS on PPC. 22 - Provide OpenFirmware path through the proc FS on PPC.
23 - Remove trailing argument #2 from a couple of #undefs. 23 - Remove trailing argument #2 from a couple of #undefs.
24 24
25Sun Jul 09 16:30 2000 Gerard Roudier (groudier@club-internet.fr) 25Sun Jul 09 16:30 2000 Gerard Roudier (groudier@club-internet.fr)
diff --git a/Documentation/scsi/ChangeLog.sym53c8xx b/Documentation/scsi/ChangeLog.sym53c8xx
index ef985ec348e6..02ffbc1e8a84 100644
--- a/Documentation/scsi/ChangeLog.sym53c8xx
+++ b/Documentation/scsi/ChangeLog.sym53c8xx
@@ -81,7 +81,7 @@ Sun Sep 24 21:30 2000 Gerard Roudier (groudier@club-internet.fr)
81 81
82Wed Jul 26 23:30 2000 Gerard Roudier (groudier@club-internet.fr) 82Wed Jul 26 23:30 2000 Gerard Roudier (groudier@club-internet.fr)
83 * version sym53c8xx-1.7.1 83 * version sym53c8xx-1.7.1
84 - Provide OpenFirmare path through the proc FS on PPC. 84 - Provide OpenFirmware path through the proc FS on PPC.
85 - Download of on-chip SRAM using memcpy_toio() doesn't work 85 - Download of on-chip SRAM using memcpy_toio() doesn't work
86 on PPC. Restore previous method (MEMORY MOVE from SCRIPTS). 86 on PPC. Restore previous method (MEMORY MOVE from SCRIPTS).
87 - Remove trailing argument #2 from a couple of #undefs. 87 - Remove trailing argument #2 from a couple of #undefs.
diff --git a/MAINTAINERS b/MAINTAINERS
index 094dd52d7309..06f8ff938c71 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4229,9 +4229,10 @@ L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
4229S: Maintained 4229S: Maintained
4230 4230
4231TRIVIAL PATCHES 4231TRIVIAL PATCHES
4232P: Jesper Juhl 4232P: Jiri Kosina
4233M: trivial@kernel.org 4233M: trivial@kernel.org
4234L: linux-kernel@vger.kernel.org 4234L: linux-kernel@vger.kernel.org
4235T: git kernel.org:/pub/scm/linux/kernel/git/jikos/trivial.git
4235S: Maintained 4236S: Maintained
4236 4237
4237TTY LAYER 4238TTY LAYER
diff --git a/Makefile b/Makefile
index f9006663f01e..c9ac00837787 100644
--- a/Makefile
+++ b/Makefile
@@ -1008,7 +1008,7 @@ define check-symlink
1008endef 1008endef
1009 1009
1010# We create the target directory of the symlink if it does 1010# We create the target directory of the symlink if it does
1011# not exist so the test in chack-symlink works and we have a 1011# not exist so the test in check-symlink works and we have a
1012# directory for generated filesas used by some architectures. 1012# directory for generated filesas used by some architectures.
1013define create-symlink 1013define create-symlink
1014 if [ ! -L include/asm ]; then \ 1014 if [ ! -L include/asm ]; then \
diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c
index b795a207742c..1c5afaeb9504 100644
--- a/arch/blackfin/kernel/kgdb.c
+++ b/arch/blackfin/kernel/kgdb.c
@@ -105,7 +105,7 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
105 * Extracts ebp, esp and eip values understandable by gdb from the values 105 * Extracts ebp, esp and eip values understandable by gdb from the values
106 * saved by switch_to. 106 * saved by switch_to.
107 * thread.esp points to ebp. flags and ebp are pushed in switch_to hence esp 107 * thread.esp points to ebp. flags and ebp are pushed in switch_to hence esp
108 * prior to entering switch_to is 8 greater then the value that is saved. 108 * prior to entering switch_to is 8 greater than the value that is saved.
109 * If switch_to changes, change following code appropriately. 109 * If switch_to changes, change following code appropriately.
110 */ 110 */
111void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p) 111void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index da7d2be000ba..372d0ca6efbc 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -456,7 +456,7 @@ give_sigsegv:
456 return -EFAULT; 456 return -EFAULT;
457} 457}
458 458
459/* Invoke a singal handler to, well, handle the signal. */ 459/* Invoke a signal handler to, well, handle the signal. */
460static inline int 460static inline int
461handle_signal(int canrestart, unsigned long sig, 461handle_signal(int canrestart, unsigned long sig,
462 siginfo_t *info, struct k_sigaction *ka, 462 siginfo_t *info, struct k_sigaction *ka,
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 097b84d54e73..f90be51b1123 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -434,7 +434,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
434 /* 434 /*
435 * It is possible to have multiple instances associated with a given 435 * It is possible to have multiple instances associated with a given
436 * task either because an multiple functions in the call path 436 * task either because an multiple functions in the call path
437 * have a return probe installed on them, and/or more then one return 437 * have a return probe installed on them, and/or more than one return
438 * return probe was registered for a target function. 438 * return probe was registered for a target function.
439 * 439 *
440 * We can handle this because: 440 * We can handle this because:
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index c825bde17cb3..fb87c08c6b57 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -303,7 +303,7 @@ config M68KFPU_EMU_EXTRAPREC
303 correct rounding, the emulator can (often) do the same but this 303 correct rounding, the emulator can (often) do the same but this
304 extra calculation can cost quite some time, so you can disable 304 extra calculation can cost quite some time, so you can disable
305 it here. The emulator will then "only" calculate with a 64 bit 305 it here. The emulator will then "only" calculate with a 64 bit
306 mantissa and round slightly incorrect, what is more then enough 306 mantissa and round slightly incorrect, what is more than enough
307 for normal usage. 307 for normal usage.
308 308
309config M68KFPU_EMU_ONLY 309config M68KFPU_EMU_ONLY
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index 6d813de2baf1..184acc90808d 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -401,7 +401,7 @@ static inline void do_040writebacks(struct frame *fp)
401 * called from sigreturn(), must ensure userspace code didn't 401 * called from sigreturn(), must ensure userspace code didn't
402 * manipulate exception frame to circumvent protection, then complete 402 * manipulate exception frame to circumvent protection, then complete
403 * pending writebacks 403 * pending writebacks
404 * we just clear TM2 to turn it into an userspace access 404 * we just clear TM2 to turn it into a userspace access
405 */ 405 */
406asmlinkage void berr_040cleanup(struct frame *fp) 406asmlinkage void berr_040cleanup(struct frame *fp)
407{ 407{
diff --git a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c
index 97862f45496d..caf5e9a0acc7 100644
--- a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c
+++ b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c
@@ -148,7 +148,7 @@ int read_eeprom(char *buffer, int eeprom_size, int size)
148 send_byte(W_HEADER); 148 send_byte(W_HEADER);
149 recv_ack(); 149 recv_ack();
150 150
151 /* EEPROM with size of more then 2K need two byte addressing */ 151 /* EEPROM with size of more than 2K need two byte addressing */
152 if (eeprom_size > 2048) { 152 if (eeprom_size > 2048) {
153 send_byte(0x00); 153 send_byte(0x00);
154 recv_ack(); 154 recv_ack();
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index f32829937aad..ab6dda372438 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -208,7 +208,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImage
208# 208#
209# Theses are default targets to build images which embed device tree blobs. 209# Theses are default targets to build images which embed device tree blobs.
210# They are only required on boards which do not have FDT support in firmware. 210# They are only required on boards which do not have FDT support in firmware.
211# Boards with newish u-boot firmare can use the uImage target above 211# Boards with newish u-boot firmware can use the uImage target above
212# 212#
213 213
214# Board ports in arch/powerpc/platform/40x/Kconfig 214# Board ports in arch/powerpc/platform/40x/Kconfig
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 989edcdf0297..c9329786073b 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -317,7 +317,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
317 /* 317 /*
318 * It is possible to have multiple instances associated with a given 318 * It is possible to have multiple instances associated with a given
319 * task either because an multiple functions in the call path 319 * task either because an multiple functions in the call path
320 * have a return probe installed on them, and/or more then one return 320 * have a return probe installed on them, and/or more than one return
321 * return probe was registered for a target function. 321 * return probe was registered for a target function.
322 * 322 *
323 * We can handle this because: 323 * We can handle this because:
diff --git a/arch/powerpc/oprofile/cell/spu_profiler.c b/arch/powerpc/oprofile/cell/spu_profiler.c
index dd499c3e9da7..83faa958b9d4 100644
--- a/arch/powerpc/oprofile/cell/spu_profiler.c
+++ b/arch/powerpc/oprofile/cell/spu_profiler.c
@@ -49,7 +49,7 @@ void set_spu_profiling_frequency(unsigned int freq_khz, unsigned int cycles_rese
49 * of precision. This is close enough for the purpose at hand. 49 * of precision. This is close enough for the purpose at hand.
50 * 50 *
51 * The value of the timeout should be small enough that the hw 51 * The value of the timeout should be small enough that the hw
52 * trace buffer will not get more then about 1/3 full for the 52 * trace buffer will not get more than about 1/3 full for the
53 * maximum user specified (the LFSR value) hw sampling frequency. 53 * maximum user specified (the LFSR value) hw sampling frequency.
54 * This is to ensure the trace buffer will never fill even if the 54 * This is to ensure the trace buffer will never fill even if the
55 * kernel thread scheduling varies under a heavy system load. 55 * kernel thread scheduling varies under a heavy system load.
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 19577aeffd7b..a94a3c3ae932 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -299,7 +299,7 @@ config WARN_STACK
299 This option enables the compiler options -mwarn-framesize and 299 This option enables the compiler options -mwarn-framesize and
300 -mwarn-dynamicstack. If the compiler supports these options it 300 -mwarn-dynamicstack. If the compiler supports these options it
301 will generate warnings for function which either use alloca or 301 will generate warnings for function which either use alloca or
302 create a stack frame bigger then CONFIG_WARN_STACK_SIZE. 302 create a stack frame bigger than CONFIG_WARN_STACK_SIZE.
303 303
304 Say N if you are unsure. 304 Say N if you are unsure.
305 305
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 9b92856632cf..a01cf0284db2 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -382,7 +382,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
382 /* 382 /*
383 * It is possible to have multiple instances associated with a given 383 * It is possible to have multiple instances associated with a given
384 * task either because an multiple functions in the call path 384 * task either because an multiple functions in the call path
385 * have a return probe installed on them, and/or more then one return 385 * have a return probe installed on them, and/or more than one return
386 * return probe was registered for a target function. 386 * return probe was registered for a target function.
387 * 387 *
388 * We can handle this because: 388 * We can handle this because:
diff --git a/arch/sparc/kernel/kprobes.c b/arch/sparc/kernel/kprobes.c
index 201a6e547e4a..3bc6527c95af 100644
--- a/arch/sparc/kernel/kprobes.c
+++ b/arch/sparc/kernel/kprobes.c
@@ -517,7 +517,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
517 /* 517 /*
518 * It is possible to have multiple instances associated with a given 518 * It is possible to have multiple instances associated with a given
519 * task either because an multiple functions in the call path 519 * task either because an multiple functions in the call path
520 * have a return probe installed on them, and/or more then one return 520 * have a return probe installed on them, and/or more than one return
521 * return probe was registered for a target function. 521 * return probe was registered for a target function.
522 * 522 *
523 * We can handle this because: 523 * We can handle this because:
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index eead6f8f9218..884d985b8b82 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -695,7 +695,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
695 /* 695 /*
696 * It is possible to have multiple instances associated with a given 696 * It is possible to have multiple instances associated with a given
697 * task either because multiple functions in the call path have 697 * task either because multiple functions in the call path have
698 * return probes installed on them, and/or more then one 698 * return probes installed on them, and/or more than one
699 * return probe was registered for a target function. 699 * return probe was registered for a target function.
700 * 700 *
701 * We can handle this because: 701 * We can handle this because:
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c
index c12314c9e86f..8815f3c7fec7 100644
--- a/arch/x86/kernel/mfgpt_32.c
+++ b/arch/x86/kernel/mfgpt_32.c
@@ -252,7 +252,7 @@ EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer);
252/* 252/*
253 * The MFPGT timers on the CS5536 provide us with suitable timers to use 253 * The MFPGT timers on the CS5536 provide us with suitable timers to use
254 * as clock event sources - not as good as a HPET or APIC, but certainly 254 * as clock event sources - not as good as a HPET or APIC, but certainly
255 * better then the PIT. This isn't a general purpose MFGPT driver, but 255 * better than the PIT. This isn't a general purpose MFGPT driver, but
256 * a simplified one designed specifically to act as a clock event source. 256 * a simplified one designed specifically to act as a clock event source.
257 * For full details about the MFGPT, please consult the CS5536 data sheet. 257 * For full details about the MFGPT, please consult the CS5536 data sheet.
258 */ 258 */
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 63a17b55b39b..7a0f4aa4fa1e 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -20,7 +20,7 @@
20 * 20 *
21 * 21 *
22 * ACPI based HotPlug driver that supports Memory Hotplug 22 * ACPI based HotPlug driver that supports Memory Hotplug
23 * This driver fields notifications from firmare for memory add 23 * This driver fields notifications from firmware for memory add
24 * and remove operations and alerts the VM of the affected memory 24 * and remove operations and alerts the VM of the affected memory
25 * ranges. 25 * ranges.
26 */ 26 */
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 5d438c32989d..a7dc87ecee37 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -404,7 +404,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
404 * 404 *
405 * RETURN: Status 405 * RETURN: Status
406 * 406 *
407 * DESCRIPTION: Construct an union acpi_operand_object of type def_field and 407 * DESCRIPTION: Construct a union acpi_operand_object of type def_field and
408 * connect it to the parent Node. 408 * connect it to the parent Node.
409 * 409 *
410 ******************************************************************************/ 410 ******************************************************************************/
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 89571b92a522..60e8c47128e9 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -146,7 +146,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
146 146
147 stack_desc = *stack_ptr; 147 stack_desc = *stack_ptr;
148 148
149 /* This is an union acpi_operand_object */ 149 /* This is a union acpi_operand_object */
150 150
151 switch (ACPI_GET_OBJECT_TYPE(stack_desc)) { 151 switch (ACPI_GET_OBJECT_TYPE(stack_desc)) {
152 case ACPI_TYPE_LOCAL_REFERENCE: 152 case ACPI_TYPE_LOCAL_REFERENCE:
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 3318df4cbd98..1c118ba78adb 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -274,7 +274,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
274 * 274 *
275 * PARAMETERS: *source_desc - Value to be stored 275 * PARAMETERS: *source_desc - Value to be stored
276 * *dest_desc - Where to store it. Must be an NS node 276 * *dest_desc - Where to store it. Must be an NS node
277 * or an union acpi_operand_object of type 277 * or a union acpi_operand_object of type
278 * Reference; 278 * Reference;
279 * walk_state - Current walk state 279 * walk_state - Current walk state
280 * 280 *
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index c0bbfa2c4193..08b8d73e6ee5 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -124,7 +124,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
124 * 124 *
125 * FUNCTION: acpi_rs_create_pci_routing_table 125 * FUNCTION: acpi_rs_create_pci_routing_table
126 * 126 *
127 * PARAMETERS: package_object - Pointer to an union acpi_operand_object 127 * PARAMETERS: package_object - Pointer to a union acpi_operand_object
128 * package 128 * package
129 * output_buffer - Pointer to the user's buffer 129 * output_buffer - Pointer to the user's buffer
130 * 130 *
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index c354e7a42bcd..4bef3cfbaccb 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -297,7 +297,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
297 * 297 *
298 * RETURN: TRUE if object is valid, FALSE otherwise 298 * RETURN: TRUE if object is valid, FALSE otherwise
299 * 299 *
300 * DESCRIPTION: Validate a pointer to be an union acpi_operand_object 300 * DESCRIPTION: Validate a pointer to be a union acpi_operand_object
301 * 301 *
302 ******************************************************************************/ 302 ******************************************************************************/
303 303
@@ -389,7 +389,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
389{ 389{
390 ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object); 390 ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object);
391 391
392 /* Object must be an union acpi_operand_object */ 392 /* Object must be a union acpi_operand_object */
393 393
394 if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) { 394 if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
395 ACPI_ERROR((AE_INFO, 395 ACPI_ERROR((AE_INFO,
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index d8e8c49c0cbd..8f006f96ff53 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -54,7 +54,7 @@ config FIRMWARE_IN_KERNEL
54 such firmware, and do not wish to use an initrd. 54 such firmware, and do not wish to use an initrd.
55 55
56 This single option controls the inclusion of firmware for 56 This single option controls the inclusion of firmware for
57 every driver which uses request_firmare() and ships its 57 every driver which uses request_firmware() and ships its
58 firmware in the kernel source tree, to avoid a proliferation 58 firmware in the kernel source tree, to avoid a proliferation
59 of 'Include firmware for xxx device' options. 59 of 'Include firmware for xxx device' options.
60 60
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 39ad820b2350..af7c13ca9493 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -769,7 +769,7 @@ static int pc_open(struct tty_struct *tty, struct file *filp)
769 /* Check status of board configured in system. */ 769 /* Check status of board configured in system. */
770 770
771 /* 771 /*
772 * I check to see if the epca_setup routine detected an user error. It 772 * I check to see if the epca_setup routine detected a user error. It
773 * might be better to put this in pc_init, but for the moment it goes 773 * might be better to put this in pc_init, but for the moment it goes
774 * here. 774 * here.
775 */ 775 */
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 5f076aef74fa..a8c8d9c19d74 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -83,7 +83,7 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE
83 select CPU_FREQ_GOV_USERSPACE 83 select CPU_FREQ_GOV_USERSPACE
84 help 84 help
85 Use the CPUFreq governor 'userspace' as default. This allows 85 Use the CPUFreq governor 'userspace' as default. This allows
86 you to set the CPU frequency manually or when an userspace 86 you to set the CPU frequency manually or when a userspace
87 program shall be able to set the CPU dynamically without having 87 program shall be able to set the CPU dynamically without having
88 to enable the userspace governor manually. 88 to enable the userspace governor manually.
89 89
@@ -138,7 +138,7 @@ config CPU_FREQ_GOV_USERSPACE
138 tristate "'userspace' governor for userspace frequency scaling" 138 tristate "'userspace' governor for userspace frequency scaling"
139 help 139 help
140 Enable this cpufreq governor when you either want to set the 140 Enable this cpufreq governor when you either want to set the
141 CPU frequency manually or when an userspace program shall 141 CPU frequency manually or when a userspace program shall
142 be able to set the CPU dynamically, like on LART 142 be able to set the CPU dynamically, like on LART
143 <http://www.lartmaker.nl/>. 143 <http://www.lartmaker.nl/>.
144 144
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index 967170368933..8b2d756595d9 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -75,7 +75,7 @@ static const u8 FSCHMD_REG_VOLT[3] = { 0x45, 0x42, 0x48 };
75 75
76/* minimum pwm at which the fan is driven (pwm can by increased depending on 76/* minimum pwm at which the fan is driven (pwm can by increased depending on
77 the temp. Notice that for the scy some fans share there minimum speed. 77 the temp. Notice that for the scy some fans share there minimum speed.
78 Also notice that with the scy the sensor order is different then with the 78 Also notice that with the scy the sensor order is different than with the
79 other chips, this order was in the 2.4 driver and kept for consistency. */ 79 other chips, this order was in the 2.4 driver and kept for consistency. */
80static const u8 FSCHMD_REG_FAN_MIN[5][6] = { 80static const u8 FSCHMD_REG_FAN_MIN[5][6] = {
81 { 0x55, 0x65 }, /* pos */ 81 { 0x55, 0x65 }, /* pos */
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index a3c5af1d7ec0..de5263beab4a 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -367,7 +367,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
367 if (err) 367 if (err)
368 goto out; 368 goto out;
369 } else { 369 } else {
370 /* Can't be smaller then the number of outstanding CQEs */ 370 /* Can't be smaller than the number of outstanding CQEs */
371 outst_cqe = mlx4_ib_get_outstanding_cqes(cq); 371 outst_cqe = mlx4_ib_get_outstanding_cqes(cq);
372 if (entries < outst_cqe + 1) { 372 if (entries < outst_cqe + 1) {
373 err = 0; 373 err = 0;
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index f6e9f39a527b..c3c8b9bc40ae 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -65,7 +65,7 @@ MODULE_PARM_DESC(extra, "Enable extra LEDs and keys on IBM RapidAcces, EzKey and
65 65
66/* 66/*
67 * Scancode to keycode tables. These are just the default setting, and 67 * Scancode to keycode tables. These are just the default setting, and
68 * are loadable via an userland utility. 68 * are loadable via a userland utility.
69 */ 69 */
70 70
71static const unsigned short atkbd_set2_keycode[512] = { 71static const unsigned short atkbd_set2_keycode[512] = {
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index b52659620d50..173cf55c64d0 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -138,7 +138,7 @@ config PMAC_BACKLIGHT
138 Say Y here to enable Macintosh specific extensions of the generic 138 Say Y here to enable Macintosh specific extensions of the generic
139 backlight code. With this enabled, the brightness keys on older 139 backlight code. With this enabled, the brightness keys on older
140 PowerBooks will be enabled so you can change the screen brightness. 140 PowerBooks will be enabled so you can change the screen brightness.
141 Newer models should use an userspace daemon like pbbuttonsd. 141 Newer models should use a userspace daemon like pbbuttonsd.
142 142
143config PMAC_BACKLIGHT_LEGACY 143config PMAC_BACKLIGHT_LEGACY
144 bool "Provide legacy ioctl's on /dev/pmu for the backlight" 144 bool "Provide legacy ioctl's on /dev/pmu for the backlight"
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index 1bcdbbb9e7d3..3d45817e6dcd 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -390,7 +390,7 @@ static int i2o_scsi_reply(struct i2o_controller *c, u32 m,
390 * @i2o_dev: the I2O device which was added 390 * @i2o_dev: the I2O device which was added
391 * 391 *
392 * If a I2O device is added we catch the notification, because I2O classes 392 * If a I2O device is added we catch the notification, because I2O classes
393 * other then SCSI peripheral will not be received through 393 * other than SCSI peripheral will not be received through
394 * i2o_scsi_probe(). 394 * i2o_scsi_probe().
395 */ 395 */
396static void i2o_scsi_notify_device_add(struct i2o_device *i2o_dev) 396static void i2o_scsi_notify_device_add(struct i2o_device *i2o_dev)
diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c
index fda6a4d3bf23..68a0a5b94795 100644
--- a/drivers/misc/ibmasm/event.c
+++ b/drivers/misc/ibmasm/event.c
@@ -50,7 +50,7 @@ static void wake_up_event_readers(struct service_processor *sp)
50 * Store the event in the circular event buffer, wake up any sleeping 50 * Store the event in the circular event buffer, wake up any sleeping
51 * event readers. 51 * event readers.
52 * There is no reader marker in the buffer, therefore readers are 52 * There is no reader marker in the buffer, therefore readers are
53 * responsible for keeping up with the writer, or they will loose events. 53 * responsible for keeping up with the writer, or they will lose events.
54 */ 54 */
55void ibmasm_receive_event(struct service_processor *sp, void *data, unsigned int data_size) 55void ibmasm_receive_event(struct service_processor *sp, void *data, unsigned int data_size)
56{ 56{
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index abdebe347383..fa57b67593ae 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -6,7 +6,7 @@
6 * the Free Software Foundation; either version 2 of the License, or 6 * the Free Software Foundation; either version 2 of the License, or
7 * (at your option) any later version. 7 * (at your option) any later version.
8 * 8 *
9 * You need an userspace library to cooperate with this driver. It (and other 9 * You need a userspace library to cooperate with this driver. It (and other
10 * info) may be obtained here: 10 * info) may be obtained here:
11 * http://www.fi.muni.cz/~xslaby/phantom.html 11 * http://www.fi.muni.cz/~xslaby/phantom.html
12 * or alternatively, you might use OpenHaptics provided by Sensable. 12 * or alternatively, you might use OpenHaptics provided by Sensable.
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index d38bca64bb15..d2fd550f7e09 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -34,7 +34,7 @@
34 * aperture size, not the dram size, and the V370PDC supplies no 34 * aperture size, not the dram size, and the V370PDC supplies no
35 * other method for memory size discovery. This problem is 35 * other method for memory size discovery. This problem is
36 * mostly only relevant when compiled as a module, as the 36 * mostly only relevant when compiled as a module, as the
37 * unloading of the module with an aperture size smaller then 37 * unloading of the module with an aperture size smaller than
38 * the ram will cause the driver to detect the onboard memory 38 * the ram will cause the driver to detect the onboard memory
39 * size to be equal to the aperture size when the module is 39 * size to be equal to the aperture size when the module is
40 * reloaded. Soooo, to help, the module supports an msize 40 * reloaded. Soooo, to help, the module supports an msize
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 048a606cebde..25def348e5ba 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -717,7 +717,7 @@ write_error:
717 * to the real data size, although the @buf buffer has to contain the 717 * to the real data size, although the @buf buffer has to contain the
718 * alignment. In all other cases, @len has to be aligned. 718 * alignment. In all other cases, @len has to be aligned.
719 * 719 *
720 * It is prohibited to write more then once to logical eraseblocks of static 720 * It is prohibited to write more than once to logical eraseblocks of static
721 * volumes. This function returns zero in case of success and a negative error 721 * volumes. This function returns zero in case of success and a negative error
722 * code in case of failure. 722 * code in case of failure.
723 */ 723 */
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index a74118c05745..fe81039f2a7c 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -465,7 +465,7 @@ out:
465 * This function synchronously erases physical eraseblock @pnum. If @torture 465 * This function synchronously erases physical eraseblock @pnum. If @torture
466 * flag is not zero, the physical eraseblock is checked by means of writing 466 * flag is not zero, the physical eraseblock is checked by means of writing
467 * different patterns to it and reading them back. If the torturing is enabled, 467 * different patterns to it and reading them back. If the torturing is enabled,
468 * the physical eraseblock is erased more then once. 468 * the physical eraseblock is erased more than once.
469 * 469 *
470 * This function returns the number of erasures made in case of success, %-EIO 470 * This function returns the number of erasures made in case of success, %-EIO
471 * if the erasure failed or the torturing test failed, and other negative error 471 * if the erasure failed or the torturing test failed, and other negative error
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 41d47e1cf15c..ecde202a5a12 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -478,7 +478,7 @@ int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_scan_info *si,
478 return 0; 478 return 0;
479 } else { 479 } else {
480 /* 480 /*
481 * This logical eraseblock is older then the one found 481 * This logical eraseblock is older than the one found
482 * previously. 482 * previously.
483 */ 483 */
484 if (cmp_res & 4) 484 if (cmp_res & 4)
diff --git a/drivers/mtd/ubi/ubi-media.h b/drivers/mtd/ubi/ubi-media.h
index 2ad940409053..8419fdccc79c 100644
--- a/drivers/mtd/ubi/ubi-media.h
+++ b/drivers/mtd/ubi/ubi-media.h
@@ -135,7 +135,7 @@ enum {
135 * The erase counter header takes 64 bytes and has a plenty of unused space for 135 * The erase counter header takes 64 bytes and has a plenty of unused space for
136 * future usage. The unused fields are zeroed. The @version field is used to 136 * future usage. The unused fields are zeroed. The @version field is used to
137 * indicate the version of UBI implementation which is supposed to be able to 137 * indicate the version of UBI implementation which is supposed to be able to
138 * work with this UBI image. If @version is greater then the current UBI 138 * work with this UBI image. If @version is greater than the current UBI
139 * version, the image is rejected. This may be useful in future if something 139 * version, the image is rejected. This may be useful in future if something
140 * is changed radically. This field is duplicated in the volume identifier 140 * is changed radically. This field is duplicated in the volume identifier
141 * header. 141 * header.
@@ -187,7 +187,7 @@ struct ubi_ec_hdr {
187 * (sequence number) is used to distinguish between older and newer versions of 187 * (sequence number) is used to distinguish between older and newer versions of
188 * logical eraseblocks. 188 * logical eraseblocks.
189 * 189 *
190 * There are 2 situations when there may be more then one physical eraseblock 190 * There are 2 situations when there may be more than one physical eraseblock
191 * corresponding to the same logical eraseblock, i.e., having the same @vol_id 191 * corresponding to the same logical eraseblock, i.e., having the same @vol_id
192 * and @lnum values in the volume identifier header. Suppose we have a logical 192 * and @lnum values in the volume identifier header. Suppose we have a logical
193 * eraseblock L and it is mapped to the physical eraseblock P. 193 * eraseblock L and it is mapped to the physical eraseblock P.
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 333c8941552f..1afc61e7455d 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -577,7 +577,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
577 if (vtbl[i].flags & UBI_VTBL_AUTORESIZE_FLG) { 577 if (vtbl[i].flags & UBI_VTBL_AUTORESIZE_FLG) {
578 /* Auto re-size flag may be set only for one volume */ 578 /* Auto re-size flag may be set only for one volume */
579 if (ubi->autoresize_vol_id != -1) { 579 if (ubi->autoresize_vol_id != -1) {
580 ubi_err("more then one auto-resize volume (%d " 580 ubi_err("more than one auto-resize volume (%d "
581 "and %d)", ubi->autoresize_vol_id, i); 581 "and %d)", ubi->autoresize_vol_id, i);
582 kfree(vol); 582 kfree(vol);
583 return -EINVAL; 583 return -EINVAL;
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 14901cb82c18..891534f8210d 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -128,7 +128,7 @@
128 * situation when the picked physical eraseblock is constantly erased after the 128 * situation when the picked physical eraseblock is constantly erased after the
129 * data is written to it. So, we have a constant which limits the highest erase 129 * data is written to it. So, we have a constant which limits the highest erase
130 * counter of the free physical eraseblock to pick. Namely, the WL sub-system 130 * counter of the free physical eraseblock to pick. Namely, the WL sub-system
131 * does not pick eraseblocks with erase counter greater then the lowest erase 131 * does not pick eraseblocks with erase counter greater than the lowest erase
132 * counter plus %WL_FREE_MAX_DIFF. 132 * counter plus %WL_FREE_MAX_DIFF.
133 */ 133 */
134#define WL_FREE_MAX_DIFF (2*UBI_WL_THRESHOLD) 134#define WL_FREE_MAX_DIFF (2*UBI_WL_THRESHOLD)
@@ -917,7 +917,7 @@ static int ensure_wear_leveling(struct ubi_device *ubi)
917 /* 917 /*
918 * We schedule wear-leveling only if the difference between the 918 * We schedule wear-leveling only if the difference between the
919 * lowest erase counter of used physical eraseblocks and a high 919 * lowest erase counter of used physical eraseblocks and a high
920 * erase counter of free physical eraseblocks is greater then 920 * erase counter of free physical eraseblocks is greater than
921 * %UBI_WL_THRESHOLD. 921 * %UBI_WL_THRESHOLD.
922 */ 922 */
923 e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, u.rb); 923 e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, u.rb);
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c
index 67de94f1f30e..fefa6ab13064 100644
--- a/drivers/net/bnx2x_link.c
+++ b/drivers/net/bnx2x_link.c
@@ -3359,7 +3359,7 @@ static u8 bnx2x_format_ver(u32 num, u8 *str, u16 len)
3359 u8 shift = 8*4; 3359 u8 shift = 8*4;
3360 u8 digit; 3360 u8 digit;
3361 if (len < 10) { 3361 if (len < 10) {
3362 /* Need more then 10chars for this format */ 3362 /* Need more than 10chars for this format */
3363 *str_ptr = '\0'; 3363 *str_ptr = '\0';
3364 return -EINVAL; 3364 return -EINVAL;
3365 } 3365 }
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index d04eef53571e..e1a3fc1303ee 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -6758,7 +6758,7 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
6758 * returns: - E1000_ERR_XXX 6758 * returns: - E1000_ERR_XXX
6759 * E1000_SUCCESS 6759 * E1000_SUCCESS
6760 * 6760 *
6761 * For phy's older then IGP, this function simply reads the polarity bit in the 6761 * For phy's older than IGP, this function simply reads the polarity bit in the
6762 * Phy Status register. For IGP phy's, this bit is valid only if link speed is 6762 * Phy Status register. For IGP phy's, this bit is valid only if link speed is
6763 * 10 Mbps. If the link speed is 100 Mbps there is no polarity so this bit will 6763 * 10 Mbps. If the link speed is 100 Mbps there is no polarity so this bit will
6764 * return 0. If the link speed is 1000 Mbps the polarity status is in the 6764 * return 0. If the link speed is 1000 Mbps the polarity status is in the
@@ -6834,7 +6834,7 @@ static s32 e1000_check_polarity(struct e1000_hw *hw,
6834 * returns: - E1000_ERR_XXX 6834 * returns: - E1000_ERR_XXX
6835 * E1000_SUCCESS 6835 * E1000_SUCCESS
6836 * 6836 *
6837 * For phy's older then IGP, this function reads the Downshift bit in the Phy 6837 * For phy's older than IGP, this function reads the Downshift bit in the Phy
6838 * Specific Status register. For IGP phy's, it reads the Downgrade bit in the 6838 * Specific Status register. For IGP phy's, it reads the Downgrade bit in the
6839 * Link Health register. In IGP this bit is latched high, so the driver must 6839 * Link Health register. In IGP this bit is latched high, so the driver must
6840 * read it immediately after link is established. 6840 * read it immediately after link is established.
diff --git a/drivers/net/slip.h b/drivers/net/slip.h
index 853e0f6ec710..9ea5c11287d2 100644
--- a/drivers/net/slip.h
+++ b/drivers/net/slip.h
@@ -75,7 +75,7 @@ struct slip {
75 unsigned long tx_errors; /* Planned stuff */ 75 unsigned long tx_errors; /* Planned stuff */
76 unsigned long rx_dropped; /* No memory for skb */ 76 unsigned long rx_dropped; /* No memory for skb */
77 unsigned long tx_dropped; /* When MTU change */ 77 unsigned long tx_dropped; /* When MTU change */
78 unsigned long rx_over_errors; /* Frame bigger then SLIP buf. */ 78 unsigned long rx_over_errors; /* Frame bigger than SLIP buf. */
79#ifdef SL_INCLUDE_CSLIP 79#ifdef SL_INCLUDE_CSLIP
80 unsigned long tx_compressed; 80 unsigned long tx_compressed;
81 unsigned long rx_compressed; 81 unsigned long rx_compressed;
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index a10a83a11d9f..a7a4dc4d6313 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -1004,7 +1004,7 @@ static inline void bdx_rxdb_free_elem(struct rxdb *db, int n)
1004 * skb for rx. It assumes that Rx is desabled in HW 1004 * skb for rx. It assumes that Rx is desabled in HW
1005 * funcs are grouped for better cache usage 1005 * funcs are grouped for better cache usage
1006 * 1006 *
1007 * RxD fifo is smaller then RxF fifo by design. Upon high load, RxD will be 1007 * RxD fifo is smaller than RxF fifo by design. Upon high load, RxD will be
1008 * filled and packets will be dropped by nic without getting into host or 1008 * filled and packets will be dropped by nic without getting into host or
1009 * cousing interrupt. Anyway, in that condition, host has no chance to proccess 1009 * cousing interrupt. Anyway, in that condition, host has no chance to proccess
1010 * all packets, but dropping in nic is cheaper, since it takes 0 cpu cycles 1010 * all packets, but dropping in nic is cheaper, since it takes 0 cpu cycles
@@ -1826,7 +1826,7 @@ static void bdx_tx_free(struct bdx_priv *priv)
1826 * 1826 *
1827 * Pushes desc to TxD fifo and overlaps it if needed. 1827 * Pushes desc to TxD fifo and overlaps it if needed.
1828 * NOTE: this func does not check for available space. this is responsibility 1828 * NOTE: this func does not check for available space. this is responsibility
1829 * of the caller. Neither does it check that data size is smaller then 1829 * of the caller. Neither does it check that data size is smaller than
1830 * fifo size. 1830 * fifo size.
1831 */ 1831 */
1832static void bdx_tx_push_desc(struct bdx_priv *priv, void *data, int size) 1832static void bdx_tx_push_desc(struct bdx_priv *priv, void *data, int size)
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index a011666342ff..50eb29ce3c87 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -3064,7 +3064,7 @@ static int smctr_load_node_addr(struct net_device *dev)
3064 * will consequently cause a timeout. 3064 * will consequently cause a timeout.
3065 * 3065 *
3066 * NOTE 1: If the monitor_state is MS_BEACON_TEST_STATE, all transmit 3066 * NOTE 1: If the monitor_state is MS_BEACON_TEST_STATE, all transmit
3067 * queues other then the one used for the lobe_media_test should be 3067 * queues other than the one used for the lobe_media_test should be
3068 * disabled.!? 3068 * disabled.!?
3069 * 3069 *
3070 * NOTE 2: If the monitor_state is MS_BEACON_TEST_STATE and the receive_mask 3070 * NOTE 2: If the monitor_state is MS_BEACON_TEST_STATE and the receive_mask
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 350157fcd080..4223672c4432 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -3836,7 +3836,7 @@ static int reset_atmel_card(struct net_device *dev)
3836 This routine is also responsible for initialising some 3836 This routine is also responsible for initialising some
3837 hardware-specific fields in the atmel_private structure, 3837 hardware-specific fields in the atmel_private structure,
3838 including a copy of the firmware's hostinfo stucture 3838 including a copy of the firmware's hostinfo stucture
3839 which is the route into the rest of the firmare datastructures. */ 3839 which is the route into the rest of the firmware datastructures. */
3840 3840
3841 struct atmel_private *priv = netdev_priv(dev); 3841 struct atmel_private *priv = netdev_priv(dev);
3842 u8 configuration; 3842 u8 configuration;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 1667065b86a7..823c2bf5e31e 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1332,7 +1332,7 @@ static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv)
1332 IPW_AUX_HOST_RESET_REG_STOP_MASTER); 1332 IPW_AUX_HOST_RESET_REG_STOP_MASTER);
1333 1333
1334 /* Step 2. Wait for stop Master Assert 1334 /* Step 2. Wait for stop Master Assert
1335 * (not more then 50us, otherwise ret error */ 1335 * (not more than 50us, otherwise ret error */
1336 i = 5; 1336 i = 5;
1337 do { 1337 do {
1338 udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY); 1338 udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY);
@@ -1830,7 +1830,7 @@ static void ipw2100_down(struct ipw2100_priv *priv)
1830 cancel_delayed_work(&priv->rf_kill); 1830 cancel_delayed_work(&priv->rf_kill);
1831 } 1831 }
1832 1832
1833 /* Kill the firmare hang check timer */ 1833 /* Kill the firmware hang check timer */
1834 if (!priv->stop_hang_check) { 1834 if (!priv->stop_hang_check) {
1835 priv->stop_hang_check = 1; 1835 priv->stop_hang_check = 1;
1836 cancel_delayed_work(&priv->hang_check); 1836 cancel_delayed_work(&priv->hang_check);
diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index 37ad0d2fb64c..aee9cba13eb3 100644
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -184,8 +184,8 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, unsigned int align,
184 * Make room for new data, note that we increase both 184 * Make room for new data, note that we increase both
185 * headsize and tailsize when required. The tailsize is 185 * headsize and tailsize when required. The tailsize is
186 * only needed when ICV data needs to be inserted and 186 * only needed when ICV data needs to be inserted and
187 * the padding is smaller then the ICV data. 187 * the padding is smaller than the ICV data.
188 * When alignment requirements is greater then the 188 * When alignment requirements is greater than the
189 * ICV data we must trim the skb to the correct size 189 * ICV data we must trim the skb to the correct size
190 * because we need to remove the extra bytes. 190 * because we need to remove the extra bytes.
191 */ 191 */
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index dd0de3a9ed4e..7015f2480550 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -236,7 +236,7 @@ struct strip {
236 unsigned long tx_errors; /* Planned stuff */ 236 unsigned long tx_errors; /* Planned stuff */
237 unsigned long rx_dropped; /* No memory for skb */ 237 unsigned long rx_dropped; /* No memory for skb */
238 unsigned long tx_dropped; /* When MTU change */ 238 unsigned long tx_dropped; /* When MTU change */
239 unsigned long rx_over_errors; /* Frame bigger then STRIP buf. */ 239 unsigned long rx_over_errors; /* Frame bigger than STRIP buf. */
240 240
241 unsigned long pps_timer; /* Timer to determine pps */ 241 unsigned long pps_timer; /* Timer to determine pps */
242 unsigned long rx_pps_count; /* Counter to determine pps */ 242 unsigned long rx_pps_count; /* Counter to determine pps */
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 23a07fe15a2c..0b6b7730c716 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -630,7 +630,7 @@ ds1511_rtc_init(void)
630 static void __exit 630 static void __exit
631ds1511_rtc_exit(void) 631ds1511_rtc_exit(void)
632{ 632{
633 return platform_driver_unregister(&ds1511_rtc_driver); 633 platform_driver_unregister(&ds1511_rtc_driver);
634} 634}
635 635
636module_init(ds1511_rtc_init); 636module_init(ds1511_rtc_init);
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index dc0b6224ad9b..7d1547b0070e 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -399,7 +399,7 @@ static __init int stk17ta8_init(void)
399 399
400static __exit void stk17ta8_exit(void) 400static __exit void stk17ta8_exit(void)
401{ 401{
402 return platform_driver_unregister(&stk17ta8_rtc_driver); 402 platform_driver_unregister(&stk17ta8_rtc_driver);
403} 403}
404 404
405module_init(stk17ta8_init); 405module_init(stk17ta8_init);
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 892e2878d61b..f8e05ce98621 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -535,8 +535,8 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
535 eerb->buffer_page_count > INT_MAX / PAGE_SIZE) { 535 eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
536 kfree(eerb); 536 kfree(eerb);
537 MESSAGE(KERN_WARNING, "can't open device since module " 537 MESSAGE(KERN_WARNING, "can't open device since module "
538 "parameter eer_pages is smaller then 1 or" 538 "parameter eer_pages is smaller than 1 or"
539 " bigger then %d", (int)(INT_MAX / PAGE_SIZE)); 539 " bigger than %d", (int)(INT_MAX / PAGE_SIZE));
540 unlock_kernel(); 540 unlock_kernel();
541 return -EINVAL; 541 return -EINVAL;
542 } 542 }
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index aabbeb909cc6..d8a2289fcb69 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -427,7 +427,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
427 buffer = priv->buffer + sizeof(int); 427 buffer = priv->buffer + sizeof(int);
428 } 428 }
429 /* 429 /*
430 * If the record is bigger then our buffer, we receive only 430 * If the record is bigger than our buffer, we receive only
431 * a part of it. We can get the rest later. 431 * a part of it. We can get the rest later.
432 */ 432 */
433 if (iucv_data_count > NET_BUFFER_SIZE) 433 if (iucv_data_count > NET_BUFFER_SIZE)
@@ -437,7 +437,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
437 0, buffer, iucv_data_count, 437 0, buffer, iucv_data_count,
438 &priv->residual_length); 438 &priv->residual_length);
439 spin_unlock_bh(&priv->priv_lock); 439 spin_unlock_bh(&priv->priv_lock);
440 /* An rc of 5 indicates that the record was bigger then 440 /* An rc of 5 indicates that the record was bigger than
441 * the buffer, which is OK for us. A 9 indicates that the 441 * the buffer, which is OK for us. A 9 indicates that the
442 * record was purged befor we could receive it. 442 * record was purged befor we could receive it.
443 */ 443 */
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 3c298c7253ee..964769f66eac 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -633,7 +633,7 @@ static int orc_device_reset(struct orc_host * host, struct scsi_cmnd *cmd, unsig
633 return FAILED; 633 return FAILED;
634 } 634 }
635 635
636 /* Reset device is handled by the firmare, we fill in an SCB and 636 /* Reset device is handled by the firmware, we fill in an SCB and
637 fire it at the controller, it does the rest */ 637 fire it at the controller, it does the rest */
638 scb->opcode = ORC_BUSDEVRST; 638 scb->opcode = ORC_BUSDEVRST;
639 scb->target = target; 639 scb->target = target;
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 8c64494444bf..311ed6dea726 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1964,10 +1964,10 @@ lpfc_set_disctmo(struct lpfc_vport *vport)
1964 uint32_t tmo; 1964 uint32_t tmo;
1965 1965
1966 if (vport->port_state == LPFC_LOCAL_CFG_LINK) { 1966 if (vport->port_state == LPFC_LOCAL_CFG_LINK) {
1967 /* For FAN, timeout should be greater then edtov */ 1967 /* For FAN, timeout should be greater than edtov */
1968 tmo = (((phba->fc_edtov + 999) / 1000) + 1); 1968 tmo = (((phba->fc_edtov + 999) / 1000) + 1);
1969 } else { 1969 } else {
1970 /* Normal discovery timeout should be > then ELS/CT timeout 1970 /* Normal discovery timeout should be > than ELS/CT timeout
1971 * FC spec states we need 3 * ratov for CT requests 1971 * FC spec states we need 3 * ratov for CT requests
1972 */ 1972 */
1973 tmo = ((phba->fc_ratov * 3) + 3); 1973 tmo = ((phba->fc_ratov * 3) + 3);
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 01dfdc8696f8..a36a120561e2 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -420,7 +420,7 @@ lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
420 if (unlikely(pring->local_getidx >= max_cmd_idx)) { 420 if (unlikely(pring->local_getidx >= max_cmd_idx)) {
421 lpfc_printf_log(phba, KERN_ERR, LOG_SLI, 421 lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
422 "0315 Ring %d issue: portCmdGet %d " 422 "0315 Ring %d issue: portCmdGet %d "
423 "is bigger then cmd ring %d\n", 423 "is bigger than cmd ring %d\n",
424 pring->ringno, 424 pring->ringno,
425 pring->local_getidx, max_cmd_idx); 425 pring->local_getidx, max_cmd_idx);
426 426
@@ -1628,12 +1628,12 @@ lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
1628{ 1628{
1629 struct lpfc_pgp *pgp = &phba->port_gp[pring->ringno]; 1629 struct lpfc_pgp *pgp = &phba->port_gp[pring->ringno];
1630 /* 1630 /*
1631 * Ring <ringno> handler: portRspPut <portRspPut> is bigger then 1631 * Ring <ringno> handler: portRspPut <portRspPut> is bigger than
1632 * rsp ring <portRspMax> 1632 * rsp ring <portRspMax>
1633 */ 1633 */
1634 lpfc_printf_log(phba, KERN_ERR, LOG_SLI, 1634 lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
1635 "0312 Ring %d handler: portRspPut %d " 1635 "0312 Ring %d handler: portRspPut %d "
1636 "is bigger then rsp ring %d\n", 1636 "is bigger than rsp ring %d\n",
1637 pring->ringno, le32_to_cpu(pgp->rspPutInx), 1637 pring->ringno, le32_to_cpu(pgp->rspPutInx),
1638 pring->numRiocb); 1638 pring->numRiocb);
1639 1639
@@ -2083,12 +2083,12 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
2083 portRspPut = le32_to_cpu(pgp->rspPutInx); 2083 portRspPut = le32_to_cpu(pgp->rspPutInx);
2084 if (portRspPut >= portRspMax) { 2084 if (portRspPut >= portRspMax) {
2085 /* 2085 /*
2086 * Ring <ringno> handler: portRspPut <portRspPut> is bigger then 2086 * Ring <ringno> handler: portRspPut <portRspPut> is bigger than
2087 * rsp ring <portRspMax> 2087 * rsp ring <portRspMax>
2088 */ 2088 */
2089 lpfc_printf_log(phba, KERN_ERR, LOG_SLI, 2089 lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
2090 "0303 Ring %d handler: portRspPut %d " 2090 "0303 Ring %d handler: portRspPut %d "
2091 "is bigger then rsp ring %d\n", 2091 "is bigger than rsp ring %d\n",
2092 pring->ringno, portRspPut, portRspMax); 2092 pring->ringno, portRspPut, portRspMax);
2093 2093
2094 phba->link_state = LPFC_HBA_ERROR; 2094 phba->link_state = LPFC_HBA_ERROR;
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 7dc62deb4087..9fdcd60c5493 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1967,8 +1967,8 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
1967 scb->state |= aor; 1967 scb->state |= aor;
1968 1968
1969 /* 1969 /*
1970 * Check if this command has firmare owenership. If 1970 * Check if this command has firmware ownership. If
1971 * yes, we cannot reset this command. Whenever, f/w 1971 * yes, we cannot reset this command. Whenever f/w
1972 * completes this command, we will return appropriate 1972 * completes this command, we will return appropriate
1973 * status from ISR. 1973 * status from ISR.
1974 */ 1974 */
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 8cb9240596ab..df09820e8916 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -128,7 +128,7 @@
128 - Integrate ql12160_set_target_parameters() with 1280 version 128 - Integrate ql12160_set_target_parameters() with 1280 version
129 - Make qla1280_setup() non static 129 - Make qla1280_setup() non static
130 - Do not call qla1280_check_for_dead_scsi_bus() on every I/O request 130 - Do not call qla1280_check_for_dead_scsi_bus() on every I/O request
131 sent to the card - this command pauses the firmare!!! 131 sent to the card - this command pauses the firmware!!!
132 Rev 3.23.15 Beta March 19, 2002, Jes Sorensen 132 Rev 3.23.15 Beta March 19, 2002, Jes Sorensen
133 - Clean up qla1280.h - remove obsolete QL_DEBUG_LEVEL_x definitions 133 - Clean up qla1280.h - remove obsolete QL_DEBUG_LEVEL_x definitions
134 - Remove a pile of pointless and confusing (srb_t **) and 134 - Remove a pile of pointless and confusing (srb_t **) and
@@ -659,7 +659,7 @@ static int qla1280_read_nvram(struct scsi_qla_host *ha)
659 /* The firmware interface is, um, interesting, in that the 659 /* The firmware interface is, um, interesting, in that the
660 * actual firmware image on the chip is little endian, thus, 660 * actual firmware image on the chip is little endian, thus,
661 * the process of taking that image to the CPU would end up 661 * the process of taking that image to the CPU would end up
662 * little endian. However, the firmare interface requires it 662 * little endian. However, the firmware interface requires it
663 * to be read a word (two bytes) at a time. 663 * to be read a word (two bytes) at a time.
664 * 664 *
665 * The net result of this would be that the word (and 665 * The net result of this would be that the word (and
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index c577d79bd7e8..051b0f5e8c8e 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -392,7 +392,7 @@ int qla4xxx_get_firmware_status(struct scsi_qla_host * ha)
392 ha->iocb_hiwat -= IOCB_HIWAT_CUSHION; 392 ha->iocb_hiwat -= IOCB_HIWAT_CUSHION;
393 else 393 else
394 dev_info(&ha->pdev->dev, "WARNING!!! You have less than %d " 394 dev_info(&ha->pdev->dev, "WARNING!!! You have less than %d "
395 "firmare IOCBs available (%d).\n", 395 "firmware IOCBs available (%d).\n",
396 IOCB_HIWAT_CUSHION, ha->iocb_hiwat); 396 IOCB_HIWAT_CUSHION, ha->iocb_hiwat);
397 397
398 return QLA_SUCCESS; 398 return QLA_SUCCESS;
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 381838ebd460..d86ebea9350a 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1650,7 +1650,7 @@ int scsi_error_handler(void *data)
1650 * We use TASK_INTERRUPTIBLE so that the thread is not 1650 * We use TASK_INTERRUPTIBLE so that the thread is not
1651 * counted against the load average as a running process. 1651 * counted against the load average as a running process.
1652 * We never actually get interrupted because kthread_run 1652 * We never actually get interrupted because kthread_run
1653 * disables singal delivery for the created thread. 1653 * disables signal delivery for the created thread.
1654 */ 1654 */
1655 set_current_state(TASK_INTERRUPTIBLE); 1655 set_current_state(TASK_INTERRUPTIBLE);
1656 while (!kthread_should_stop()) { 1656 while (!kthread_should_stop()) {
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index daa00567bc44..1889a63ebc22 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -3123,7 +3123,7 @@ static int __init serial8250_init(void)
3123 if (nr_uarts > UART_NR) 3123 if (nr_uarts > UART_NR)
3124 nr_uarts = UART_NR; 3124 nr_uarts = UART_NR;
3125 3125
3126 printk(KERN_INFO "Serial: 8250/16550 driver" 3126 printk(KERN_INFO "Serial: 8250/16550 driver, "
3127 "%d ports, IRQ sharing %sabled\n", nr_uarts, 3127 "%d ports, IRQ sharing %sabled\n", nr_uarts,
3128 share_irqs ? "en" : "dis"); 3128 share_irqs ? "en" : "dis");
3129 3129
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 8b2c619a09f2..e642c22c80e2 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -1203,7 +1203,7 @@ static void e100_disable_txdma_channel(struct e100_serial *info)
1203 unsigned long flags; 1203 unsigned long flags;
1204 1204
1205 /* Disable output DMA channel for the serial port in question 1205 /* Disable output DMA channel for the serial port in question
1206 * ( set to something other then serialX) 1206 * ( set to something other than serialX)
1207 */ 1207 */
1208 local_irq_save(flags); 1208 local_irq_save(flags);
1209 DFLOW(DEBUG_LOG(info->line, "disable_txdma_channel %i\n", info->line)); 1209 DFLOW(DEBUG_LOG(info->line, "disable_txdma_channel %i\n", info->line));
@@ -1266,7 +1266,7 @@ static void e100_disable_rxdma_channel(struct e100_serial *info)
1266 unsigned long flags; 1266 unsigned long flags;
1267 1267
1268 /* Disable input DMA channel for the serial port in question 1268 /* Disable input DMA channel for the serial port in question
1269 * ( set to something other then serialX) 1269 * ( set to something other than serialX)
1270 */ 1270 */
1271 local_irq_save(flags); 1271 local_irq_save(flags);
1272 if (info->line == 0) { 1272 if (info->line == 0) {
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c
index 686795e97195..c7080d497311 100644
--- a/drivers/uwb/i1480/dfu/usb.c
+++ b/drivers/uwb/i1480/dfu/usb.c
@@ -387,7 +387,7 @@ int i1480_usb_probe(struct usb_interface *iface, const struct usb_device_id *id)
387 goto error_create; 387 goto error_create;
388 } 388 }
389 389
390 /* setup the fops and upload the firmare */ 390 /* setup the fops and upload the firmware */
391 i1480->pre_fw_name = "i1480-pre-phy-0.0.bin"; 391 i1480->pre_fw_name = "i1480-pre-phy-0.0.bin";
392 i1480->mac_fw_name = "i1480-usb-0.0.bin"; 392 i1480->mac_fw_name = "i1480-usb-0.0.bin";
393 i1480->mac_fw_name_deprecate = "ptc-0.0.bin"; 393 i1480->mac_fw_name_deprecate = "ptc-0.0.bin";
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index e6210725b9ab..d012edda6d11 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -1332,7 +1332,7 @@ static void vgacon_save_screen(struct vc_data *c)
1332 c->vc_y = screen_info.orig_y; 1332 c->vc_y = screen_info.orig_y;
1333 } 1333 }
1334 1334
1335 /* We can't copy in more then the size of the video buffer, 1335 /* We can't copy in more than the size of the video buffer,
1336 * or we'll be copying in VGA BIOS */ 1336 * or we'll be copying in VGA BIOS */
1337 1337
1338 if (!vga_is_gfx) 1338 if (!vga_is_gfx)
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c
index 6d04e050c74e..f54360f50a9c 100644
--- a/fs/ncpfs/ioctl.c
+++ b/fs/ncpfs/ioctl.c
@@ -98,7 +98,7 @@ struct compat_ncp_objectname_ioctl
98{ 98{
99 s32 auth_type; 99 s32 auth_type;
100 u32 object_name_len; 100 u32 object_name_len;
101 compat_caddr_t object_name; /* an userspace data, in most cases user name */ 101 compat_caddr_t object_name; /* a userspace data, in most cases user name */
102}; 102};
103 103
104struct compat_ncp_fs_info_v2 { 104struct compat_ncp_fs_info_v2 {
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 6ebaa58e2c03..04697ba7f73e 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -854,7 +854,7 @@ static int o2hb_thread(void *data)
854 854
855 while (!kthread_should_stop() && !reg->hr_unclean_stop) { 855 while (!kthread_should_stop() && !reg->hr_unclean_stop) {
856 /* We track the time spent inside 856 /* We track the time spent inside
857 * o2hb_do_disk_heartbeat so that we avoid more then 857 * o2hb_do_disk_heartbeat so that we avoid more than
858 * hr_timeout_ms between disk writes. On busy systems 858 * hr_timeout_ms between disk writes. On busy systems
859 * this should result in a heartbeat which is less 859 * this should result in a heartbeat which is less
860 * likely to time itself out. */ 860 * likely to time itself out. */
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 219bd79ea894..d4a8be32b902 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -9,7 +9,7 @@
9 9
10/* 10/*
11 * Logic: we've got two memory sums for each process, "shared", and 11 * Logic: we've got two memory sums for each process, "shared", and
12 * "non-shared". Shared memory may get counted more then once, for 12 * "non-shared". Shared memory may get counted more than once, for
13 * each process that owns it. Non-shared memory is counted 13 * each process that owns it. Non-shared memory is counted
14 * accurately. 14 * accurately.
15 */ 15 */
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index 91ceeda7e5bf..e35b54d5059d 100644
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -40,7 +40,7 @@ config UBIFS_FS_ZLIB
40 depends on UBIFS_FS 40 depends on UBIFS_FS
41 default y 41 default y
42 help 42 help
43 Zlib copresses better then LZO but it is slower. Say 'Y' if unsure. 43 Zlib compresses better than LZO but it is slower. Say 'Y' if unsure.
44 44
45# Debugging-related stuff 45# Debugging-related stuff
46config UBIFS_FS_DEBUG 46config UBIFS_FS_DEBUG
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c
index 0e5e54d82924..175f9c590b77 100644
--- a/fs/ubifs/budget.c
+++ b/fs/ubifs/budget.c
@@ -142,7 +142,7 @@ static long long get_liability(struct ubifs_info *c)
142 * 142 *
143 * This function is called when an operation cannot be budgeted because there 143 * This function is called when an operation cannot be budgeted because there
144 * is supposedly no free space. But in most cases there is some free space: 144 * is supposedly no free space. But in most cases there is some free space:
145 * o budgeting is pessimistic, so it always budgets more then it is actually 145 * o budgeting is pessimistic, so it always budgets more than it is actually
146 * needed, so shrinking the liability is one way to make free space - the 146 * needed, so shrinking the liability is one way to make free space - the
147 * cached data will take less space then it was budgeted for; 147 * cached data will take less space then it was budgeted for;
148 * o GC may turn some dark space into free space (budgeting treats dark space 148 * o GC may turn some dark space into free space (budgeting treats dark space
@@ -606,7 +606,7 @@ void ubifs_release_budget(struct ubifs_info *c, struct ubifs_budget_req *req)
606 * @c: UBIFS file-system description object 606 * @c: UBIFS file-system description object
607 * 607 *
608 * This function converts budget which was allocated for a new page of data to 608 * This function converts budget which was allocated for a new page of data to
609 * the budget of changing an existing page of data. The latter is smaller then 609 * the budget of changing an existing page of data. The latter is smaller than
610 * the former, so this function only does simple re-calculation and does not 610 * the former, so this function only does simple re-calculation and does not
611 * involve any write-back. 611 * involve any write-back.
612 */ 612 */
diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c
index 0bef6501d58a..9832f9abe28e 100644
--- a/fs/ubifs/gc.c
+++ b/fs/ubifs/gc.c
@@ -45,7 +45,7 @@
45#define SMALL_NODE_WM UBIFS_MAX_DENT_NODE_SZ 45#define SMALL_NODE_WM UBIFS_MAX_DENT_NODE_SZ
46 46
47/* 47/*
48 * GC may need to move more then one LEB to make progress. The below constants 48 * GC may need to move more than one LEB to make progress. The below constants
49 * define "soft" and "hard" limits on the number of LEBs the garbage collector 49 * define "soft" and "hard" limits on the number of LEBs the garbage collector
50 * may move. 50 * may move.
51 */ 51 */
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index 10ae25b7d1db..9b7c54e0cd2a 100644
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -191,7 +191,7 @@ again:
191 if (wbuf->lnum != -1 && avail >= len) { 191 if (wbuf->lnum != -1 && avail >= len) {
192 /* 192 /*
193 * Someone else has switched the journal head and we have 193 * Someone else has switched the journal head and we have
194 * enough space now. This happens when more then one process is 194 * enough space now. This happens when more than one process is
195 * trying to write to the same journal head at the same time. 195 * trying to write to the same journal head at the same time.
196 */ 196 */
197 dbg_jnl("return LEB %d back, already have LEB %d:%d", 197 dbg_jnl("return LEB %d back, already have LEB %d:%d",
diff --git a/fs/ubifs/shrinker.c b/fs/ubifs/shrinker.c
index f248533841a2..e7bab52a1410 100644
--- a/fs/ubifs/shrinker.c
+++ b/fs/ubifs/shrinker.c
@@ -151,7 +151,7 @@ static int shrink_tnc(struct ubifs_info *c, int nr, int age, int *contention)
151 * @contention: if any contention, this is set to %1 151 * @contention: if any contention, this is set to %1
152 * 152 *
153 * This function walks the list of mounted UBIFS file-systems and frees clean 153 * This function walks the list of mounted UBIFS file-systems and frees clean
154 * znodes which are older then @age, until at least @nr znodes are freed. 154 * znodes which are older than @age, until at least @nr znodes are freed.
155 * Returns the number of freed znodes. 155 * Returns the number of freed znodes.
156 */ 156 */
157static int shrink_tnc_trees(int nr, int age, int *contention) 157static int shrink_tnc_trees(int nr, int age, int *contention)
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 36f6cc703ef2..be846d606ae8 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1348,7 +1348,7 @@ xfs_finish_flags(
1348{ 1348{
1349 int ronly = (mp->m_flags & XFS_MOUNT_RDONLY); 1349 int ronly = (mp->m_flags & XFS_MOUNT_RDONLY);
1350 1350
1351 /* Fail a mount where the logbuf is smaller then the log stripe */ 1351 /* Fail a mount where the logbuf is smaller than the log stripe */
1352 if (xfs_sb_version_haslogv2(&mp->m_sb)) { 1352 if (xfs_sb_version_haslogv2(&mp->m_sb)) {
1353 if (mp->m_logbsize <= 0 && 1353 if (mp->m_logbsize <= 0 &&
1354 mp->m_sb.sb_logsunit > XLOG_BIG_RECORD_BSIZE) { 1354 mp->m_sb.sb_logsunit > XLOG_BIG_RECORD_BSIZE) {
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h
index a597207e2835..1954c9d1d012 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -333,8 +333,8 @@ struct acpi_integer_overlay {
333#define ACPI_INSERT_BITS(target, mask, source) target = ((target & (~(mask))) | (source & mask)) 333#define ACPI_INSERT_BITS(target, mask, source) target = ((target & (~(mask))) | (source & mask))
334 334
335/* 335/*
336 * An struct acpi_namespace_node can appear in some contexts 336 * A struct acpi_namespace_node can appear in some contexts
337 * where a pointer to an union acpi_operand_object can also 337 * where a pointer to a union acpi_operand_object can also
338 * appear. This macro is used to distinguish them. 338 * appear. This macro is used to distinguish them.
339 * 339 *
340 * The "Descriptor" field is the first field in both structures. 340 * The "Descriptor" field is the first field in both structures.
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 7220361790b3..8222e8de0d1c 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -467,7 +467,7 @@ typedef u32 acpi_object_type;
467 467
468/* 468/*
469 * These are special object types that never appear in 469 * These are special object types that never appear in
470 * a Namespace node, only in an union acpi_operand_object 470 * a Namespace node, only in a union acpi_operand_object
471 */ 471 */
472#define ACPI_TYPE_LOCAL_EXTRA 0x1C 472#define ACPI_TYPE_LOCAL_EXTRA 0x1C
473#define ACPI_TYPE_LOCAL_DATA 0x1D 473#define ACPI_TYPE_LOCAL_DATA 0x1D
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index eae26bb6430a..64433eb411d7 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -83,7 +83,7 @@ typedef enum {
83 * @datbuf: data buffer - if NULL only oob data are read/written 83 * @datbuf: data buffer - if NULL only oob data are read/written
84 * @oobbuf: oob data buffer 84 * @oobbuf: oob data buffer
85 * 85 *
86 * Note, it is allowed to read more then one OOB area at one go, but not write. 86 * Note, it is allowed to read more than one OOB area at one go, but not write.
87 * The interface assumes that the OOB write requests program only one page's 87 * The interface assumes that the OOB write requests program only one page's
88 * OOB area. 88 * OOB area.
89 */ 89 */
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h
index 9f2d76347f19..f69e66d151cc 100644
--- a/include/linux/ncp_fs.h
+++ b/include/linux/ncp_fs.h
@@ -87,7 +87,7 @@ struct ncp_objectname_ioctl
87#define NCP_AUTH_NDS 0x32 87#define NCP_AUTH_NDS 0x32
88 int auth_type; 88 int auth_type;
89 size_t object_name_len; 89 size_t object_name_len;
90 void __user * object_name; /* an userspace data, in most cases user name */ 90 void __user * object_name; /* a userspace data, in most cases user name */
91}; 91};
92 92
93struct ncp_privatedata_ioctl 93struct ncp_privatedata_ioctl
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 82229317753d..68bb1c501d0d 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -327,9 +327,9 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum);
327 * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped 327 * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped
328 * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped 328 * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped
329 * @len: size of rx and tx buffers (in bytes) 329 * @len: size of rx and tx buffers (in bytes)
330 * @speed_hz: Select a speed other then the device default for this 330 * @speed_hz: Select a speed other than the device default for this
331 * transfer. If 0 the default (from @spi_device) is used. 331 * transfer. If 0 the default (from @spi_device) is used.
332 * @bits_per_word: select a bits_per_word other then the device default 332 * @bits_per_word: select a bits_per_word other than the device default
333 * for this transfer. If 0 the default (from @spi_device) is used. 333 * for this transfer. If 0 the default (from @spi_device) is used.
334 * @cs_change: affects chipselect after this transfer completes 334 * @cs_change: affects chipselect after this transfer completes
335 * @delay_usecs: microseconds to delay after this transfer before 335 * @delay_usecs: microseconds to delay after this transfer before
diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h
index ccdc562e444e..2dc2eb2b8e22 100644
--- a/include/mtd/ubi-user.h
+++ b/include/mtd/ubi-user.h
@@ -253,7 +253,7 @@ struct ubi_mkvol_req {
253 * 253 *
254 * Re-sizing is possible for both dynamic and static volumes. But while dynamic 254 * Re-sizing is possible for both dynamic and static volumes. But while dynamic
255 * volumes may be re-sized arbitrarily, static volumes cannot be made to be 255 * volumes may be re-sized arbitrarily, static volumes cannot be made to be
256 * smaller then the number of bytes they bear. To arbitrarily shrink a static 256 * smaller than the number of bytes they bear. To arbitrarily shrink a static
257 * volume, it must be wiped out first (by means of volume update operation with 257 * volume, it must be wiped out first (by means of volume update operation with
258 * zero number of bytes). 258 * zero number of bytes).
259 */ 259 */
diff --git a/init/main.c b/init/main.c
index b5a892c68375..05b313283311 100644
--- a/init/main.c
+++ b/init/main.c
@@ -599,7 +599,8 @@ asmlinkage void __init start_kernel(void)
599 sched_clock_init(); 599 sched_clock_init();
600 profile_init(); 600 profile_init();
601 if (!irqs_disabled()) 601 if (!irqs_disabled())
602 printk("start_kernel(): bug: interrupts were enabled early\n"); 602 printk(KERN_CRIT "start_kernel(): bug: interrupts were "
603 "enabled early\n");
603 early_boot_irqs_on(); 604 early_boot_irqs_on();
604 local_irq_enable(); 605 local_irq_enable();
605 606
diff --git a/kernel/pid.c b/kernel/pid.c
index 064e76afa507..af9224cdd6c0 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -475,7 +475,7 @@ pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
475EXPORT_SYMBOL(task_session_nr_ns); 475EXPORT_SYMBOL(task_session_nr_ns);
476 476
477/* 477/*
478 * Used by proc to find the first pid that is greater then or equal to nr. 478 * Used by proc to find the first pid that is greater than or equal to nr.
479 * 479 *
480 * If there is a pid at nr this function is exactly the same as find_pid_ns. 480 * If there is a pid at nr this function is exactly the same as find_pid_ns.
481 */ 481 */
diff --git a/kernel/printk.c b/kernel/printk.c
index e651ab05655f..7015733793e8 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -619,7 +619,7 @@ static int acquire_console_semaphore_for_printk(unsigned int cpu)
619static const char recursion_bug_msg [] = 619static const char recursion_bug_msg [] =
620 KERN_CRIT "BUG: recent printk recursion!\n"; 620 KERN_CRIT "BUG: recent printk recursion!\n";
621static int recursion_bug; 621static int recursion_bug;
622 static int new_text_line = 1; 622static int new_text_line = 1;
623static char printk_buf[1024]; 623static char printk_buf[1024];
624 624
625asmlinkage int vprintk(const char *fmt, va_list args) 625asmlinkage int vprintk(const char *fmt, va_list args)
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index 1ca99557e929..06f197560f3b 100644
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -45,7 +45,7 @@
45 * 45 *
46 * The value 8 is somewhat carefully chosen, as anything 46 * The value 8 is somewhat carefully chosen, as anything
47 * larger can result in overflows. NSEC_PER_JIFFY grows as 47 * larger can result in overflows. NSEC_PER_JIFFY grows as
48 * HZ shrinks, so values greater then 8 overflow 32bits when 48 * HZ shrinks, so values greater than 8 overflow 32bits when
49 * HZ=100. 49 * HZ=100.
50 */ 50 */
51#define JIFFIES_SHIFT 8 51#define JIFFIES_SHIFT 8
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 8d3fb0bd1288..4bb42a0344ec 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -640,13 +640,14 @@ EXPORT_SYMBOL(radix_tree_tag_get);
640 * 640 *
641 * Returns: the index of the hole if found, otherwise returns an index 641 * Returns: the index of the hole if found, otherwise returns an index
642 * outside of the set specified (in which case 'return - index >= max_scan' 642 * outside of the set specified (in which case 'return - index >= max_scan'
643 * will be true). 643 * will be true). In rare cases of index wrap-around, 0 will be returned.
644 * 644 *
645 * radix_tree_next_hole may be called under rcu_read_lock. However, like 645 * radix_tree_next_hole may be called under rcu_read_lock. However, like
646 * radix_tree_gang_lookup, this will not atomically search a snapshot of the 646 * radix_tree_gang_lookup, this will not atomically search a snapshot of
647 * tree at a single point in time. For example, if a hole is created at index 647 * the tree at a single point in time. For example, if a hole is created
648 * 5, then subsequently a hole is created at index 10, radix_tree_next_hole 648 * at index 5, then subsequently a hole is created at index 10,
649 * covering both indexes may return 10 if called under rcu_read_lock. 649 * radix_tree_next_hole covering both indexes may return 10 if called
650 * under rcu_read_lock.
650 */ 651 */
651unsigned long radix_tree_next_hole(struct radix_tree_root *root, 652unsigned long radix_tree_next_hole(struct radix_tree_root *root,
652 unsigned long index, unsigned long max_scan) 653 unsigned long index, unsigned long max_scan)
diff --git a/mm/slub.c b/mm/slub.c
index f0e2892fe403..6392ae5cc6b1 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2254,7 +2254,7 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
2254 * Add some empty padding so that we can catch 2254 * Add some empty padding so that we can catch
2255 * overwrites from earlier objects rather than let 2255 * overwrites from earlier objects rather than let
2256 * tracking information or the free pointer be 2256 * tracking information or the free pointer be
2257 * corrupted if an user writes before the start 2257 * corrupted if a user writes before the start
2258 * of the object. 2258 * of the object.
2259 */ 2259 */
2260 size += sizeof(void *); 2260 size += sizeof(void *);
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 52db5f60daa0..20c576f530fa 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -141,8 +141,8 @@ void sctp_auth_destroy_keys(struct list_head *keys)
141/* Compare two byte vectors as numbers. Return values 141/* Compare two byte vectors as numbers. Return values
142 * are: 142 * are:
143 * 0 - vectors are equal 143 * 0 - vectors are equal
144 * < 0 - vector 1 is smaller then vector2 144 * < 0 - vector 1 is smaller than vector2
145 * > 0 - vector 1 is greater then vector2 145 * > 0 - vector 1 is greater than vector2
146 * 146 *
147 * Algorithm is: 147 * Algorithm is:
148 * This is performed by selecting the numerically smaller key vector... 148 * This is performed by selecting the numerically smaller key vector...
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 1c4e5d6c29c0..3a0cd075914f 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -4268,9 +4268,9 @@ nomem:
4268 4268
4269/* 4269/*
4270 * Handle a protocol violation when the chunk length is invalid. 4270 * Handle a protocol violation when the chunk length is invalid.
4271 * "Invalid" length is identified as smaller then the minimal length a 4271 * "Invalid" length is identified as smaller than the minimal length a
4272 * given chunk can be. For example, a SACK chunk has invalid length 4272 * given chunk can be. For example, a SACK chunk has invalid length
4273 * if it's length is set to be smaller then the size of sctp_sack_chunk_t. 4273 * if its length is set to be smaller than the size of sctp_sack_chunk_t.
4274 * 4274 *
4275 * We inform the other end by sending an ABORT with a Protocol Violation 4275 * We inform the other end by sending an ABORT with a Protocol Violation
4276 * error code. 4276 * error code.
@@ -4300,7 +4300,7 @@ static sctp_disposition_t sctp_sf_violation_chunklen(
4300 4300
4301/* 4301/*
4302 * Handle a protocol violation when the parameter length is invalid. 4302 * Handle a protocol violation when the parameter length is invalid.
4303 * "Invalid" length is identified as smaller then the minimal length a 4303 * "Invalid" length is identified as smaller than the minimal length a
4304 * given parameter can be. 4304 * given parameter can be.
4305 */ 4305 */
4306static sctp_disposition_t sctp_sf_violation_paramlen( 4306static sctp_disposition_t sctp_sf_violation_paramlen(
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index b14a8f33e42d..ff0a8f88de04 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -2717,7 +2717,7 @@ static int sctp_setsockopt_associnfo(struct sock *sk, char __user *optval, int o
2717 paths++; 2717 paths++;
2718 } 2718 }
2719 2719
2720 /* Only validate asocmaxrxt if we have more then 2720 /* Only validate asocmaxrxt if we have more than
2721 * one path/transport. We do this because path 2721 * one path/transport. We do this because path
2722 * retransmissions are only counted when we have more 2722 * retransmissions are only counted when we have more
2723 * then one path. 2723 * then one path.
diff --git a/net/sctp/tsnmap.c b/net/sctp/tsnmap.c
index 35c73e82553a..9bd64565021a 100644
--- a/net/sctp/tsnmap.c
+++ b/net/sctp/tsnmap.c
@@ -227,7 +227,7 @@ void sctp_tsnmap_skip(struct sctp_tsnmap *map, __u32 tsn)
227 */ 227 */
228 bitmap_zero(map->tsn_map, map->len); 228 bitmap_zero(map->tsn_map, map->len);
229 } else { 229 } else {
230 /* If the gap is smaller then the map size, 230 /* If the gap is smaller than the map size,
231 * shift the map by 'gap' bits and update further. 231 * shift the map by 'gap' bits and update further.
232 */ 232 */
233 bitmap_shift_right(map->tsn_map, map->tsn_map, gap, map->len); 233 bitmap_shift_right(map->tsn_map, map->tsn_map, gap, map->len);
diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c
index a0274f3dac08..3ee9900ffd7b 100644
--- a/sound/oss/aedsp16.c
+++ b/sound/oss/aedsp16.c
@@ -157,7 +157,7 @@
157 157
158 Started Fri Mar 17 16:13:18 MET 1995 158 Started Fri Mar 17 16:13:18 MET 1995
159 159
160 v0.1 (ALPHA, was an user-level program called AudioExcelDSP16.c) 160 v0.1 (ALPHA, was a user-level program called AudioExcelDSP16.c)
161 - Initial code. 161 - Initial code.
162 v0.2 (ALPHA) 162 v0.2 (ALPHA)
163 - Cleanups. 163 - Cleanups.
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index ca26c532e77e..11639bd72a51 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -238,7 +238,7 @@ static void i_usX2Y_In04Int(struct urb *urb)
238 send = 0; 238 send = 0;
239 for (j = 0; j < URBS_AsyncSeq && !err; ++j) 239 for (j = 0; j < URBS_AsyncSeq && !err; ++j)
240 if (0 == usX2Y->AS04.urb[j]->status) { 240 if (0 == usX2Y->AS04.urb[j]->status) {
241 struct us428_p4out *p4out = us428ctls->p4out + send; // FIXME if more then 1 p4out is new, 1 gets lost. 241 struct us428_p4out *p4out = us428ctls->p4out + send; // FIXME if more than 1 p4out is new, 1 gets lost.
242 usb_fill_bulk_urb(usX2Y->AS04.urb[j], usX2Y->chip.dev, 242 usb_fill_bulk_urb(usX2Y->AS04.urb[j], usX2Y->chip.dev,
243 usb_sndbulkpipe(usX2Y->chip.dev, 0x04), &p4out->val.vol, 243 usb_sndbulkpipe(usX2Y->chip.dev, 0x04), &p4out->val.vol,
244 p4out->type == eLT_Light ? sizeof(struct us428_lights) : 5, 244 p4out->type == eLT_Light ? sizeof(struct us428_lights) : 5,