From b34020a90848660e44012a84e9a9f09901903dc6 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Tue, 6 Jan 2009 10:08:33 +0000 Subject: [PATCH] --- yaml --- r: 126930 b: refs/heads/master c: e4fefbac6c5bcb0388d95e83801210e7d81a071b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/CREDITS | 2 +- trunk/Documentation/dell_rbu.txt | 4 +- trunk/Documentation/hwmon/abituguru-datasheet | 6 +- trunk/Documentation/laptops/thinkpad-acpi.txt | 2 +- trunk/Documentation/networking/rxrpc.txt | 2 +- trunk/Documentation/networking/tuntap.txt | 2 +- trunk/Documentation/scsi/ChangeLog.lpfc | 2 +- trunk/Documentation/scsi/ChangeLog.ncr53c8xx | 2 +- trunk/Documentation/scsi/ChangeLog.sym53c8xx | 2 +- trunk/MAINTAINERS | 3 +- trunk/Makefile | 2 +- trunk/arch/blackfin/kernel/kgdb.c | 2 +- trunk/arch/cris/arch-v32/kernel/signal.c | 2 +- trunk/arch/ia64/kernel/kprobes.c | 2 +- trunk/arch/m68k/Kconfig | 2 +- trunk/arch/m68k/kernel/traps.c | 2 +- .../pmc-sierra/yosemite/atmel_read_eeprom.c | 2 +- trunk/arch/powerpc/boot/Makefile | 2 +- trunk/arch/powerpc/kernel/kprobes.c | 2 +- .../arch/powerpc/oprofile/cell/spu_profiler.c | 2 +- trunk/arch/s390/Kconfig | 2 +- trunk/arch/s390/kernel/kprobes.c | 2 +- trunk/arch/sparc/kernel/kprobes.c | 2 +- trunk/arch/x86/kernel/kprobes.c | 2 +- trunk/arch/x86/kernel/mfgpt_32.c | 2 +- trunk/arch/xtensa/Makefile | 28 ++- trunk/arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- .../arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- trunk/arch/xtensa/kernel/entry.S | 2 +- trunk/arch/xtensa/kernel/vmlinux.lds.S | 2 +- trunk/arch/xtensa/lib/checksum.S | 2 +- trunk/arch/xtensa/lib/memcopy.S | 2 +- trunk/arch/xtensa/lib/memset.S | 2 +- trunk/arch/xtensa/lib/strncpy_user.S | 2 +- trunk/arch/xtensa/lib/strnlen_user.S | 2 +- trunk/arch/xtensa/lib/usercopy.S | 2 +- trunk/arch/xtensa/platforms/iss/console.c | 4 +- trunk/arch/xtensa/platforms/iss/io.c | 2 +- trunk/arch/xtensa/platforms/iss/network.c | 4 +- trunk/arch/xtensa/platforms/xt2000/Makefile | 5 - .../xt2000/include/platform/hardware.h | 55 ------ .../xt2000/include/platform/serial.h | 28 --- trunk/arch/xtensa/platforms/xt2000/setup.c | 181 ------------------ trunk/drivers/acpi/acpi_memhotplug.c | 2 +- trunk/drivers/acpi/executer/exprep.c | 2 +- trunk/drivers/acpi/executer/exresolv.c | 2 +- trunk/drivers/acpi/executer/exstore.c | 2 +- trunk/drivers/acpi/resources/rscreate.c | 2 +- trunk/drivers/acpi/utilities/utobject.c | 4 +- trunk/drivers/base/Kconfig | 2 +- trunk/drivers/char/epca.c | 2 +- trunk/drivers/cpufreq/Kconfig | 4 +- trunk/drivers/hid/usbhid/hiddev.c | 2 - trunk/drivers/hwmon/fschmd.c | 2 +- trunk/drivers/infiniband/hw/mlx4/cq.c | 2 +- trunk/drivers/input/keyboard/atkbd.c | 2 +- trunk/drivers/input/touchscreen/da9034-ts.c | 1 - trunk/drivers/macintosh/Kconfig | 2 +- trunk/drivers/message/i2o/i2o_scsi.c | 2 +- trunk/drivers/misc/ibmasm/event.c | 2 +- trunk/drivers/misc/phantom.c | 2 +- trunk/drivers/mtd/devices/pmc551.c | 2 +- trunk/drivers/mtd/ubi/eba.c | 2 +- trunk/drivers/mtd/ubi/io.c | 2 +- trunk/drivers/mtd/ubi/scan.c | 2 +- trunk/drivers/mtd/ubi/ubi-media.h | 4 +- trunk/drivers/mtd/ubi/vtbl.c | 2 +- trunk/drivers/mtd/ubi/wl.c | 4 +- trunk/drivers/net/bnx2x_link.c | 2 +- trunk/drivers/net/e1000/e1000_hw.c | 4 +- trunk/drivers/net/slip.h | 2 +- trunk/drivers/net/tehuti.c | 4 +- trunk/drivers/net/tokenring/smctr.c | 2 +- trunk/drivers/net/wireless/atmel.c | 2 +- trunk/drivers/net/wireless/ipw2x00/ipw2100.c | 4 +- .../net/wireless/rt2x00/rt2x00crypto.c | 4 +- trunk/drivers/net/wireless/strip.c | 2 +- trunk/drivers/rtc/rtc-ds1511.c | 2 +- trunk/drivers/rtc/rtc-stk17ta8.c | 2 +- trunk/drivers/s390/block/dasd_eer.c | 4 +- trunk/drivers/s390/char/vmlogrdr.c | 4 +- trunk/drivers/scsi/a100u2w.c | 2 +- trunk/drivers/scsi/lpfc/lpfc_hbadisc.c | 4 +- trunk/drivers/scsi/lpfc/lpfc_sli.c | 10 +- trunk/drivers/scsi/megaraid.c | 4 +- trunk/drivers/scsi/qla1280.c | 4 +- trunk/drivers/scsi/qla4xxx/ql4_mbx.c | 2 +- trunk/drivers/scsi/scsi_error.c | 2 +- trunk/drivers/serial/8250.c | 2 +- trunk/drivers/serial/crisv10.c | 4 +- trunk/drivers/uwb/i1480/dfu/usb.c | 2 +- trunk/drivers/video/console/vgacon.c | 2 +- trunk/fs/gfs2/ops_address.c | 1 + trunk/fs/ncpfs/ioctl.c | 2 +- trunk/fs/ocfs2/cluster/heartbeat.c | 2 +- trunk/fs/proc/task_nommu.c | 2 +- trunk/fs/ubifs/Kconfig | 2 +- trunk/fs/ubifs/budget.c | 4 +- trunk/fs/ubifs/gc.c | 2 +- trunk/fs/ubifs/journal.c | 2 +- trunk/fs/ubifs/shrinker.c | 2 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 2 +- trunk/include/acpi/acmacros.h | 4 +- trunk/include/acpi/actypes.h | 2 +- .../include/asm => include/asm-xtensa}/Kbuild | 0 .../asm => include/asm-xtensa}/asmmacro.h | 2 +- .../asm => include/asm-xtensa}/atomic.h | 0 .../asm => include/asm-xtensa}/auxvec.h | 0 .../asm => include/asm-xtensa}/bitops.h | 0 .../asm => include/asm-xtensa}/bootparam.h | 0 .../include/asm => include/asm-xtensa}/bug.h | 0 .../include/asm => include/asm-xtensa}/bugs.h | 0 .../asm => include/asm-xtensa}/byteorder.h | 32 ++-- .../asm => include/asm-xtensa}/cache.h | 2 +- .../asm => include/asm-xtensa}/cacheasm.h | 0 .../asm => include/asm-xtensa}/cacheflush.h | 0 .../asm => include/asm-xtensa}/checksum.h | 2 +- .../asm => include/asm-xtensa}/coprocessor.h | 4 +- .../asm => include/asm-xtensa}/cpumask.h | 0 .../asm => include/asm-xtensa}/cputime.h | 0 .../asm => include/asm-xtensa}/current.h | 0 .../asm => include/asm-xtensa}/delay.h | 0 .../asm => include/asm-xtensa}/device.h | 0 .../asm => include/asm-xtensa}/div64.h | 0 .../asm => include/asm-xtensa}/dma-mapping.h | 0 .../include/asm => include/asm-xtensa}/dma.h | 0 .../include/asm => include/asm-xtensa}/elf.h | 0 .../asm-xtensa}/emergency-restart.h | 0 .../asm => include/asm-xtensa}/errno.h | 0 .../include/asm => include/asm-xtensa}/fb.h | 0 .../asm => include/asm-xtensa}/fcntl.h | 0 .../asm => include/asm-xtensa}/futex.h | 0 .../asm => include/asm-xtensa}/hardirq.h | 0 .../asm => include/asm-xtensa}/highmem.h | 0 .../asm => include/asm-xtensa}/hw_irq.h | 0 .../include/asm => include/asm-xtensa}/io.h | 0 .../asm => include/asm-xtensa}/ioctl.h | 0 .../asm => include/asm-xtensa}/ioctls.h | 0 .../asm => include/asm-xtensa}/ipcbuf.h | 0 .../include/asm => include/asm-xtensa}/irq.h | 4 +- .../asm => include/asm-xtensa}/irq_regs.h | 0 .../asm => include/asm-xtensa}/kdebug.h | 0 .../asm => include/asm-xtensa}/kmap_types.h | 0 .../asm => include/asm-xtensa}/linkage.h | 0 .../asm => include/asm-xtensa}/local.h | 0 .../include/asm => include/asm-xtensa}/mman.h | 0 .../include/asm => include/asm-xtensa}/mmu.h | 0 .../asm => include/asm-xtensa}/mmu_context.h | 0 .../asm => include/asm-xtensa}/module.h | 0 .../asm => include/asm-xtensa}/msgbuf.h | 0 .../asm => include/asm-xtensa}/mutex.h | 0 .../include/asm => include/asm-xtensa}/page.h | 0 .../asm => include/asm-xtensa}/param.h | 0 .../asm => include/asm-xtensa}/pci-bridge.h | 0 .../include/asm => include/asm-xtensa}/pci.h | 0 .../asm => include/asm-xtensa}/percpu.h | 0 .../asm => include/asm-xtensa}/pgalloc.h | 0 .../asm => include/asm-xtensa}/pgtable.h | 0 .../asm-xtensa/platform-iss}/hardware.h | 0 .../asm-xtensa/platform-iss}/simcall.h | 0 .../asm => include/asm-xtensa}/platform.h | 2 + .../include/asm => include/asm-xtensa}/poll.h | 0 .../asm => include/asm-xtensa}/posix_types.h | 0 .../asm => include/asm-xtensa}/processor.h | 2 +- .../asm => include/asm-xtensa}/ptrace.h | 2 +- .../include/asm => include/asm-xtensa}/regs.h | 0 .../asm => include/asm-xtensa}/resource.h | 0 .../include/asm => include/asm-xtensa}/rmap.h | 0 .../asm => include/asm-xtensa}/rwsem.h | 0 .../asm => include/asm-xtensa}/scatterlist.h | 0 .../asm => include/asm-xtensa}/sections.h | 0 .../asm => include/asm-xtensa}/segment.h | 0 .../asm => include/asm-xtensa}/sembuf.h | 0 .../asm => include/asm-xtensa}/serial.h | 2 +- .../asm => include/asm-xtensa}/setup.h | 0 .../asm => include/asm-xtensa}/shmbuf.h | 0 .../asm => include/asm-xtensa}/shmparam.h | 0 .../asm => include/asm-xtensa}/sigcontext.h | 0 .../asm => include/asm-xtensa}/siginfo.h | 0 .../asm => include/asm-xtensa}/signal.h | 0 .../include/asm => include/asm-xtensa}/smp.h | 0 .../asm => include/asm-xtensa}/socket.h | 0 .../asm => include/asm-xtensa}/sockios.h | 0 .../asm => include/asm-xtensa}/spinlock.h | 0 .../include/asm => include/asm-xtensa}/stat.h | 0 .../asm => include/asm-xtensa}/statfs.h | 0 .../asm => include/asm-xtensa}/string.h | 0 .../asm => include/asm-xtensa}/syscall.h | 0 .../asm => include/asm-xtensa}/system.h | 0 .../asm => include/asm-xtensa}/termbits.h | 0 .../asm => include/asm-xtensa}/termios.h | 0 .../asm => include/asm-xtensa}/thread_info.h | 0 .../asm => include/asm-xtensa}/timex.h | 0 .../include/asm => include/asm-xtensa}/tlb.h | 0 .../asm => include/asm-xtensa}/tlbflush.h | 0 .../asm => include/asm-xtensa}/topology.h | 0 .../asm => include/asm-xtensa}/types.h | 0 .../asm => include/asm-xtensa}/uaccess.h | 0 .../asm => include/asm-xtensa}/ucontext.h | 0 .../asm => include/asm-xtensa}/unaligned.h | 12 +- .../asm => include/asm-xtensa}/unistd.h | 0 .../include/asm => include/asm-xtensa}/user.h | 0 .../asm-xtensa/variant-dc232b}/core.h | 0 .../asm-xtensa/variant-dc232b}/tie-asm.h | 0 .../asm-xtensa/variant-dc232b}/tie.h | 0 .../asm-xtensa/variant-fsf}/core.h | 0 .../asm-xtensa/variant-fsf}/tie-asm.h | 0 .../asm-xtensa/variant-fsf}/tie.h | 0 .../include/asm => include/asm-xtensa}/vga.h | 0 .../include/asm => include/asm-xtensa}/xor.h | 0 trunk/include/linux/mtd/mtd.h | 2 +- trunk/include/linux/ncp_fs.h | 2 +- trunk/include/linux/spi/spi.h | 4 +- trunk/include/linux/types.h | 3 +- trunk/include/mtd/ubi-user.h | 2 +- trunk/init/main.c | 3 +- trunk/kernel/cpu.c | 6 +- trunk/kernel/pid.c | 2 +- trunk/kernel/printk.c | 2 +- trunk/kernel/time/jiffies.c | 2 +- trunk/lib/radix-tree.c | 11 +- trunk/mm/slub.c | 2 +- trunk/net/sctp/auth.c | 4 +- trunk/net/sctp/sm_statefuns.c | 6 +- trunk/net/sctp/socket.c | 2 +- trunk/net/sctp/tsnmap.c | 2 +- trunk/sound/oss/aedsp16.c | 2 +- trunk/sound/usb/usx2y/usbusx2y.c | 2 +- 229 files changed, 204 insertions(+), 467 deletions(-) delete mode 100644 trunk/arch/xtensa/platforms/xt2000/Makefile delete mode 100644 trunk/arch/xtensa/platforms/xt2000/include/platform/hardware.h delete mode 100644 trunk/arch/xtensa/platforms/xt2000/include/platform/serial.h delete mode 100644 trunk/arch/xtensa/platforms/xt2000/setup.c rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/Kbuild (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/asmmacro.h (98%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/atomic.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/auxvec.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/bitops.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/bootparam.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/bug.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/bugs.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/byteorder.h (82%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/cache.h (96%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/cacheasm.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/cacheflush.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/checksum.h (99%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/coprocessor.h (98%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/cpumask.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/cputime.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/current.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/delay.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/device.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/div64.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/dma-mapping.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/dma.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/elf.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/emergency-restart.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/errno.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/fb.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/fcntl.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/futex.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/hardirq.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/highmem.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/hw_irq.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/io.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/ioctl.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/ioctls.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/ipcbuf.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/irq.h (89%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/irq_regs.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/kdebug.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/kmap_types.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/linkage.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/local.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/mman.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/mmu.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/mmu_context.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/module.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/msgbuf.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/mutex.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/page.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/param.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/pci-bridge.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/pci.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/percpu.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/pgalloc.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/pgtable.h (100%) rename trunk/{arch/xtensa/platforms/iss/include/platform => include/asm-xtensa/platform-iss}/hardware.h (100%) rename trunk/{arch/xtensa/platforms/iss/include/platform => include/asm-xtensa/platform-iss}/simcall.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/platform.h (98%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/poll.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/posix_types.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/processor.h (99%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/ptrace.h (99%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/regs.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/resource.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/rmap.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/rwsem.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/scatterlist.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/sections.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/segment.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/sembuf.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/serial.h (92%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/setup.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/shmbuf.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/shmparam.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/sigcontext.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/siginfo.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/signal.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/smp.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/socket.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/sockios.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/spinlock.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/stat.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/statfs.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/string.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/syscall.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/system.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/termbits.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/termios.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/thread_info.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/timex.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/tlb.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/tlbflush.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/topology.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/types.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/uaccess.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/ucontext.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/unaligned.h (80%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/unistd.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/user.h (100%) rename trunk/{arch/xtensa/variants/dc232b/include/variant => include/asm-xtensa/variant-dc232b}/core.h (100%) rename trunk/{arch/xtensa/variants/dc232b/include/variant => include/asm-xtensa/variant-dc232b}/tie-asm.h (100%) rename trunk/{arch/xtensa/variants/dc232b/include/variant => include/asm-xtensa/variant-dc232b}/tie.h (100%) rename trunk/{arch/xtensa/variants/fsf/include/variant => include/asm-xtensa/variant-fsf}/core.h (100%) rename trunk/{arch/xtensa/variants/fsf/include/variant => include/asm-xtensa/variant-fsf}/tie-asm.h (100%) rename trunk/{arch/xtensa/variants/fsf/include/variant => include/asm-xtensa/variant-fsf}/tie.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/vga.h (100%) rename trunk/{arch/xtensa/include/asm => include/asm-xtensa}/xor.h (100%) diff --git a/[refs] b/[refs] index f8973bdb5919..4b53943ac0b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52fefcec97c25b15887e6a9a885ca54e7f7c0928 +refs/heads/master: e4fefbac6c5bcb0388d95e83801210e7d81a071b diff --git a/trunk/CREDITS b/trunk/CREDITS index 61186c85d728..abe05a0be4ed 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -1681,7 +1681,7 @@ E: ajoshi@shell.unixbox.com D: fbdev hacking N: Jesper Juhl -E: jj@chaosbits.net +E: jesper.juhl@gmail.com D: Various fixes, cleanups and minor features all over the tree. D: Wrote initial version of the hdaps driver (since passed on to others). S: Lemnosvej 1, 3.tv diff --git a/trunk/Documentation/dell_rbu.txt b/trunk/Documentation/dell_rbu.txt index c11b931f8f98..2c0d631de0cf 100644 --- a/trunk/Documentation/dell_rbu.txt +++ b/trunk/Documentation/dell_rbu.txt @@ -81,8 +81,8 @@ Until this step is completed the driver cannot be unloaded. Also echoing either mono ,packet or init in to image_type will free up the memory allocated by the driver. -If a user by accident executes steps 1 and 3 above without executing step 2; -it will make the /sys/class/firmware/dell_rbu/ entries disappear. +If an user by accident executes steps 1 and 3 above without executing step 2; +it will make the /sys/class/firmware/dell_rbu/ entries to disappear. The entries can be recreated by doing the following echo init > /sys/devices/platform/dell_rbu/image_type NOTE: echoing init in image_type does not change it original value. diff --git a/trunk/Documentation/hwmon/abituguru-datasheet b/trunk/Documentation/hwmon/abituguru-datasheet index 4d184f2db0ea..aef5a9b36846 100644 --- a/trunk/Documentation/hwmon/abituguru-datasheet +++ b/trunk/Documentation/hwmon/abituguru-datasheet @@ -74,7 +74,7 @@ a sensor. Notice that some banks have both a read and a write address this is how the uGuru determines if a read from or a write to the bank is taking place, thus when reading you should always use the read address and when writing the -write address. The write address is always one (1) more than the read address. +write address. The write address is always one (1) more then the read address. uGuru ready @@ -224,7 +224,7 @@ Bit 3: Beep if alarm (RW) Bit 4: 1 if alarm cause measured temp is over the warning threshold (R) Bit 5: 1 if alarm cause measured volt is over the max threshold (R) Bit 6: 1 if alarm cause measured volt is under the min threshold (R) -Bit 7: Volt sensor: Shutdown if alarm persist for more than 4 seconds (RW) +Bit 7: Volt sensor: Shutdown if alarm persist for more then 4 seconds (RW) Temp sensor: Shutdown if temp is over the shutdown threshold (RW) * This bit is only honored/used by the uGuru if a temp sensor is connected @@ -293,7 +293,7 @@ Byte 0: Alarm behaviour for the selected sensor. A 1 enables the described behaviour. Bit 0: Give an alarm if measured rpm is under the min threshold (RW) Bit 3: Beep if alarm (RW) -Bit 7: Shutdown if alarm persist for more than 4 seconds (RW) +Bit 7: Shutdown if alarm persist for more then 4 seconds (RW) Byte 1: min threshold (scale as bank 0x26) diff --git a/trunk/Documentation/laptops/thinkpad-acpi.txt b/trunk/Documentation/laptops/thinkpad-acpi.txt index 898b4987bb80..71f0fe1fc1b0 100644 --- a/trunk/Documentation/laptops/thinkpad-acpi.txt +++ b/trunk/Documentation/laptops/thinkpad-acpi.txt @@ -1475,7 +1475,7 @@ Sysfs interface changelog: 0x020100: Marker for thinkpad-acpi with hot key NVRAM polling support. If you must, use it to know you should not - start a userspace NVRAM poller (allows to detect when + start an userspace NVRAM poller (allows to detect when NVRAM is compiled out by the user because it is unneeded/undesired in the first place). 0x020101: Marker for thinkpad-acpi with hot key NVRAM polling diff --git a/trunk/Documentation/networking/rxrpc.txt b/trunk/Documentation/networking/rxrpc.txt index 60d05eb77c64..c3669a3fb4af 100644 --- a/trunk/Documentation/networking/rxrpc.txt +++ b/trunk/Documentation/networking/rxrpc.txt @@ -540,7 +540,7 @@ A client would issue an operation by: MSG_MORE should be set in msghdr::msg_flags on all but the last part of the request. Multiple requests may be made simultaneously. - If a call is intended to go to a destination other than the default + If a call is intended to go to a destination other then the default specified through connect(), then msghdr::msg_name should be set on the first request message of that call. diff --git a/trunk/Documentation/networking/tuntap.txt b/trunk/Documentation/networking/tuntap.txt index c0aab985bad9..839cbb71388b 100644 --- a/trunk/Documentation/networking/tuntap.txt +++ b/trunk/Documentation/networking/tuntap.txt @@ -118,7 +118,7 @@ As mentioned above, main purpose of TUN/TAP driver is tunneling. It is used by VTun (http://vtun.sourceforge.net). Another interesting application using TUN/TAP is pipsecd -(http://perso.enst.fr/~beyssac/pipsec/), a userspace IPSec +(http://perso.enst.fr/~beyssac/pipsec/), an userspace IPSec implementation that can use complete kernel routing (unlike FreeS/WAN). 3. How does Virtual network device actually work ? diff --git a/trunk/Documentation/scsi/ChangeLog.lpfc b/trunk/Documentation/scsi/ChangeLog.lpfc index ff19a52fe004..ae3f962a7cfc 100644 --- a/trunk/Documentation/scsi/ChangeLog.lpfc +++ b/trunk/Documentation/scsi/ChangeLog.lpfc @@ -733,7 +733,7 @@ Changes from 20040920 to 20041018 I/O completion path a little more, especially taking care of fast-pathing the non-error case. Also removes tons of dead members and defines from lpfc_scsi.h - e.g. lpfc_target is down - to nothing more than the lpfc_nodelist pointer. + to nothing more then the lpfc_nodelist pointer. * Added binary sysfs file to issue mbox commands * Replaced #if __BIG_ENDIAN with #if __BIG_ENDIAN_BITFIELD for compatibility with the user space applications. diff --git a/trunk/Documentation/scsi/ChangeLog.ncr53c8xx b/trunk/Documentation/scsi/ChangeLog.ncr53c8xx index 8b278c10edfd..a9f721aeb11c 100644 --- a/trunk/Documentation/scsi/ChangeLog.ncr53c8xx +++ b/trunk/Documentation/scsi/ChangeLog.ncr53c8xx @@ -19,7 +19,7 @@ Sun Sep 24 21:30 2000 Gerard Roudier (groudier@club-internet.fr) Wed Jul 26 23:30 2000 Gerard Roudier (groudier@club-internet.fr) * version ncr53c8xx-3.4.1 - - Provide OpenFirmware path through the proc FS on PPC. + - Provide OpenFirmare path through the proc FS on PPC. - Remove trailing argument #2 from a couple of #undefs. Sun Jul 09 16:30 2000 Gerard Roudier (groudier@club-internet.fr) diff --git a/trunk/Documentation/scsi/ChangeLog.sym53c8xx b/trunk/Documentation/scsi/ChangeLog.sym53c8xx index 02ffbc1e8a84..ef985ec348e6 100644 --- a/trunk/Documentation/scsi/ChangeLog.sym53c8xx +++ b/trunk/Documentation/scsi/ChangeLog.sym53c8xx @@ -81,7 +81,7 @@ Sun Sep 24 21:30 2000 Gerard Roudier (groudier@club-internet.fr) Wed Jul 26 23:30 2000 Gerard Roudier (groudier@club-internet.fr) * version sym53c8xx-1.7.1 - - Provide OpenFirmware path through the proc FS on PPC. + - Provide OpenFirmare path through the proc FS on PPC. - Download of on-chip SRAM using memcpy_toio() doesn't work on PPC. Restore previous method (MEMORY MOVE from SCRIPTS). - Remove trailing argument #2 from a couple of #undefs. diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 06f8ff938c71..094dd52d7309 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4229,10 +4229,9 @@ L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) S: Maintained TRIVIAL PATCHES -P: Jiri Kosina +P: Jesper Juhl M: trivial@kernel.org L: linux-kernel@vger.kernel.org -T: git kernel.org:/pub/scm/linux/kernel/git/jikos/trivial.git S: Maintained TTY LAYER diff --git a/trunk/Makefile b/trunk/Makefile index c9ac00837787..f9006663f01e 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1008,7 +1008,7 @@ define check-symlink endef # We create the target directory of the symlink if it does -# not exist so the test in check-symlink works and we have a +# not exist so the test in chack-symlink works and we have a # directory for generated filesas used by some architectures. define create-symlink if [ ! -L include/asm ]; then \ diff --git a/trunk/arch/blackfin/kernel/kgdb.c b/trunk/arch/blackfin/kernel/kgdb.c index 1c5afaeb9504..b795a207742c 100644 --- a/trunk/arch/blackfin/kernel/kgdb.c +++ b/trunk/arch/blackfin/kernel/kgdb.c @@ -105,7 +105,7 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) * Extracts ebp, esp and eip values understandable by gdb from the values * saved by switch_to. * thread.esp points to ebp. flags and ebp are pushed in switch_to hence esp - * prior to entering switch_to is 8 greater than the value that is saved. + * prior to entering switch_to is 8 greater then the value that is saved. * If switch_to changes, change following code appropriately. */ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p) diff --git a/trunk/arch/cris/arch-v32/kernel/signal.c b/trunk/arch/cris/arch-v32/kernel/signal.c index 372d0ca6efbc..da7d2be000ba 100644 --- a/trunk/arch/cris/arch-v32/kernel/signal.c +++ b/trunk/arch/cris/arch-v32/kernel/signal.c @@ -456,7 +456,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, return -EFAULT; } -/* Invoke a signal handler to, well, handle the signal. */ +/* Invoke a singal handler to, well, handle the signal. */ static inline int handle_signal(int canrestart, unsigned long sig, siginfo_t *info, struct k_sigaction *ka, diff --git a/trunk/arch/ia64/kernel/kprobes.c b/trunk/arch/ia64/kernel/kprobes.c index f90be51b1123..097b84d54e73 100644 --- a/trunk/arch/ia64/kernel/kprobes.c +++ b/trunk/arch/ia64/kernel/kprobes.c @@ -434,7 +434,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) /* * It is possible to have multiple instances associated with a given * task either because an multiple functions in the call path - * have a return probe installed on them, and/or more than one return + * have a return probe installed on them, and/or more then one return * return probe was registered for a target function. * * We can handle this because: diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig index fb87c08c6b57..c825bde17cb3 100644 --- a/trunk/arch/m68k/Kconfig +++ b/trunk/arch/m68k/Kconfig @@ -303,7 +303,7 @@ config M68KFPU_EMU_EXTRAPREC correct rounding, the emulator can (often) do the same but this extra calculation can cost quite some time, so you can disable it here. The emulator will then "only" calculate with a 64 bit - mantissa and round slightly incorrect, what is more than enough + mantissa and round slightly incorrect, what is more then enough for normal usage. config M68KFPU_EMU_ONLY diff --git a/trunk/arch/m68k/kernel/traps.c b/trunk/arch/m68k/kernel/traps.c index 184acc90808d..6d813de2baf1 100644 --- a/trunk/arch/m68k/kernel/traps.c +++ b/trunk/arch/m68k/kernel/traps.c @@ -401,7 +401,7 @@ static inline void do_040writebacks(struct frame *fp) * called from sigreturn(), must ensure userspace code didn't * manipulate exception frame to circumvent protection, then complete * pending writebacks - * we just clear TM2 to turn it into a userspace access + * we just clear TM2 to turn it into an userspace access */ asmlinkage void berr_040cleanup(struct frame *fp) { diff --git a/trunk/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c b/trunk/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c index caf5e9a0acc7..97862f45496d 100644 --- a/trunk/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c +++ b/trunk/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c @@ -148,7 +148,7 @@ int read_eeprom(char *buffer, int eeprom_size, int size) send_byte(W_HEADER); recv_ack(); - /* EEPROM with size of more than 2K need two byte addressing */ + /* EEPROM with size of more then 2K need two byte addressing */ if (eeprom_size > 2048) { send_byte(0x00); recv_ack(); diff --git a/trunk/arch/powerpc/boot/Makefile b/trunk/arch/powerpc/boot/Makefile index ab6dda372438..f32829937aad 100644 --- a/trunk/arch/powerpc/boot/Makefile +++ b/trunk/arch/powerpc/boot/Makefile @@ -208,7 +208,7 @@ image-$(CONFIG_DEFAULT_UIMAGE) += uImage # # Theses are default targets to build images which embed device tree blobs. # They are only required on boards which do not have FDT support in firmware. -# Boards with newish u-boot firmware can use the uImage target above +# Boards with newish u-boot firmare can use the uImage target above # # Board ports in arch/powerpc/platform/40x/Kconfig diff --git a/trunk/arch/powerpc/kernel/kprobes.c b/trunk/arch/powerpc/kernel/kprobes.c index c9329786073b..989edcdf0297 100644 --- a/trunk/arch/powerpc/kernel/kprobes.c +++ b/trunk/arch/powerpc/kernel/kprobes.c @@ -317,7 +317,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, /* * It is possible to have multiple instances associated with a given * task either because an multiple functions in the call path - * have a return probe installed on them, and/or more than one return + * have a return probe installed on them, and/or more then one return * return probe was registered for a target function. * * We can handle this because: diff --git a/trunk/arch/powerpc/oprofile/cell/spu_profiler.c b/trunk/arch/powerpc/oprofile/cell/spu_profiler.c index 83faa958b9d4..dd499c3e9da7 100644 --- a/trunk/arch/powerpc/oprofile/cell/spu_profiler.c +++ b/trunk/arch/powerpc/oprofile/cell/spu_profiler.c @@ -49,7 +49,7 @@ void set_spu_profiling_frequency(unsigned int freq_khz, unsigned int cycles_rese * of precision. This is close enough for the purpose at hand. * * The value of the timeout should be small enough that the hw - * trace buffer will not get more than about 1/3 full for the + * trace buffer will not get more then about 1/3 full for the * maximum user specified (the LFSR value) hw sampling frequency. * This is to ensure the trace buffer will never fill even if the * kernel thread scheduling varies under a heavy system load. diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index a94a3c3ae932..19577aeffd7b 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/arch/s390/Kconfig @@ -299,7 +299,7 @@ config WARN_STACK This option enables the compiler options -mwarn-framesize and -mwarn-dynamicstack. If the compiler supports these options it will generate warnings for function which either use alloca or - create a stack frame bigger than CONFIG_WARN_STACK_SIZE. + create a stack frame bigger then CONFIG_WARN_STACK_SIZE. Say N if you are unsure. diff --git a/trunk/arch/s390/kernel/kprobes.c b/trunk/arch/s390/kernel/kprobes.c index a01cf0284db2..9b92856632cf 100644 --- a/trunk/arch/s390/kernel/kprobes.c +++ b/trunk/arch/s390/kernel/kprobes.c @@ -382,7 +382,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, /* * It is possible to have multiple instances associated with a given * task either because an multiple functions in the call path - * have a return probe installed on them, and/or more than one return + * have a return probe installed on them, and/or more then one return * return probe was registered for a target function. * * We can handle this because: diff --git a/trunk/arch/sparc/kernel/kprobes.c b/trunk/arch/sparc/kernel/kprobes.c index 3bc6527c95af..201a6e547e4a 100644 --- a/trunk/arch/sparc/kernel/kprobes.c +++ b/trunk/arch/sparc/kernel/kprobes.c @@ -517,7 +517,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) /* * It is possible to have multiple instances associated with a given * task either because an multiple functions in the call path - * have a return probe installed on them, and/or more than one return + * have a return probe installed on them, and/or more then one return * return probe was registered for a target function. * * We can handle this because: diff --git a/trunk/arch/x86/kernel/kprobes.c b/trunk/arch/x86/kernel/kprobes.c index 884d985b8b82..eead6f8f9218 100644 --- a/trunk/arch/x86/kernel/kprobes.c +++ b/trunk/arch/x86/kernel/kprobes.c @@ -695,7 +695,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs) /* * It is possible to have multiple instances associated with a given * task either because multiple functions in the call path have - * return probes installed on them, and/or more than one + * return probes installed on them, and/or more then one * return probe was registered for a target function. * * We can handle this because: diff --git a/trunk/arch/x86/kernel/mfgpt_32.c b/trunk/arch/x86/kernel/mfgpt_32.c index 8815f3c7fec7..c12314c9e86f 100644 --- a/trunk/arch/x86/kernel/mfgpt_32.c +++ b/trunk/arch/x86/kernel/mfgpt_32.c @@ -252,7 +252,7 @@ EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer); /* * The MFPGT timers on the CS5536 provide us with suitable timers to use * as clock event sources - not as good as a HPET or APIC, but certainly - * better than the PIT. This isn't a general purpose MFGPT driver, but + * better then the PIT. This isn't a general purpose MFGPT driver, but * a simplified one designed specifically to act as a clock event source. * For full details about the MFGPT, please consult the CS5536 data sheet. */ diff --git a/trunk/arch/xtensa/Makefile b/trunk/arch/xtensa/Makefile index 1da55fe4beff..015b6b2a26b9 100644 --- a/trunk/arch/xtensa/Makefile +++ b/trunk/arch/xtensa/Makefile @@ -33,15 +33,6 @@ KBUILD_CFLAGS += -ffreestanding KBUILD_CFLAGS += -pipe -mlongcalls -vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y)) -plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y)) - -ifeq ($(KBUILD_SRC),) -KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(vardirs) $(plfdirs)) -else -KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs)) -endif - KBUILD_DEFCONFIG := iss_defconfig # ramdisk/initrd support @@ -75,6 +66,21 @@ libs-y += arch/xtensa/lib/ $(LIBGCC) boot := arch/xtensa/boot +archinc := include/asm-xtensa + +archprepare: $(archinc)/.platform + +# Update processor variant and platform symlinks if something which affects +# them changed. + +$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf + @echo ' SYMLINK $(archinc)/variant -> $(archinc)/variant-$(VARIANT)' + $(Q)mkdir -p $(archinc) + $(Q)ln -fsn $(srctree)/$(archinc)/variant-$(VARIANT) $(archinc)/variant + @echo ' SYMLINK $(archinc)/platform -> $(archinc)/platform-$(PLATFORM)' + $(Q)ln -fsn $(srctree)/$(archinc)/platform-$(PLATFORM) $(archinc)/platform + @touch $@ + all: zImage @@ -83,6 +89,10 @@ bzImage : zImage zImage zImage.initrd: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ +CLEAN_FILES += arch/xtensa/vmlinux.lds \ + $(archinc)/platform $(archinc)/variant \ + $(archinc)/.platform + define archhelp @echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)' endef diff --git a/trunk/arch/xtensa/boot/boot-elf/boot.lds.S b/trunk/arch/xtensa/boot/boot-elf/boot.lds.S index 4e53b74dc44b..849dfcafd518 100644 --- a/trunk/arch/xtensa/boot/boot-elf/boot.lds.S +++ b/trunk/arch/xtensa/boot/boot-elf/boot.lds.S @@ -1,4 +1,4 @@ -#include +#include OUTPUT_ARCH(xtensa) ENTRY(_ResetVector) diff --git a/trunk/arch/xtensa/boot/boot-redboot/bootstrap.S b/trunk/arch/xtensa/boot/boot-redboot/bootstrap.S index 5582e8cfac8f..84848123e2a8 100644 --- a/trunk/arch/xtensa/boot/boot-redboot/bootstrap.S +++ b/trunk/arch/xtensa/boot/boot-redboot/bootstrap.S @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/trunk/arch/xtensa/kernel/entry.S b/trunk/arch/xtensa/kernel/entry.S index a51d36a27389..dfd35dcc1cb5 100644 --- a/trunk/arch/xtensa/kernel/entry.S +++ b/trunk/arch/xtensa/kernel/entry.S @@ -25,7 +25,7 @@ #include #include #include -#include +#include /* Unimplemented features. */ diff --git a/trunk/arch/xtensa/kernel/vmlinux.lds.S b/trunk/arch/xtensa/kernel/vmlinux.lds.S index d506774f4b05..51f4fb6f16f9 100644 --- a/trunk/arch/xtensa/kernel/vmlinux.lds.S +++ b/trunk/arch/xtensa/kernel/vmlinux.lds.S @@ -16,7 +16,7 @@ #include -#include +#include OUTPUT_ARCH(xtensa) ENTRY(_start) diff --git a/trunk/arch/xtensa/lib/checksum.S b/trunk/arch/xtensa/lib/checksum.S index df397f932d0e..9d9cd990afa6 100644 --- a/trunk/arch/xtensa/lib/checksum.S +++ b/trunk/arch/xtensa/lib/checksum.S @@ -16,7 +16,7 @@ #include #include -#include +#include /* * computes a partial checksum, e.g. for TCP/UDP fragments diff --git a/trunk/arch/xtensa/lib/memcopy.S b/trunk/arch/xtensa/lib/memcopy.S index ea59dcd03866..ddda8f4bc862 100644 --- a/trunk/arch/xtensa/lib/memcopy.S +++ b/trunk/arch/xtensa/lib/memcopy.S @@ -9,7 +9,7 @@ * Copyright (C) 2002 - 2005 Tensilica Inc. */ -#include +#include .macro src_b r, w0, w1 #ifdef __XTENSA_EB__ diff --git a/trunk/arch/xtensa/lib/memset.S b/trunk/arch/xtensa/lib/memset.S index 10b8c400f175..56a17495b2db 100644 --- a/trunk/arch/xtensa/lib/memset.S +++ b/trunk/arch/xtensa/lib/memset.S @@ -11,7 +11,7 @@ * Copyright (C) 2002 Tensilica Inc. */ -#include +#include /* * void *memset(void *dst, int c, size_t length) diff --git a/trunk/arch/xtensa/lib/strncpy_user.S b/trunk/arch/xtensa/lib/strncpy_user.S index 9f603cdaaa68..b2655d94558d 100644 --- a/trunk/arch/xtensa/lib/strncpy_user.S +++ b/trunk/arch/xtensa/lib/strncpy_user.S @@ -11,7 +11,7 @@ * Copyright (C) 2002 Tensilica Inc. */ -#include +#include #include /* Load or store instructions that may cause exceptions use the EX macro. */ diff --git a/trunk/arch/xtensa/lib/strnlen_user.S b/trunk/arch/xtensa/lib/strnlen_user.S index 23f2a89816a1..ad3f616322ca 100644 --- a/trunk/arch/xtensa/lib/strnlen_user.S +++ b/trunk/arch/xtensa/lib/strnlen_user.S @@ -11,7 +11,7 @@ * Copyright (C) 2002 Tensilica Inc. */ -#include +#include /* Load or store instructions that may cause exceptions use the EX macro. */ diff --git a/trunk/arch/xtensa/lib/usercopy.S b/trunk/arch/xtensa/lib/usercopy.S index 46d60314bb16..a8ab1d4fe0ae 100644 --- a/trunk/arch/xtensa/lib/usercopy.S +++ b/trunk/arch/xtensa/lib/usercopy.S @@ -53,7 +53,7 @@ * a11/ original length */ -#include +#include #ifdef __XTENSA_EB__ #define ALIGN(R, W0, W1) src R, W0, W1 diff --git a/trunk/arch/xtensa/platforms/iss/console.c b/trunk/arch/xtensa/platforms/iss/console.c index efed8897bef3..9141e3690731 100644 --- a/trunk/arch/xtensa/platforms/iss/console.c +++ b/trunk/arch/xtensa/platforms/iss/console.c @@ -1,5 +1,5 @@ /* - * arch/xtensa/platforms/iss/console.c + * arch/xtensa/platform-iss/console.c * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/trunk/arch/xtensa/platforms/iss/io.c b/trunk/arch/xtensa/platforms/iss/io.c index 571d0b24f895..5b161a5cb65f 100644 --- a/trunk/arch/xtensa/platforms/iss/io.c +++ b/trunk/arch/xtensa/platforms/iss/io.c @@ -3,7 +3,7 @@ #if 0 #include -#include +#include extern int __simc (); diff --git a/trunk/arch/xtensa/platforms/iss/network.c b/trunk/arch/xtensa/platforms/iss/network.c index edad4156d89a..64f057d89e73 100644 --- a/trunk/arch/xtensa/platforms/iss/network.c +++ b/trunk/arch/xtensa/platforms/iss/network.c @@ -1,6 +1,6 @@ /* * - * arch/xtensa/platforms/iss/network.c + * arch/xtensa/platform-iss/network.c * * Platform specific initialization. * @@ -33,7 +33,7 @@ #include #include -#include +#include #define DRIVER_NAME "iss-netdev" #define ETH_MAX_PACKET 1500 diff --git a/trunk/arch/xtensa/platforms/xt2000/Makefile b/trunk/arch/xtensa/platforms/xt2000/Makefile deleted file mode 100644 index 54d018e45bfc..000000000000 --- a/trunk/arch/xtensa/platforms/xt2000/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for the Tensilica XT2000 Emulation Board -# - -obj-y = setup.o diff --git a/trunk/arch/xtensa/platforms/xt2000/include/platform/hardware.h b/trunk/arch/xtensa/platforms/xt2000/include/platform/hardware.h deleted file mode 100644 index 41459ad07766..000000000000 --- a/trunk/arch/xtensa/platforms/xt2000/include/platform/hardware.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * platform/hardware.h - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2001 Tensilica Inc. - */ - -/* - * This file contains the hardware configuration of the XT2000 board. - */ - -#ifndef _XTENSA_XT2000_HARDWARE_H -#define _XTENSA_XT2000_HARDWARE_H - -#include -#include - -/* - * Memory configuration. - */ - -#define PLATFORM_DEFAULT_MEM_START 0x00000000 -#define PLATFORM_DEFAULT_MEM_SIZE 0x08000000 - -/* - * Number of platform IRQs - */ -#define PLATFORM_NR_IRQS 3 -/* - * On-board components. - */ - -#define SONIC83934_INTNUM XCHAL_EXTINT3_NUM -#define SONIC83934_ADDR IOADDR(0x0d030000) - -/* - * V3-PCI - */ - -/* The XT2000 uses the V3 as a cascaded interrupt controller for the PCI bus */ - -#define IRQ_PCI_A (XCHAL_NUM_INTERRUPTS + 0) -#define IRQ_PCI_B (XCHAL_NUM_INTERRUPTS + 1) -#define IRQ_PCI_C (XCHAL_NUM_INTERRUPTS + 2) - -/* - * Various other components. - */ - -#define XT2000_LED_ADDR IOADDR(0x0d040000) - -#endif /* _XTENSA_XT2000_HARDWARE_H */ diff --git a/trunk/arch/xtensa/platforms/xt2000/include/platform/serial.h b/trunk/arch/xtensa/platforms/xt2000/include/platform/serial.h deleted file mode 100644 index 7226cf732b47..000000000000 --- a/trunk/arch/xtensa/platforms/xt2000/include/platform/serial.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * platform/serial.h - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2001 Tensilica Inc. - */ - -#ifndef _XTENSA_XT2000_SERIAL_H -#define _XTENSA_XT2000_SERIAL_H - -#include -#include - -/* National-Semi PC16552D DUART: */ - -#define DUART16552_1_INTNUM XCHAL_EXTINT4_NUM -#define DUART16552_2_INTNUM XCHAL_EXTINT5_NUM - -#define DUART16552_1_ADDR IOADDR(0x0d050020) /* channel 1 */ -#define DUART16552_2_ADDR IOADDR(0x0d050000) /* channel 2 */ - -#define DUART16552_XTAL_FREQ 18432000 /* crystal frequency in Hz */ -#define BASE_BAUD ( DUART16552_XTAL_FREQ / 16 ) - -#endif /* _XTENSA_XT2000_SERIAL_H */ diff --git a/trunk/arch/xtensa/platforms/xt2000/setup.c b/trunk/arch/xtensa/platforms/xt2000/setup.c deleted file mode 100644 index 9e83940ac265..000000000000 --- a/trunk/arch/xtensa/platforms/xt2000/setup.c +++ /dev/null @@ -1,181 +0,0 @@ -/* - * arch/xtensa/platforms/xt2000/setup.c - * - * Platform specific functions for the XT2000 board. - * - * Authors: Chris Zankel - * Joe Taylor - * - * Copyright 2001 - 2004 Tensilica Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -/* Assumes s points to an 8-chr string. No checking for NULL. */ - -static void led_print (int f, char *s) -{ - unsigned long* led_addr = (unsigned long*) (XT2000_LED_ADDR + 0xE0) + f; - int i; - for (i = f; i < 8; i++) - if ((*led_addr++ = *s++) == 0) - break; -} - -void platform_halt(void) -{ - led_print (0, " HALT "); - local_irq_disable(); - while (1); -} - -void platform_power_off(void) -{ - led_print (0, "POWEROFF"); - local_irq_disable(); - while (1); -} - -void platform_restart(void) -{ - /* Flush and reset the mmu, simulate a processor reset, and - * jump to the reset vector. */ - - __asm__ __volatile__ ("movi a2, 15\n\t" - "wsr a2, " __stringify(ICOUNTLEVEL) "\n\t" - "movi a2, 0\n\t" - "wsr a2, " __stringify(ICOUNT) "\n\t" - "wsr a2, " __stringify(IBREAKENABLE) "\n\t" - "wsr a2, " __stringify(LCOUNT) "\n\t" - "movi a2, 0x1f\n\t" - "wsr a2, " __stringify(PS) "\n\t" - "isync\n\t" - "jx %0\n\t" - : - : "a" (XCHAL_RESET_VECTOR_VADDR) - : "a2" - ); - - /* control never gets here */ -} - -void __init platform_setup(char** cmdline) -{ - led_print (0, "LINUX "); -} - -/* early initialization */ - -extern sysmem_info_t __initdata sysmem; - -void platform_init(bp_tag_t* first) -{ - /* Set default memory block if not provided by the bootloader. */ - - if (sysmem.nr_banks == 0) { - sysmem.nr_banks = 1; - sysmem.bank[0].start = PLATFORM_DEFAULT_MEM_START; - sysmem.bank[0].end = PLATFORM_DEFAULT_MEM_START - + PLATFORM_DEFAULT_MEM_SIZE; - } -} - -/* Heartbeat. Let the LED blink. */ - -void platform_heartbeat(void) -{ - static int i=0, t = 0; - - if (--t < 0) - { - t = 59; - led_print(7, i ? ".": " "); - i ^= 1; - } -} - -//#define RS_TABLE_SIZE 2 -//#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST) - -#define _SERIAL_PORT(_base,_irq) \ -{ \ - .mapbase = (_base), \ - .membase = (void*)(_base), \ - .irq = (_irq), \ - .uartclk = DUART16552_XTAL_FREQ, \ - .iotype = UPIO_MEM, \ - .flags = UPF_BOOT_AUTOCONF, \ - .regshift = 2, \ -} - -static struct plat_serial8250_port xt2000_serial_data[] = { -#if XCHAL_HAVE_BE - _SERIAL_PORT(DUART16552_1_ADDR + 3, DUART16552_1_INTNUM), - _SERIAL_PORT(DUART16552_2_ADDR + 3, DUART16552_2_INTNUM), -#else - _SERIAL_PORT(DUART16552_1_ADDR, DUART16552_1_INTNUM), - _SERIAL_PORT(DUART16552_2_ADDR, DUART16552_2_INTNUM), -#endif - { } -}; - -static struct platform_device xt2000_serial8250_device = { - .name = "serial8250", - .id = PLAT8250_DEV_PLATFORM, - .dev = { - .platform_data = xt2000_serial_data, - }, -}; - -static struct resource xt2000_sonic_res[] = { - { - .start = SONIC83934_ADDR, - .end = SONIC83934_ADDR + 0xff, - .flags = IORESOURCE_MEM, - }, - { - .start = SONIC83934_INTNUM, - .end = SONIC83934_INTNUM, - .flags = IORESOURCE_IRQ, - }, -}; - -static struct platform_device xt2000_sonic_device = { - .name = "xtsonic", - .num_resources = ARRAY_SIZE(xt2000_sonic_res), - .resource = xt2000_sonic_res, -}; - -static int __init xt2000_setup_devinit(void) -{ - platform_device_register(&xt2000_serial8250_device); - platform_device_register(&xt2000_sonic_device); - - return 0; -} - -device_initcall(xt2000_setup_devinit); diff --git a/trunk/drivers/acpi/acpi_memhotplug.c b/trunk/drivers/acpi/acpi_memhotplug.c index 7a0f4aa4fa1e..63a17b55b39b 100644 --- a/trunk/drivers/acpi/acpi_memhotplug.c +++ b/trunk/drivers/acpi/acpi_memhotplug.c @@ -20,7 +20,7 @@ * * * ACPI based HotPlug driver that supports Memory Hotplug - * This driver fields notifications from firmware for memory add + * This driver fields notifications from firmare for memory add * and remove operations and alerts the VM of the affected memory * ranges. */ diff --git a/trunk/drivers/acpi/executer/exprep.c b/trunk/drivers/acpi/executer/exprep.c index a7dc87ecee37..5d438c32989d 100644 --- a/trunk/drivers/acpi/executer/exprep.c +++ b/trunk/drivers/acpi/executer/exprep.c @@ -404,7 +404,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc, * * RETURN: Status * - * DESCRIPTION: Construct a union acpi_operand_object of type def_field and + * DESCRIPTION: Construct an union acpi_operand_object of type def_field and * connect it to the parent Node. * ******************************************************************************/ diff --git a/trunk/drivers/acpi/executer/exresolv.c b/trunk/drivers/acpi/executer/exresolv.c index 60e8c47128e9..89571b92a522 100644 --- a/trunk/drivers/acpi/executer/exresolv.c +++ b/trunk/drivers/acpi/executer/exresolv.c @@ -146,7 +146,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr, stack_desc = *stack_ptr; - /* This is a union acpi_operand_object */ + /* This is an union acpi_operand_object */ switch (ACPI_GET_OBJECT_TYPE(stack_desc)) { case ACPI_TYPE_LOCAL_REFERENCE: diff --git a/trunk/drivers/acpi/executer/exstore.c b/trunk/drivers/acpi/executer/exstore.c index 1c118ba78adb..3318df4cbd98 100644 --- a/trunk/drivers/acpi/executer/exstore.c +++ b/trunk/drivers/acpi/executer/exstore.c @@ -274,7 +274,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc, * * PARAMETERS: *source_desc - Value to be stored * *dest_desc - Where to store it. Must be an NS node - * or a union acpi_operand_object of type + * or an union acpi_operand_object of type * Reference; * walk_state - Current walk state * diff --git a/trunk/drivers/acpi/resources/rscreate.c b/trunk/drivers/acpi/resources/rscreate.c index 08b8d73e6ee5..c0bbfa2c4193 100644 --- a/trunk/drivers/acpi/resources/rscreate.c +++ b/trunk/drivers/acpi/resources/rscreate.c @@ -124,7 +124,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer, * * FUNCTION: acpi_rs_create_pci_routing_table * - * PARAMETERS: package_object - Pointer to a union acpi_operand_object + * PARAMETERS: package_object - Pointer to an union acpi_operand_object * package * output_buffer - Pointer to the user's buffer * diff --git a/trunk/drivers/acpi/utilities/utobject.c b/trunk/drivers/acpi/utilities/utobject.c index 4bef3cfbaccb..c354e7a42bcd 100644 --- a/trunk/drivers/acpi/utilities/utobject.c +++ b/trunk/drivers/acpi/utilities/utobject.c @@ -297,7 +297,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size) * * RETURN: TRUE if object is valid, FALSE otherwise * - * DESCRIPTION: Validate a pointer to be a union acpi_operand_object + * DESCRIPTION: Validate a pointer to be an union acpi_operand_object * ******************************************************************************/ @@ -389,7 +389,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object) { ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object); - /* Object must be a union acpi_operand_object */ + /* Object must be an union acpi_operand_object */ if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) { ACPI_ERROR((AE_INFO, diff --git a/trunk/drivers/base/Kconfig b/trunk/drivers/base/Kconfig index 8f006f96ff53..d8e8c49c0cbd 100644 --- a/trunk/drivers/base/Kconfig +++ b/trunk/drivers/base/Kconfig @@ -54,7 +54,7 @@ config FIRMWARE_IN_KERNEL such firmware, and do not wish to use an initrd. This single option controls the inclusion of firmware for - every driver which uses request_firmware() and ships its + every driver which uses request_firmare() and ships its firmware in the kernel source tree, to avoid a proliferation of 'Include firmware for xxx device' options. diff --git a/trunk/drivers/char/epca.c b/trunk/drivers/char/epca.c index af7c13ca9493..39ad820b2350 100644 --- a/trunk/drivers/char/epca.c +++ b/trunk/drivers/char/epca.c @@ -769,7 +769,7 @@ static int pc_open(struct tty_struct *tty, struct file *filp) /* Check status of board configured in system. */ /* - * I check to see if the epca_setup routine detected a user error. It + * I check to see if the epca_setup routine detected an user error. It * might be better to put this in pc_init, but for the moment it goes * here. */ diff --git a/trunk/drivers/cpufreq/Kconfig b/trunk/drivers/cpufreq/Kconfig index a8c8d9c19d74..5f076aef74fa 100644 --- a/trunk/drivers/cpufreq/Kconfig +++ b/trunk/drivers/cpufreq/Kconfig @@ -83,7 +83,7 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE select CPU_FREQ_GOV_USERSPACE help Use the CPUFreq governor 'userspace' as default. This allows - you to set the CPU frequency manually or when a userspace + you to set the CPU frequency manually or when an userspace program shall be able to set the CPU dynamically without having to enable the userspace governor manually. @@ -138,7 +138,7 @@ config CPU_FREQ_GOV_USERSPACE tristate "'userspace' governor for userspace frequency scaling" help Enable this cpufreq governor when you either want to set the - CPU frequency manually or when a userspace program shall + CPU frequency manually or when an userspace program shall be able to set the CPU dynamically, like on LART . diff --git a/trunk/drivers/hid/usbhid/hiddev.c b/trunk/drivers/hid/usbhid/hiddev.c index d73eea382ab3..6a98f9f572b0 100644 --- a/trunk/drivers/hid/usbhid/hiddev.c +++ b/trunk/drivers/hid/usbhid/hiddev.c @@ -874,14 +874,12 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) INIT_LIST_HEAD(&hiddev->list); spin_lock_init(&hiddev->list_lock); mutex_init(&hiddev->existancelock); - hid->hiddev = hiddev; hiddev->hid = hid; hiddev->exist = 1; retval = usb_register_dev(usbhid->intf, &hiddev_class); if (retval) { err_hid("Not able to get a minor for this device."); - hid->hiddev = NULL; kfree(hiddev); return -1; } else { diff --git a/trunk/drivers/hwmon/fschmd.c b/trunk/drivers/hwmon/fschmd.c index 8b2d756595d9..967170368933 100644 --- a/trunk/drivers/hwmon/fschmd.c +++ b/trunk/drivers/hwmon/fschmd.c @@ -75,7 +75,7 @@ static const u8 FSCHMD_REG_VOLT[3] = { 0x45, 0x42, 0x48 }; /* minimum pwm at which the fan is driven (pwm can by increased depending on the temp. Notice that for the scy some fans share there minimum speed. - Also notice that with the scy the sensor order is different than with the + Also notice that with the scy the sensor order is different then with the other chips, this order was in the 2.4 driver and kept for consistency. */ static const u8 FSCHMD_REG_FAN_MIN[5][6] = { { 0x55, 0x65 }, /* pos */ diff --git a/trunk/drivers/infiniband/hw/mlx4/cq.c b/trunk/drivers/infiniband/hw/mlx4/cq.c index de5263beab4a..a3c5af1d7ec0 100644 --- a/trunk/drivers/infiniband/hw/mlx4/cq.c +++ b/trunk/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) if (err) goto out; } else { - /* Can't be smaller than the number of outstanding CQEs */ + /* Can't be smaller then the number of outstanding CQEs */ outst_cqe = mlx4_ib_get_outstanding_cqes(cq); if (entries < outst_cqe + 1) { err = 0; diff --git a/trunk/drivers/input/keyboard/atkbd.c b/trunk/drivers/input/keyboard/atkbd.c index c3c8b9bc40ae..f6e9f39a527b 100644 --- a/trunk/drivers/input/keyboard/atkbd.c +++ b/trunk/drivers/input/keyboard/atkbd.c @@ -65,7 +65,7 @@ MODULE_PARM_DESC(extra, "Enable extra LEDs and keys on IBM RapidAcces, EzKey and /* * Scancode to keycode tables. These are just the default setting, and - * are loadable via a userland utility. + * are loadable via an userland utility. */ static const unsigned short atkbd_set2_keycode[512] = { diff --git a/trunk/drivers/input/touchscreen/da9034-ts.c b/trunk/drivers/input/touchscreen/da9034-ts.c index fa67d782c3c3..4342e77814b5 100644 --- a/trunk/drivers/input/touchscreen/da9034-ts.c +++ b/trunk/drivers/input/touchscreen/da9034-ts.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #define DA9034_MANUAL_CTRL 0x50 diff --git a/trunk/drivers/macintosh/Kconfig b/trunk/drivers/macintosh/Kconfig index 173cf55c64d0..b52659620d50 100644 --- a/trunk/drivers/macintosh/Kconfig +++ b/trunk/drivers/macintosh/Kconfig @@ -138,7 +138,7 @@ config PMAC_BACKLIGHT Say Y here to enable Macintosh specific extensions of the generic backlight code. With this enabled, the brightness keys on older PowerBooks will be enabled so you can change the screen brightness. - Newer models should use a userspace daemon like pbbuttonsd. + Newer models should use an userspace daemon like pbbuttonsd. config PMAC_BACKLIGHT_LEGACY bool "Provide legacy ioctl's on /dev/pmu for the backlight" diff --git a/trunk/drivers/message/i2o/i2o_scsi.c b/trunk/drivers/message/i2o/i2o_scsi.c index 3d45817e6dcd..1bcdbbb9e7d3 100644 --- a/trunk/drivers/message/i2o/i2o_scsi.c +++ b/trunk/drivers/message/i2o/i2o_scsi.c @@ -390,7 +390,7 @@ static int i2o_scsi_reply(struct i2o_controller *c, u32 m, * @i2o_dev: the I2O device which was added * * If a I2O device is added we catch the notification, because I2O classes - * other than SCSI peripheral will not be received through + * other then SCSI peripheral will not be received through * i2o_scsi_probe(). */ static void i2o_scsi_notify_device_add(struct i2o_device *i2o_dev) diff --git a/trunk/drivers/misc/ibmasm/event.c b/trunk/drivers/misc/ibmasm/event.c index 68a0a5b94795..fda6a4d3bf23 100644 --- a/trunk/drivers/misc/ibmasm/event.c +++ b/trunk/drivers/misc/ibmasm/event.c @@ -50,7 +50,7 @@ static void wake_up_event_readers(struct service_processor *sp) * Store the event in the circular event buffer, wake up any sleeping * event readers. * There is no reader marker in the buffer, therefore readers are - * responsible for keeping up with the writer, or they will lose events. + * responsible for keeping up with the writer, or they will loose events. */ void ibmasm_receive_event(struct service_processor *sp, void *data, unsigned int data_size) { diff --git a/trunk/drivers/misc/phantom.c b/trunk/drivers/misc/phantom.c index fa57b67593ae..abdebe347383 100644 --- a/trunk/drivers/misc/phantom.c +++ b/trunk/drivers/misc/phantom.c @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * You need a userspace library to cooperate with this driver. It (and other + * You need an userspace library to cooperate with this driver. It (and other * info) may be obtained here: * http://www.fi.muni.cz/~xslaby/phantom.html * or alternatively, you might use OpenHaptics provided by Sensable. diff --git a/trunk/drivers/mtd/devices/pmc551.c b/trunk/drivers/mtd/devices/pmc551.c index d2fd550f7e09..d38bca64bb15 100644 --- a/trunk/drivers/mtd/devices/pmc551.c +++ b/trunk/drivers/mtd/devices/pmc551.c @@ -34,7 +34,7 @@ * aperture size, not the dram size, and the V370PDC supplies no * other method for memory size discovery. This problem is * mostly only relevant when compiled as a module, as the - * unloading of the module with an aperture size smaller than + * unloading of the module with an aperture size smaller then * the ram will cause the driver to detect the onboard memory * size to be equal to the aperture size when the module is * reloaded. Soooo, to help, the module supports an msize diff --git a/trunk/drivers/mtd/ubi/eba.c b/trunk/drivers/mtd/ubi/eba.c index 25def348e5ba..048a606cebde 100644 --- a/trunk/drivers/mtd/ubi/eba.c +++ b/trunk/drivers/mtd/ubi/eba.c @@ -717,7 +717,7 @@ int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum, * to the real data size, although the @buf buffer has to contain the * alignment. In all other cases, @len has to be aligned. * - * It is prohibited to write more than once to logical eraseblocks of static + * It is prohibited to write more then once to logical eraseblocks of static * volumes. This function returns zero in case of success and a negative error * code in case of failure. */ diff --git a/trunk/drivers/mtd/ubi/io.c b/trunk/drivers/mtd/ubi/io.c index fe81039f2a7c..a74118c05745 100644 --- a/trunk/drivers/mtd/ubi/io.c +++ b/trunk/drivers/mtd/ubi/io.c @@ -465,7 +465,7 @@ static int torture_peb(struct ubi_device *ubi, int pnum) * This function synchronously erases physical eraseblock @pnum. If @torture * flag is not zero, the physical eraseblock is checked by means of writing * different patterns to it and reading them back. If the torturing is enabled, - * the physical eraseblock is erased more than once. + * the physical eraseblock is erased more then once. * * This function returns the number of erasures made in case of success, %-EIO * if the erasure failed or the torturing test failed, and other negative error diff --git a/trunk/drivers/mtd/ubi/scan.c b/trunk/drivers/mtd/ubi/scan.c index ecde202a5a12..41d47e1cf15c 100644 --- a/trunk/drivers/mtd/ubi/scan.c +++ b/trunk/drivers/mtd/ubi/scan.c @@ -478,7 +478,7 @@ int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_scan_info *si, return 0; } else { /* - * This logical eraseblock is older than the one found + * This logical eraseblock is older then the one found * previously. */ if (cmp_res & 4) diff --git a/trunk/drivers/mtd/ubi/ubi-media.h b/trunk/drivers/mtd/ubi/ubi-media.h index 8419fdccc79c..2ad940409053 100644 --- a/trunk/drivers/mtd/ubi/ubi-media.h +++ b/trunk/drivers/mtd/ubi/ubi-media.h @@ -135,7 +135,7 @@ enum { * The erase counter header takes 64 bytes and has a plenty of unused space for * future usage. The unused fields are zeroed. The @version field is used to * indicate the version of UBI implementation which is supposed to be able to - * work with this UBI image. If @version is greater than the current UBI + * work with this UBI image. If @version is greater then the current UBI * version, the image is rejected. This may be useful in future if something * is changed radically. This field is duplicated in the volume identifier * header. @@ -187,7 +187,7 @@ struct ubi_ec_hdr { * (sequence number) is used to distinguish between older and newer versions of * logical eraseblocks. * - * There are 2 situations when there may be more than one physical eraseblock + * There are 2 situations when there may be more then one physical eraseblock * corresponding to the same logical eraseblock, i.e., having the same @vol_id * and @lnum values in the volume identifier header. Suppose we have a logical * eraseblock L and it is mapped to the physical eraseblock P. diff --git a/trunk/drivers/mtd/ubi/vtbl.c b/trunk/drivers/mtd/ubi/vtbl.c index 1afc61e7455d..333c8941552f 100644 --- a/trunk/drivers/mtd/ubi/vtbl.c +++ b/trunk/drivers/mtd/ubi/vtbl.c @@ -577,7 +577,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si, if (vtbl[i].flags & UBI_VTBL_AUTORESIZE_FLG) { /* Auto re-size flag may be set only for one volume */ if (ubi->autoresize_vol_id != -1) { - ubi_err("more than one auto-resize volume (%d " + ubi_err("more then one auto-resize volume (%d " "and %d)", ubi->autoresize_vol_id, i); kfree(vol); return -EINVAL; diff --git a/trunk/drivers/mtd/ubi/wl.c b/trunk/drivers/mtd/ubi/wl.c index 891534f8210d..14901cb82c18 100644 --- a/trunk/drivers/mtd/ubi/wl.c +++ b/trunk/drivers/mtd/ubi/wl.c @@ -128,7 +128,7 @@ * situation when the picked physical eraseblock is constantly erased after the * data is written to it. So, we have a constant which limits the highest erase * counter of the free physical eraseblock to pick. Namely, the WL sub-system - * does not pick eraseblocks with erase counter greater than the lowest erase + * does not pick eraseblocks with erase counter greater then the lowest erase * counter plus %WL_FREE_MAX_DIFF. */ #define WL_FREE_MAX_DIFF (2*UBI_WL_THRESHOLD) @@ -917,7 +917,7 @@ static int ensure_wear_leveling(struct ubi_device *ubi) /* * We schedule wear-leveling only if the difference between the * lowest erase counter of used physical eraseblocks and a high - * erase counter of free physical eraseblocks is greater than + * erase counter of free physical eraseblocks is greater then * %UBI_WL_THRESHOLD. */ e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, u.rb); diff --git a/trunk/drivers/net/bnx2x_link.c b/trunk/drivers/net/bnx2x_link.c index fefa6ab13064..67de94f1f30e 100644 --- a/trunk/drivers/net/bnx2x_link.c +++ b/trunk/drivers/net/bnx2x_link.c @@ -3359,7 +3359,7 @@ static u8 bnx2x_format_ver(u32 num, u8 *str, u16 len) u8 shift = 8*4; u8 digit; if (len < 10) { - /* Need more than 10chars for this format */ + /* Need more then 10chars for this format */ *str_ptr = '\0'; return -EINVAL; } diff --git a/trunk/drivers/net/e1000/e1000_hw.c b/trunk/drivers/net/e1000/e1000_hw.c index e1a3fc1303ee..d04eef53571e 100644 --- a/trunk/drivers/net/e1000/e1000_hw.c +++ b/trunk/drivers/net/e1000/e1000_hw.c @@ -6758,7 +6758,7 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length, * returns: - E1000_ERR_XXX * E1000_SUCCESS * - * For phy's older than IGP, this function simply reads the polarity bit in the + * For phy's older then IGP, this function simply reads the polarity bit in the * Phy Status register. For IGP phy's, this bit is valid only if link speed is * 10 Mbps. If the link speed is 100 Mbps there is no polarity so this bit will * 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, * returns: - E1000_ERR_XXX * E1000_SUCCESS * - * For phy's older than IGP, this function reads the Downshift bit in the Phy + * For phy's older then IGP, this function reads the Downshift bit in the Phy * Specific Status register. For IGP phy's, it reads the Downgrade bit in the * Link Health register. In IGP this bit is latched high, so the driver must * read it immediately after link is established. diff --git a/trunk/drivers/net/slip.h b/trunk/drivers/net/slip.h index 9ea5c11287d2..853e0f6ec710 100644 --- a/trunk/drivers/net/slip.h +++ b/trunk/drivers/net/slip.h @@ -75,7 +75,7 @@ struct slip { unsigned long tx_errors; /* Planned stuff */ unsigned long rx_dropped; /* No memory for skb */ unsigned long tx_dropped; /* When MTU change */ - unsigned long rx_over_errors; /* Frame bigger than SLIP buf. */ + unsigned long rx_over_errors; /* Frame bigger then SLIP buf. */ #ifdef SL_INCLUDE_CSLIP unsigned long tx_compressed; unsigned long rx_compressed; diff --git a/trunk/drivers/net/tehuti.c b/trunk/drivers/net/tehuti.c index a7a4dc4d6313..a10a83a11d9f 100644 --- a/trunk/drivers/net/tehuti.c +++ b/trunk/drivers/net/tehuti.c @@ -1004,7 +1004,7 @@ static inline void bdx_rxdb_free_elem(struct rxdb *db, int n) * skb for rx. It assumes that Rx is desabled in HW * funcs are grouped for better cache usage * - * RxD fifo is smaller than RxF fifo by design. Upon high load, RxD will be + * RxD fifo is smaller then RxF fifo by design. Upon high load, RxD will be * filled and packets will be dropped by nic without getting into host or * cousing interrupt. Anyway, in that condition, host has no chance to proccess * 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) * * Pushes desc to TxD fifo and overlaps it if needed. * NOTE: this func does not check for available space. this is responsibility - * of the caller. Neither does it check that data size is smaller than + * of the caller. Neither does it check that data size is smaller then * fifo size. */ static void bdx_tx_push_desc(struct bdx_priv *priv, void *data, int size) diff --git a/trunk/drivers/net/tokenring/smctr.c b/trunk/drivers/net/tokenring/smctr.c index 50eb29ce3c87..a011666342ff 100644 --- a/trunk/drivers/net/tokenring/smctr.c +++ b/trunk/drivers/net/tokenring/smctr.c @@ -3064,7 +3064,7 @@ static int smctr_load_node_addr(struct net_device *dev) * will consequently cause a timeout. * * NOTE 1: If the monitor_state is MS_BEACON_TEST_STATE, all transmit - * queues other than the one used for the lobe_media_test should be + * queues other then the one used for the lobe_media_test should be * disabled.!? * * NOTE 2: If the monitor_state is MS_BEACON_TEST_STATE and the receive_mask diff --git a/trunk/drivers/net/wireless/atmel.c b/trunk/drivers/net/wireless/atmel.c index 4223672c4432..350157fcd080 100644 --- a/trunk/drivers/net/wireless/atmel.c +++ b/trunk/drivers/net/wireless/atmel.c @@ -3836,7 +3836,7 @@ static int reset_atmel_card(struct net_device *dev) This routine is also responsible for initialising some hardware-specific fields in the atmel_private structure, including a copy of the firmware's hostinfo stucture - which is the route into the rest of the firmware datastructures. */ + which is the route into the rest of the firmare datastructures. */ struct atmel_private *priv = netdev_priv(dev); u8 configuration; diff --git a/trunk/drivers/net/wireless/ipw2x00/ipw2100.c b/trunk/drivers/net/wireless/ipw2x00/ipw2100.c index 823c2bf5e31e..1667065b86a7 100644 --- a/trunk/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/trunk/drivers/net/wireless/ipw2x00/ipw2100.c @@ -1332,7 +1332,7 @@ static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv) IPW_AUX_HOST_RESET_REG_STOP_MASTER); /* Step 2. Wait for stop Master Assert - * (not more than 50us, otherwise ret error */ + * (not more then 50us, otherwise ret error */ i = 5; do { udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY); @@ -1830,7 +1830,7 @@ static void ipw2100_down(struct ipw2100_priv *priv) cancel_delayed_work(&priv->rf_kill); } - /* Kill the firmware hang check timer */ + /* Kill the firmare hang check timer */ if (!priv->stop_hang_check) { priv->stop_hang_check = 1; cancel_delayed_work(&priv->hang_check); diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00crypto.c b/trunk/drivers/net/wireless/rt2x00/rt2x00crypto.c index aee9cba13eb3..37ad0d2fb64c 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00crypto.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00crypto.c @@ -184,8 +184,8 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, unsigned int align, * Make room for new data, note that we increase both * headsize and tailsize when required. The tailsize is * only needed when ICV data needs to be inserted and - * the padding is smaller than the ICV data. - * When alignment requirements is greater than the + * the padding is smaller then the ICV data. + * When alignment requirements is greater then the * ICV data we must trim the skb to the correct size * because we need to remove the extra bytes. */ diff --git a/trunk/drivers/net/wireless/strip.c b/trunk/drivers/net/wireless/strip.c index 7015f2480550..dd0de3a9ed4e 100644 --- a/trunk/drivers/net/wireless/strip.c +++ b/trunk/drivers/net/wireless/strip.c @@ -236,7 +236,7 @@ struct strip { unsigned long tx_errors; /* Planned stuff */ unsigned long rx_dropped; /* No memory for skb */ unsigned long tx_dropped; /* When MTU change */ - unsigned long rx_over_errors; /* Frame bigger than STRIP buf. */ + unsigned long rx_over_errors; /* Frame bigger then STRIP buf. */ unsigned long pps_timer; /* Timer to determine pps */ unsigned long rx_pps_count; /* Counter to determine pps */ diff --git a/trunk/drivers/rtc/rtc-ds1511.c b/trunk/drivers/rtc/rtc-ds1511.c index 0b6b7730c716..23a07fe15a2c 100644 --- a/trunk/drivers/rtc/rtc-ds1511.c +++ b/trunk/drivers/rtc/rtc-ds1511.c @@ -630,7 +630,7 @@ ds1511_rtc_init(void) static void __exit ds1511_rtc_exit(void) { - platform_driver_unregister(&ds1511_rtc_driver); + return platform_driver_unregister(&ds1511_rtc_driver); } module_init(ds1511_rtc_init); diff --git a/trunk/drivers/rtc/rtc-stk17ta8.c b/trunk/drivers/rtc/rtc-stk17ta8.c index 7d1547b0070e..dc0b6224ad9b 100644 --- a/trunk/drivers/rtc/rtc-stk17ta8.c +++ b/trunk/drivers/rtc/rtc-stk17ta8.c @@ -399,7 +399,7 @@ static __init int stk17ta8_init(void) static __exit void stk17ta8_exit(void) { - platform_driver_unregister(&stk17ta8_rtc_driver); + return platform_driver_unregister(&stk17ta8_rtc_driver); } module_init(stk17ta8_init); diff --git a/trunk/drivers/s390/block/dasd_eer.c b/trunk/drivers/s390/block/dasd_eer.c index f8e05ce98621..892e2878d61b 100644 --- a/trunk/drivers/s390/block/dasd_eer.c +++ b/trunk/drivers/s390/block/dasd_eer.c @@ -535,8 +535,8 @@ static int dasd_eer_open(struct inode *inp, struct file *filp) eerb->buffer_page_count > INT_MAX / PAGE_SIZE) { kfree(eerb); MESSAGE(KERN_WARNING, "can't open device since module " - "parameter eer_pages is smaller than 1 or" - " bigger than %d", (int)(INT_MAX / PAGE_SIZE)); + "parameter eer_pages is smaller then 1 or" + " bigger then %d", (int)(INT_MAX / PAGE_SIZE)); unlock_kernel(); return -EINVAL; } diff --git a/trunk/drivers/s390/char/vmlogrdr.c b/trunk/drivers/s390/char/vmlogrdr.c index d8a2289fcb69..aabbeb909cc6 100644 --- a/trunk/drivers/s390/char/vmlogrdr.c +++ b/trunk/drivers/s390/char/vmlogrdr.c @@ -427,7 +427,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv) buffer = priv->buffer + sizeof(int); } /* - * If the record is bigger than our buffer, we receive only + * If the record is bigger then our buffer, we receive only * a part of it. We can get the rest later. */ if (iucv_data_count > NET_BUFFER_SIZE) @@ -437,7 +437,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv) 0, buffer, iucv_data_count, &priv->residual_length); spin_unlock_bh(&priv->priv_lock); - /* An rc of 5 indicates that the record was bigger than + /* An rc of 5 indicates that the record was bigger then * the buffer, which is OK for us. A 9 indicates that the * record was purged befor we could receive it. */ diff --git a/trunk/drivers/scsi/a100u2w.c b/trunk/drivers/scsi/a100u2w.c index 964769f66eac..3c298c7253ee 100644 --- a/trunk/drivers/scsi/a100u2w.c +++ b/trunk/drivers/scsi/a100u2w.c @@ -633,7 +633,7 @@ static int orc_device_reset(struct orc_host * host, struct scsi_cmnd *cmd, unsig return FAILED; } - /* Reset device is handled by the firmware, we fill in an SCB and + /* Reset device is handled by the firmare, we fill in an SCB and fire it at the controller, it does the rest */ scb->opcode = ORC_BUSDEVRST; scb->target = target; diff --git a/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c b/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c index 311ed6dea726..8c64494444bf 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/trunk/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -1964,10 +1964,10 @@ lpfc_set_disctmo(struct lpfc_vport *vport) uint32_t tmo; if (vport->port_state == LPFC_LOCAL_CFG_LINK) { - /* For FAN, timeout should be greater than edtov */ + /* For FAN, timeout should be greater then edtov */ tmo = (((phba->fc_edtov + 999) / 1000) + 1); } else { - /* Normal discovery timeout should be > than ELS/CT timeout + /* Normal discovery timeout should be > then ELS/CT timeout * FC spec states we need 3 * ratov for CT requests */ tmo = ((phba->fc_ratov * 3) + 3); diff --git a/trunk/drivers/scsi/lpfc/lpfc_sli.c b/trunk/drivers/scsi/lpfc/lpfc_sli.c index a36a120561e2..01dfdc8696f8 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_sli.c +++ b/trunk/drivers/scsi/lpfc/lpfc_sli.c @@ -420,7 +420,7 @@ lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring) if (unlikely(pring->local_getidx >= max_cmd_idx)) { lpfc_printf_log(phba, KERN_ERR, LOG_SLI, "0315 Ring %d issue: portCmdGet %d " - "is bigger than cmd ring %d\n", + "is bigger then cmd ring %d\n", pring->ringno, pring->local_getidx, max_cmd_idx); @@ -1628,12 +1628,12 @@ lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) { struct lpfc_pgp *pgp = &phba->port_gp[pring->ringno]; /* - * Ring handler: portRspPut is bigger than + * Ring handler: portRspPut is bigger then * rsp ring */ lpfc_printf_log(phba, KERN_ERR, LOG_SLI, "0312 Ring %d handler: portRspPut %d " - "is bigger than rsp ring %d\n", + "is bigger then rsp ring %d\n", pring->ringno, le32_to_cpu(pgp->rspPutInx), pring->numRiocb); @@ -2083,12 +2083,12 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba, portRspPut = le32_to_cpu(pgp->rspPutInx); if (portRspPut >= portRspMax) { /* - * Ring handler: portRspPut is bigger than + * Ring handler: portRspPut is bigger then * rsp ring */ lpfc_printf_log(phba, KERN_ERR, LOG_SLI, "0303 Ring %d handler: portRspPut %d " - "is bigger than rsp ring %d\n", + "is bigger then rsp ring %d\n", pring->ringno, portRspPut, portRspMax); phba->link_state = LPFC_HBA_ERROR; diff --git a/trunk/drivers/scsi/megaraid.c b/trunk/drivers/scsi/megaraid.c index 9fdcd60c5493..7dc62deb4087 100644 --- a/trunk/drivers/scsi/megaraid.c +++ b/trunk/drivers/scsi/megaraid.c @@ -1967,8 +1967,8 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor) scb->state |= aor; /* - * Check if this command has firmware ownership. If - * yes, we cannot reset this command. Whenever f/w + * Check if this command has firmare owenership. If + * yes, we cannot reset this command. Whenever, f/w * completes this command, we will return appropriate * status from ISR. */ diff --git a/trunk/drivers/scsi/qla1280.c b/trunk/drivers/scsi/qla1280.c index df09820e8916..8cb9240596ab 100644 --- a/trunk/drivers/scsi/qla1280.c +++ b/trunk/drivers/scsi/qla1280.c @@ -128,7 +128,7 @@ - Integrate ql12160_set_target_parameters() with 1280 version - Make qla1280_setup() non static - Do not call qla1280_check_for_dead_scsi_bus() on every I/O request - sent to the card - this command pauses the firmware!!! + sent to the card - this command pauses the firmare!!! Rev 3.23.15 Beta March 19, 2002, Jes Sorensen - Clean up qla1280.h - remove obsolete QL_DEBUG_LEVEL_x definitions - Remove a pile of pointless and confusing (srb_t **) and @@ -659,7 +659,7 @@ static int qla1280_read_nvram(struct scsi_qla_host *ha) /* The firmware interface is, um, interesting, in that the * actual firmware image on the chip is little endian, thus, * the process of taking that image to the CPU would end up - * little endian. However, the firmware interface requires it + * little endian. However, the firmare interface requires it * to be read a word (two bytes) at a time. * * The net result of this would be that the word (and diff --git a/trunk/drivers/scsi/qla4xxx/ql4_mbx.c b/trunk/drivers/scsi/qla4xxx/ql4_mbx.c index 051b0f5e8c8e..c577d79bd7e8 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_mbx.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_mbx.c @@ -392,7 +392,7 @@ int qla4xxx_get_firmware_status(struct scsi_qla_host * ha) ha->iocb_hiwat -= IOCB_HIWAT_CUSHION; else dev_info(&ha->pdev->dev, "WARNING!!! You have less than %d " - "firmware IOCBs available (%d).\n", + "firmare IOCBs available (%d).\n", IOCB_HIWAT_CUSHION, ha->iocb_hiwat); return QLA_SUCCESS; diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c index d86ebea9350a..381838ebd460 100644 --- a/trunk/drivers/scsi/scsi_error.c +++ b/trunk/drivers/scsi/scsi_error.c @@ -1650,7 +1650,7 @@ int scsi_error_handler(void *data) * We use TASK_INTERRUPTIBLE so that the thread is not * counted against the load average as a running process. * We never actually get interrupted because kthread_run - * disables signal delivery for the created thread. + * disables singal delivery for the created thread. */ set_current_state(TASK_INTERRUPTIBLE); while (!kthread_should_stop()) { diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c index 1889a63ebc22..daa00567bc44 100644 --- a/trunk/drivers/serial/8250.c +++ b/trunk/drivers/serial/8250.c @@ -3123,7 +3123,7 @@ static int __init serial8250_init(void) if (nr_uarts > UART_NR) nr_uarts = UART_NR; - printk(KERN_INFO "Serial: 8250/16550 driver, " + printk(KERN_INFO "Serial: 8250/16550 driver" "%d ports, IRQ sharing %sabled\n", nr_uarts, share_irqs ? "en" : "dis"); diff --git a/trunk/drivers/serial/crisv10.c b/trunk/drivers/serial/crisv10.c index e642c22c80e2..8b2c619a09f2 100644 --- a/trunk/drivers/serial/crisv10.c +++ b/trunk/drivers/serial/crisv10.c @@ -1203,7 +1203,7 @@ static void e100_disable_txdma_channel(struct e100_serial *info) unsigned long flags; /* Disable output DMA channel for the serial port in question - * ( set to something other than serialX) + * ( set to something other then serialX) */ local_irq_save(flags); 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) unsigned long flags; /* Disable input DMA channel for the serial port in question - * ( set to something other than serialX) + * ( set to something other then serialX) */ local_irq_save(flags); if (info->line == 0) { diff --git a/trunk/drivers/uwb/i1480/dfu/usb.c b/trunk/drivers/uwb/i1480/dfu/usb.c index c7080d497311..686795e97195 100644 --- a/trunk/drivers/uwb/i1480/dfu/usb.c +++ b/trunk/drivers/uwb/i1480/dfu/usb.c @@ -387,7 +387,7 @@ int i1480_usb_probe(struct usb_interface *iface, const struct usb_device_id *id) goto error_create; } - /* setup the fops and upload the firmware */ + /* setup the fops and upload the firmare */ i1480->pre_fw_name = "i1480-pre-phy-0.0.bin"; i1480->mac_fw_name = "i1480-usb-0.0.bin"; i1480->mac_fw_name_deprecate = "ptc-0.0.bin"; diff --git a/trunk/drivers/video/console/vgacon.c b/trunk/drivers/video/console/vgacon.c index d012edda6d11..e6210725b9ab 100644 --- a/trunk/drivers/video/console/vgacon.c +++ b/trunk/drivers/video/console/vgacon.c @@ -1332,7 +1332,7 @@ static void vgacon_save_screen(struct vc_data *c) c->vc_y = screen_info.orig_y; } - /* We can't copy in more than the size of the video buffer, + /* We can't copy in more then the size of the video buffer, * or we'll be copying in VGA BIOS */ if (!vga_is_gfx) diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c index 6e4ea36c6605..4ddab67867eb 100644 --- a/trunk/fs/gfs2/ops_address.c +++ b/trunk/fs/gfs2/ops_address.c @@ -675,6 +675,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, goto out_trans_fail; error = -ENOMEM; + flags |= AOP_FLAG_NOFS; page = grab_cache_page_write_begin(mapping, index, flags); *pagep = page; if (unlikely(!page)) diff --git a/trunk/fs/ncpfs/ioctl.c b/trunk/fs/ncpfs/ioctl.c index f54360f50a9c..6d04e050c74e 100644 --- a/trunk/fs/ncpfs/ioctl.c +++ b/trunk/fs/ncpfs/ioctl.c @@ -98,7 +98,7 @@ struct compat_ncp_objectname_ioctl { s32 auth_type; u32 object_name_len; - compat_caddr_t object_name; /* a userspace data, in most cases user name */ + compat_caddr_t object_name; /* an userspace data, in most cases user name */ }; struct compat_ncp_fs_info_v2 { diff --git a/trunk/fs/ocfs2/cluster/heartbeat.c b/trunk/fs/ocfs2/cluster/heartbeat.c index 04697ba7f73e..6ebaa58e2c03 100644 --- a/trunk/fs/ocfs2/cluster/heartbeat.c +++ b/trunk/fs/ocfs2/cluster/heartbeat.c @@ -854,7 +854,7 @@ static int o2hb_thread(void *data) while (!kthread_should_stop() && !reg->hr_unclean_stop) { /* We track the time spent inside - * o2hb_do_disk_heartbeat so that we avoid more than + * o2hb_do_disk_heartbeat so that we avoid more then * hr_timeout_ms between disk writes. On busy systems * this should result in a heartbeat which is less * likely to time itself out. */ diff --git a/trunk/fs/proc/task_nommu.c b/trunk/fs/proc/task_nommu.c index d4a8be32b902..219bd79ea894 100644 --- a/trunk/fs/proc/task_nommu.c +++ b/trunk/fs/proc/task_nommu.c @@ -9,7 +9,7 @@ /* * Logic: we've got two memory sums for each process, "shared", and - * "non-shared". Shared memory may get counted more than once, for + * "non-shared". Shared memory may get counted more then once, for * each process that owns it. Non-shared memory is counted * accurately. */ diff --git a/trunk/fs/ubifs/Kconfig b/trunk/fs/ubifs/Kconfig index e35b54d5059d..91ceeda7e5bf 100644 --- a/trunk/fs/ubifs/Kconfig +++ b/trunk/fs/ubifs/Kconfig @@ -40,7 +40,7 @@ config UBIFS_FS_ZLIB depends on UBIFS_FS default y help - Zlib compresses better than LZO but it is slower. Say 'Y' if unsure. + Zlib copresses better then LZO but it is slower. Say 'Y' if unsure. # Debugging-related stuff config UBIFS_FS_DEBUG diff --git a/trunk/fs/ubifs/budget.c b/trunk/fs/ubifs/budget.c index 175f9c590b77..0e5e54d82924 100644 --- a/trunk/fs/ubifs/budget.c +++ b/trunk/fs/ubifs/budget.c @@ -142,7 +142,7 @@ static long long get_liability(struct ubifs_info *c) * * This function is called when an operation cannot be budgeted because there * is supposedly no free space. But in most cases there is some free space: - * o budgeting is pessimistic, so it always budgets more than it is actually + * o budgeting is pessimistic, so it always budgets more then it is actually * needed, so shrinking the liability is one way to make free space - the * cached data will take less space then it was budgeted for; * 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) * @c: UBIFS file-system description object * * This function converts budget which was allocated for a new page of data to - * the budget of changing an existing page of data. The latter is smaller than + * the budget of changing an existing page of data. The latter is smaller then * the former, so this function only does simple re-calculation and does not * involve any write-back. */ diff --git a/trunk/fs/ubifs/gc.c b/trunk/fs/ubifs/gc.c index 9832f9abe28e..0bef6501d58a 100644 --- a/trunk/fs/ubifs/gc.c +++ b/trunk/fs/ubifs/gc.c @@ -45,7 +45,7 @@ #define SMALL_NODE_WM UBIFS_MAX_DENT_NODE_SZ /* - * GC may need to move more than one LEB to make progress. The below constants + * GC may need to move more then one LEB to make progress. The below constants * define "soft" and "hard" limits on the number of LEBs the garbage collector * may move. */ diff --git a/trunk/fs/ubifs/journal.c b/trunk/fs/ubifs/journal.c index 9b7c54e0cd2a..10ae25b7d1db 100644 --- a/trunk/fs/ubifs/journal.c +++ b/trunk/fs/ubifs/journal.c @@ -191,7 +191,7 @@ static int reserve_space(struct ubifs_info *c, int jhead, int len) if (wbuf->lnum != -1 && avail >= len) { /* * Someone else has switched the journal head and we have - * enough space now. This happens when more than one process is + * enough space now. This happens when more then one process is * trying to write to the same journal head at the same time. */ dbg_jnl("return LEB %d back, already have LEB %d:%d", diff --git a/trunk/fs/ubifs/shrinker.c b/trunk/fs/ubifs/shrinker.c index e7bab52a1410..f248533841a2 100644 --- a/trunk/fs/ubifs/shrinker.c +++ b/trunk/fs/ubifs/shrinker.c @@ -151,7 +151,7 @@ static int shrink_tnc(struct ubifs_info *c, int nr, int age, int *contention) * @contention: if any contention, this is set to %1 * * This function walks the list of mounted UBIFS file-systems and frees clean - * znodes which are older than @age, until at least @nr znodes are freed. + * znodes which are older then @age, until at least @nr znodes are freed. * Returns the number of freed znodes. */ static int shrink_tnc_trees(int nr, int age, int *contention) diff --git a/trunk/fs/xfs/linux-2.6/xfs_super.c b/trunk/fs/xfs/linux-2.6/xfs_super.c index be846d606ae8..36f6cc703ef2 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_super.c +++ b/trunk/fs/xfs/linux-2.6/xfs_super.c @@ -1348,7 +1348,7 @@ xfs_finish_flags( { int ronly = (mp->m_flags & XFS_MOUNT_RDONLY); - /* Fail a mount where the logbuf is smaller than the log stripe */ + /* Fail a mount where the logbuf is smaller then the log stripe */ if (xfs_sb_version_haslogv2(&mp->m_sb)) { if (mp->m_logbsize <= 0 && mp->m_sb.sb_logsunit > XLOG_BIG_RECORD_BSIZE) { diff --git a/trunk/include/acpi/acmacros.h b/trunk/include/acpi/acmacros.h index 1954c9d1d012..a597207e2835 100644 --- a/trunk/include/acpi/acmacros.h +++ b/trunk/include/acpi/acmacros.h @@ -333,8 +333,8 @@ struct acpi_integer_overlay { #define ACPI_INSERT_BITS(target, mask, source) target = ((target & (~(mask))) | (source & mask)) /* - * A struct acpi_namespace_node can appear in some contexts - * where a pointer to a union acpi_operand_object can also + * An struct acpi_namespace_node can appear in some contexts + * where a pointer to an union acpi_operand_object can also * appear. This macro is used to distinguish them. * * The "Descriptor" field is the first field in both structures. diff --git a/trunk/include/acpi/actypes.h b/trunk/include/acpi/actypes.h index 8222e8de0d1c..7220361790b3 100644 --- a/trunk/include/acpi/actypes.h +++ b/trunk/include/acpi/actypes.h @@ -467,7 +467,7 @@ typedef u32 acpi_object_type; /* * These are special object types that never appear in - * a Namespace node, only in a union acpi_operand_object + * a Namespace node, only in an union acpi_operand_object */ #define ACPI_TYPE_LOCAL_EXTRA 0x1C #define ACPI_TYPE_LOCAL_DATA 0x1D diff --git a/trunk/arch/xtensa/include/asm/Kbuild b/trunk/include/asm-xtensa/Kbuild similarity index 100% rename from trunk/arch/xtensa/include/asm/Kbuild rename to trunk/include/asm-xtensa/Kbuild diff --git a/trunk/arch/xtensa/include/asm/asmmacro.h b/trunk/include/asm-xtensa/asmmacro.h similarity index 98% rename from trunk/arch/xtensa/include/asm/asmmacro.h rename to trunk/include/asm-xtensa/asmmacro.h index 755320f6e0bc..76915cabad17 100644 --- a/trunk/arch/xtensa/include/asm/asmmacro.h +++ b/trunk/include/asm-xtensa/asmmacro.h @@ -11,7 +11,7 @@ #ifndef _XTENSA_ASMMACRO_H #define _XTENSA_ASMMACRO_H -#include +#include /* * Some little helpers for loops. Use zero-overhead-loops diff --git a/trunk/arch/xtensa/include/asm/atomic.h b/trunk/include/asm-xtensa/atomic.h similarity index 100% rename from trunk/arch/xtensa/include/asm/atomic.h rename to trunk/include/asm-xtensa/atomic.h diff --git a/trunk/arch/xtensa/include/asm/auxvec.h b/trunk/include/asm-xtensa/auxvec.h similarity index 100% rename from trunk/arch/xtensa/include/asm/auxvec.h rename to trunk/include/asm-xtensa/auxvec.h diff --git a/trunk/arch/xtensa/include/asm/bitops.h b/trunk/include/asm-xtensa/bitops.h similarity index 100% rename from trunk/arch/xtensa/include/asm/bitops.h rename to trunk/include/asm-xtensa/bitops.h diff --git a/trunk/arch/xtensa/include/asm/bootparam.h b/trunk/include/asm-xtensa/bootparam.h similarity index 100% rename from trunk/arch/xtensa/include/asm/bootparam.h rename to trunk/include/asm-xtensa/bootparam.h diff --git a/trunk/arch/xtensa/include/asm/bug.h b/trunk/include/asm-xtensa/bug.h similarity index 100% rename from trunk/arch/xtensa/include/asm/bug.h rename to trunk/include/asm-xtensa/bug.h diff --git a/trunk/arch/xtensa/include/asm/bugs.h b/trunk/include/asm-xtensa/bugs.h similarity index 100% rename from trunk/arch/xtensa/include/asm/bugs.h rename to trunk/include/asm-xtensa/bugs.h diff --git a/trunk/arch/xtensa/include/asm/byteorder.h b/trunk/include/asm-xtensa/byteorder.h similarity index 82% rename from trunk/arch/xtensa/include/asm/byteorder.h rename to trunk/include/asm-xtensa/byteorder.h index 07d10ad364d1..765edf17a9a4 100644 --- a/trunk/arch/xtensa/include/asm/byteorder.h +++ b/trunk/include/asm-xtensa/byteorder.h @@ -14,17 +14,7 @@ #include #include -#ifdef __XTENSA_EL__ -# define __LITTLE_ENDIAN -#elif defined(__XTENSA_EB__) -# define __BIG_ENDIAN -#else -# error processor byte order undefined! -#endif - -#define __SWAB_64_THRU_32__ - -static inline __attribute_const__ __u32 __arch_swab32(__u32 x) +static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) { __u32 res; /* instruction sequence from Xtensa ISA release 2/2000 */ @@ -38,9 +28,8 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) ); return res; } -#define __arch_swab32 __arch_swab32 -static inline __attribute_const__ __u16 __arch_swab16(__u16 x) +static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x) { /* Given that 'short' values are signed (i.e., can be negative), * we cannot assume that the upper 16-bits of the register are @@ -73,8 +62,21 @@ static inline __attribute_const__ __u16 __arch_swab16(__u16 x) return res; } -#define __arch_swab16 __arch_swab16 -#include +#define __arch__swab32(x) ___arch__swab32(x) +#define __arch__swab16(x) ___arch__swab16(x) + +#if !defined(__STRICT_ANSI__) || defined(__KERNEL__) +# define __BYTEORDER_HAS_U64__ +# define __SWAB_64_THRU_32__ +#endif + +#ifdef __XTENSA_EL__ +# include +#elif defined(__XTENSA_EB__) +# include +#else +# error processor byte order undefined! +#endif #endif /* _XTENSA_BYTEORDER_H */ diff --git a/trunk/arch/xtensa/include/asm/cache.h b/trunk/include/asm-xtensa/cache.h similarity index 96% rename from trunk/arch/xtensa/include/asm/cache.h rename to trunk/include/asm-xtensa/cache.h index f04c9891142f..3bba2a540cf0 100644 --- a/trunk/arch/xtensa/include/asm/cache.h +++ b/trunk/include/asm-xtensa/cache.h @@ -11,7 +11,7 @@ #ifndef _XTENSA_CACHE_H #define _XTENSA_CACHE_H -#include +#include #define L1_CACHE_SHIFT XCHAL_DCACHE_LINEWIDTH #define L1_CACHE_BYTES XCHAL_DCACHE_LINESIZE diff --git a/trunk/arch/xtensa/include/asm/cacheasm.h b/trunk/include/asm-xtensa/cacheasm.h similarity index 100% rename from trunk/arch/xtensa/include/asm/cacheasm.h rename to trunk/include/asm-xtensa/cacheasm.h diff --git a/trunk/arch/xtensa/include/asm/cacheflush.h b/trunk/include/asm-xtensa/cacheflush.h similarity index 100% rename from trunk/arch/xtensa/include/asm/cacheflush.h rename to trunk/include/asm-xtensa/cacheflush.h diff --git a/trunk/arch/xtensa/include/asm/checksum.h b/trunk/include/asm-xtensa/checksum.h similarity index 99% rename from trunk/arch/xtensa/include/asm/checksum.h rename to trunk/include/asm-xtensa/checksum.h index f84d3f00774a..23534c60b3a4 100644 --- a/trunk/arch/xtensa/include/asm/checksum.h +++ b/trunk/include/asm-xtensa/checksum.h @@ -12,7 +12,7 @@ #define _XTENSA_CHECKSUM_H #include -#include +#include /* * computes the checksum of a memory block at buff, length len, diff --git a/trunk/arch/xtensa/include/asm/coprocessor.h b/trunk/include/asm-xtensa/coprocessor.h similarity index 98% rename from trunk/arch/xtensa/include/asm/coprocessor.h rename to trunk/include/asm-xtensa/coprocessor.h index 65a285d8d3fb..1cbcf9001a41 100644 --- a/trunk/arch/xtensa/include/asm/coprocessor.h +++ b/trunk/include/asm-xtensa/coprocessor.h @@ -13,11 +13,11 @@ #define _XTENSA_COPROCESSOR_H #include -#include +#include #include #ifdef __ASSEMBLY__ -# include +# include .macro xchal_sa_start a b .set .Lxchal_pofs_, 0 diff --git a/trunk/arch/xtensa/include/asm/cpumask.h b/trunk/include/asm-xtensa/cpumask.h similarity index 100% rename from trunk/arch/xtensa/include/asm/cpumask.h rename to trunk/include/asm-xtensa/cpumask.h diff --git a/trunk/arch/xtensa/include/asm/cputime.h b/trunk/include/asm-xtensa/cputime.h similarity index 100% rename from trunk/arch/xtensa/include/asm/cputime.h rename to trunk/include/asm-xtensa/cputime.h diff --git a/trunk/arch/xtensa/include/asm/current.h b/trunk/include/asm-xtensa/current.h similarity index 100% rename from trunk/arch/xtensa/include/asm/current.h rename to trunk/include/asm-xtensa/current.h diff --git a/trunk/arch/xtensa/include/asm/delay.h b/trunk/include/asm-xtensa/delay.h similarity index 100% rename from trunk/arch/xtensa/include/asm/delay.h rename to trunk/include/asm-xtensa/delay.h diff --git a/trunk/arch/xtensa/include/asm/device.h b/trunk/include/asm-xtensa/device.h similarity index 100% rename from trunk/arch/xtensa/include/asm/device.h rename to trunk/include/asm-xtensa/device.h diff --git a/trunk/arch/xtensa/include/asm/div64.h b/trunk/include/asm-xtensa/div64.h similarity index 100% rename from trunk/arch/xtensa/include/asm/div64.h rename to trunk/include/asm-xtensa/div64.h diff --git a/trunk/arch/xtensa/include/asm/dma-mapping.h b/trunk/include/asm-xtensa/dma-mapping.h similarity index 100% rename from trunk/arch/xtensa/include/asm/dma-mapping.h rename to trunk/include/asm-xtensa/dma-mapping.h diff --git a/trunk/arch/xtensa/include/asm/dma.h b/trunk/include/asm-xtensa/dma.h similarity index 100% rename from trunk/arch/xtensa/include/asm/dma.h rename to trunk/include/asm-xtensa/dma.h diff --git a/trunk/arch/xtensa/include/asm/elf.h b/trunk/include/asm-xtensa/elf.h similarity index 100% rename from trunk/arch/xtensa/include/asm/elf.h rename to trunk/include/asm-xtensa/elf.h diff --git a/trunk/arch/xtensa/include/asm/emergency-restart.h b/trunk/include/asm-xtensa/emergency-restart.h similarity index 100% rename from trunk/arch/xtensa/include/asm/emergency-restart.h rename to trunk/include/asm-xtensa/emergency-restart.h diff --git a/trunk/arch/xtensa/include/asm/errno.h b/trunk/include/asm-xtensa/errno.h similarity index 100% rename from trunk/arch/xtensa/include/asm/errno.h rename to trunk/include/asm-xtensa/errno.h diff --git a/trunk/arch/xtensa/include/asm/fb.h b/trunk/include/asm-xtensa/fb.h similarity index 100% rename from trunk/arch/xtensa/include/asm/fb.h rename to trunk/include/asm-xtensa/fb.h diff --git a/trunk/arch/xtensa/include/asm/fcntl.h b/trunk/include/asm-xtensa/fcntl.h similarity index 100% rename from trunk/arch/xtensa/include/asm/fcntl.h rename to trunk/include/asm-xtensa/fcntl.h diff --git a/trunk/arch/xtensa/include/asm/futex.h b/trunk/include/asm-xtensa/futex.h similarity index 100% rename from trunk/arch/xtensa/include/asm/futex.h rename to trunk/include/asm-xtensa/futex.h diff --git a/trunk/arch/xtensa/include/asm/hardirq.h b/trunk/include/asm-xtensa/hardirq.h similarity index 100% rename from trunk/arch/xtensa/include/asm/hardirq.h rename to trunk/include/asm-xtensa/hardirq.h diff --git a/trunk/arch/xtensa/include/asm/highmem.h b/trunk/include/asm-xtensa/highmem.h similarity index 100% rename from trunk/arch/xtensa/include/asm/highmem.h rename to trunk/include/asm-xtensa/highmem.h diff --git a/trunk/arch/xtensa/include/asm/hw_irq.h b/trunk/include/asm-xtensa/hw_irq.h similarity index 100% rename from trunk/arch/xtensa/include/asm/hw_irq.h rename to trunk/include/asm-xtensa/hw_irq.h diff --git a/trunk/arch/xtensa/include/asm/io.h b/trunk/include/asm-xtensa/io.h similarity index 100% rename from trunk/arch/xtensa/include/asm/io.h rename to trunk/include/asm-xtensa/io.h diff --git a/trunk/arch/xtensa/include/asm/ioctl.h b/trunk/include/asm-xtensa/ioctl.h similarity index 100% rename from trunk/arch/xtensa/include/asm/ioctl.h rename to trunk/include/asm-xtensa/ioctl.h diff --git a/trunk/arch/xtensa/include/asm/ioctls.h b/trunk/include/asm-xtensa/ioctls.h similarity index 100% rename from trunk/arch/xtensa/include/asm/ioctls.h rename to trunk/include/asm-xtensa/ioctls.h diff --git a/trunk/arch/xtensa/include/asm/ipcbuf.h b/trunk/include/asm-xtensa/ipcbuf.h similarity index 100% rename from trunk/arch/xtensa/include/asm/ipcbuf.h rename to trunk/include/asm-xtensa/ipcbuf.h diff --git a/trunk/arch/xtensa/include/asm/irq.h b/trunk/include/asm-xtensa/irq.h similarity index 89% rename from trunk/arch/xtensa/include/asm/irq.h rename to trunk/include/asm-xtensa/irq.h index 1620d1e0e695..fc73b7f11aff 100644 --- a/trunk/arch/xtensa/include/asm/irq.h +++ b/trunk/include/asm-xtensa/irq.h @@ -11,8 +11,8 @@ #ifndef _XTENSA_IRQ_H #define _XTENSA_IRQ_H -#include -#include +#include +#include #ifndef PLATFORM_NR_IRQS # define PLATFORM_NR_IRQS 0 diff --git a/trunk/arch/xtensa/include/asm/irq_regs.h b/trunk/include/asm-xtensa/irq_regs.h similarity index 100% rename from trunk/arch/xtensa/include/asm/irq_regs.h rename to trunk/include/asm-xtensa/irq_regs.h diff --git a/trunk/arch/xtensa/include/asm/kdebug.h b/trunk/include/asm-xtensa/kdebug.h similarity index 100% rename from trunk/arch/xtensa/include/asm/kdebug.h rename to trunk/include/asm-xtensa/kdebug.h diff --git a/trunk/arch/xtensa/include/asm/kmap_types.h b/trunk/include/asm-xtensa/kmap_types.h similarity index 100% rename from trunk/arch/xtensa/include/asm/kmap_types.h rename to trunk/include/asm-xtensa/kmap_types.h diff --git a/trunk/arch/xtensa/include/asm/linkage.h b/trunk/include/asm-xtensa/linkage.h similarity index 100% rename from trunk/arch/xtensa/include/asm/linkage.h rename to trunk/include/asm-xtensa/linkage.h diff --git a/trunk/arch/xtensa/include/asm/local.h b/trunk/include/asm-xtensa/local.h similarity index 100% rename from trunk/arch/xtensa/include/asm/local.h rename to trunk/include/asm-xtensa/local.h diff --git a/trunk/arch/xtensa/include/asm/mman.h b/trunk/include/asm-xtensa/mman.h similarity index 100% rename from trunk/arch/xtensa/include/asm/mman.h rename to trunk/include/asm-xtensa/mman.h diff --git a/trunk/arch/xtensa/include/asm/mmu.h b/trunk/include/asm-xtensa/mmu.h similarity index 100% rename from trunk/arch/xtensa/include/asm/mmu.h rename to trunk/include/asm-xtensa/mmu.h diff --git a/trunk/arch/xtensa/include/asm/mmu_context.h b/trunk/include/asm-xtensa/mmu_context.h similarity index 100% rename from trunk/arch/xtensa/include/asm/mmu_context.h rename to trunk/include/asm-xtensa/mmu_context.h diff --git a/trunk/arch/xtensa/include/asm/module.h b/trunk/include/asm-xtensa/module.h similarity index 100% rename from trunk/arch/xtensa/include/asm/module.h rename to trunk/include/asm-xtensa/module.h diff --git a/trunk/arch/xtensa/include/asm/msgbuf.h b/trunk/include/asm-xtensa/msgbuf.h similarity index 100% rename from trunk/arch/xtensa/include/asm/msgbuf.h rename to trunk/include/asm-xtensa/msgbuf.h diff --git a/trunk/arch/xtensa/include/asm/mutex.h b/trunk/include/asm-xtensa/mutex.h similarity index 100% rename from trunk/arch/xtensa/include/asm/mutex.h rename to trunk/include/asm-xtensa/mutex.h diff --git a/trunk/arch/xtensa/include/asm/page.h b/trunk/include/asm-xtensa/page.h similarity index 100% rename from trunk/arch/xtensa/include/asm/page.h rename to trunk/include/asm-xtensa/page.h diff --git a/trunk/arch/xtensa/include/asm/param.h b/trunk/include/asm-xtensa/param.h similarity index 100% rename from trunk/arch/xtensa/include/asm/param.h rename to trunk/include/asm-xtensa/param.h diff --git a/trunk/arch/xtensa/include/asm/pci-bridge.h b/trunk/include/asm-xtensa/pci-bridge.h similarity index 100% rename from trunk/arch/xtensa/include/asm/pci-bridge.h rename to trunk/include/asm-xtensa/pci-bridge.h diff --git a/trunk/arch/xtensa/include/asm/pci.h b/trunk/include/asm-xtensa/pci.h similarity index 100% rename from trunk/arch/xtensa/include/asm/pci.h rename to trunk/include/asm-xtensa/pci.h diff --git a/trunk/arch/xtensa/include/asm/percpu.h b/trunk/include/asm-xtensa/percpu.h similarity index 100% rename from trunk/arch/xtensa/include/asm/percpu.h rename to trunk/include/asm-xtensa/percpu.h diff --git a/trunk/arch/xtensa/include/asm/pgalloc.h b/trunk/include/asm-xtensa/pgalloc.h similarity index 100% rename from trunk/arch/xtensa/include/asm/pgalloc.h rename to trunk/include/asm-xtensa/pgalloc.h diff --git a/trunk/arch/xtensa/include/asm/pgtable.h b/trunk/include/asm-xtensa/pgtable.h similarity index 100% rename from trunk/arch/xtensa/include/asm/pgtable.h rename to trunk/include/asm-xtensa/pgtable.h diff --git a/trunk/arch/xtensa/platforms/iss/include/platform/hardware.h b/trunk/include/asm-xtensa/platform-iss/hardware.h similarity index 100% rename from trunk/arch/xtensa/platforms/iss/include/platform/hardware.h rename to trunk/include/asm-xtensa/platform-iss/hardware.h diff --git a/trunk/arch/xtensa/platforms/iss/include/platform/simcall.h b/trunk/include/asm-xtensa/platform-iss/simcall.h similarity index 100% rename from trunk/arch/xtensa/platforms/iss/include/platform/simcall.h rename to trunk/include/asm-xtensa/platform-iss/simcall.h diff --git a/trunk/arch/xtensa/include/asm/platform.h b/trunk/include/asm-xtensa/platform.h similarity index 98% rename from trunk/arch/xtensa/include/asm/platform.h rename to trunk/include/asm-xtensa/platform.h index e3d5a48ad495..48135a9718b0 100644 --- a/trunk/arch/xtensa/include/asm/platform.h +++ b/trunk/include/asm-xtensa/platform.h @@ -1,4 +1,6 @@ /* + * include/asm-xtensa/platform.h + * * Platform specific functions * * This file is subject to the terms and conditions of the GNU General diff --git a/trunk/arch/xtensa/include/asm/poll.h b/trunk/include/asm-xtensa/poll.h similarity index 100% rename from trunk/arch/xtensa/include/asm/poll.h rename to trunk/include/asm-xtensa/poll.h diff --git a/trunk/arch/xtensa/include/asm/posix_types.h b/trunk/include/asm-xtensa/posix_types.h similarity index 100% rename from trunk/arch/xtensa/include/asm/posix_types.h rename to trunk/include/asm-xtensa/posix_types.h diff --git a/trunk/arch/xtensa/include/asm/processor.h b/trunk/include/asm-xtensa/processor.h similarity index 99% rename from trunk/arch/xtensa/include/asm/processor.h rename to trunk/include/asm-xtensa/processor.h index 07387d3b99f4..4918a4e96d42 100644 --- a/trunk/arch/xtensa/include/asm/processor.h +++ b/trunk/include/asm-xtensa/processor.h @@ -11,7 +11,7 @@ #ifndef _XTENSA_PROCESSOR_H #define _XTENSA_PROCESSOR_H -#include +#include #include #include diff --git a/trunk/arch/xtensa/include/asm/ptrace.h b/trunk/include/asm-xtensa/ptrace.h similarity index 99% rename from trunk/arch/xtensa/include/asm/ptrace.h rename to trunk/include/asm-xtensa/ptrace.h index 905e1e619654..089b0db44816 100644 --- a/trunk/arch/xtensa/include/asm/ptrace.h +++ b/trunk/include/asm-xtensa/ptrace.h @@ -111,7 +111,7 @@ struct pt_regs { unsigned long areg[16]; /* 128 (64) */ }; -#include +#include # define task_pt_regs(tsk) ((struct pt_regs*) \ (task_stack_page(tsk) + KERNEL_STACK_SIZE - (XCHAL_NUM_AREGS-16)*4) - 1) diff --git a/trunk/arch/xtensa/include/asm/regs.h b/trunk/include/asm-xtensa/regs.h similarity index 100% rename from trunk/arch/xtensa/include/asm/regs.h rename to trunk/include/asm-xtensa/regs.h diff --git a/trunk/arch/xtensa/include/asm/resource.h b/trunk/include/asm-xtensa/resource.h similarity index 100% rename from trunk/arch/xtensa/include/asm/resource.h rename to trunk/include/asm-xtensa/resource.h diff --git a/trunk/arch/xtensa/include/asm/rmap.h b/trunk/include/asm-xtensa/rmap.h similarity index 100% rename from trunk/arch/xtensa/include/asm/rmap.h rename to trunk/include/asm-xtensa/rmap.h diff --git a/trunk/arch/xtensa/include/asm/rwsem.h b/trunk/include/asm-xtensa/rwsem.h similarity index 100% rename from trunk/arch/xtensa/include/asm/rwsem.h rename to trunk/include/asm-xtensa/rwsem.h diff --git a/trunk/arch/xtensa/include/asm/scatterlist.h b/trunk/include/asm-xtensa/scatterlist.h similarity index 100% rename from trunk/arch/xtensa/include/asm/scatterlist.h rename to trunk/include/asm-xtensa/scatterlist.h diff --git a/trunk/arch/xtensa/include/asm/sections.h b/trunk/include/asm-xtensa/sections.h similarity index 100% rename from trunk/arch/xtensa/include/asm/sections.h rename to trunk/include/asm-xtensa/sections.h diff --git a/trunk/arch/xtensa/include/asm/segment.h b/trunk/include/asm-xtensa/segment.h similarity index 100% rename from trunk/arch/xtensa/include/asm/segment.h rename to trunk/include/asm-xtensa/segment.h diff --git a/trunk/arch/xtensa/include/asm/sembuf.h b/trunk/include/asm-xtensa/sembuf.h similarity index 100% rename from trunk/arch/xtensa/include/asm/sembuf.h rename to trunk/include/asm-xtensa/sembuf.h diff --git a/trunk/arch/xtensa/include/asm/serial.h b/trunk/include/asm-xtensa/serial.h similarity index 92% rename from trunk/arch/xtensa/include/asm/serial.h rename to trunk/include/asm-xtensa/serial.h index a8a2493260f6..ec04114fcf0b 100644 --- a/trunk/arch/xtensa/include/asm/serial.h +++ b/trunk/include/asm-xtensa/serial.h @@ -13,6 +13,6 @@ #ifndef _XTENSA_SERIAL_H #define _XTENSA_SERIAL_H -#include +#include #endif /* _XTENSA_SERIAL_H */ diff --git a/trunk/arch/xtensa/include/asm/setup.h b/trunk/include/asm-xtensa/setup.h similarity index 100% rename from trunk/arch/xtensa/include/asm/setup.h rename to trunk/include/asm-xtensa/setup.h diff --git a/trunk/arch/xtensa/include/asm/shmbuf.h b/trunk/include/asm-xtensa/shmbuf.h similarity index 100% rename from trunk/arch/xtensa/include/asm/shmbuf.h rename to trunk/include/asm-xtensa/shmbuf.h diff --git a/trunk/arch/xtensa/include/asm/shmparam.h b/trunk/include/asm-xtensa/shmparam.h similarity index 100% rename from trunk/arch/xtensa/include/asm/shmparam.h rename to trunk/include/asm-xtensa/shmparam.h diff --git a/trunk/arch/xtensa/include/asm/sigcontext.h b/trunk/include/asm-xtensa/sigcontext.h similarity index 100% rename from trunk/arch/xtensa/include/asm/sigcontext.h rename to trunk/include/asm-xtensa/sigcontext.h diff --git a/trunk/arch/xtensa/include/asm/siginfo.h b/trunk/include/asm-xtensa/siginfo.h similarity index 100% rename from trunk/arch/xtensa/include/asm/siginfo.h rename to trunk/include/asm-xtensa/siginfo.h diff --git a/trunk/arch/xtensa/include/asm/signal.h b/trunk/include/asm-xtensa/signal.h similarity index 100% rename from trunk/arch/xtensa/include/asm/signal.h rename to trunk/include/asm-xtensa/signal.h diff --git a/trunk/arch/xtensa/include/asm/smp.h b/trunk/include/asm-xtensa/smp.h similarity index 100% rename from trunk/arch/xtensa/include/asm/smp.h rename to trunk/include/asm-xtensa/smp.h diff --git a/trunk/arch/xtensa/include/asm/socket.h b/trunk/include/asm-xtensa/socket.h similarity index 100% rename from trunk/arch/xtensa/include/asm/socket.h rename to trunk/include/asm-xtensa/socket.h diff --git a/trunk/arch/xtensa/include/asm/sockios.h b/trunk/include/asm-xtensa/sockios.h similarity index 100% rename from trunk/arch/xtensa/include/asm/sockios.h rename to trunk/include/asm-xtensa/sockios.h diff --git a/trunk/arch/xtensa/include/asm/spinlock.h b/trunk/include/asm-xtensa/spinlock.h similarity index 100% rename from trunk/arch/xtensa/include/asm/spinlock.h rename to trunk/include/asm-xtensa/spinlock.h diff --git a/trunk/arch/xtensa/include/asm/stat.h b/trunk/include/asm-xtensa/stat.h similarity index 100% rename from trunk/arch/xtensa/include/asm/stat.h rename to trunk/include/asm-xtensa/stat.h diff --git a/trunk/arch/xtensa/include/asm/statfs.h b/trunk/include/asm-xtensa/statfs.h similarity index 100% rename from trunk/arch/xtensa/include/asm/statfs.h rename to trunk/include/asm-xtensa/statfs.h diff --git a/trunk/arch/xtensa/include/asm/string.h b/trunk/include/asm-xtensa/string.h similarity index 100% rename from trunk/arch/xtensa/include/asm/string.h rename to trunk/include/asm-xtensa/string.h diff --git a/trunk/arch/xtensa/include/asm/syscall.h b/trunk/include/asm-xtensa/syscall.h similarity index 100% rename from trunk/arch/xtensa/include/asm/syscall.h rename to trunk/include/asm-xtensa/syscall.h diff --git a/trunk/arch/xtensa/include/asm/system.h b/trunk/include/asm-xtensa/system.h similarity index 100% rename from trunk/arch/xtensa/include/asm/system.h rename to trunk/include/asm-xtensa/system.h diff --git a/trunk/arch/xtensa/include/asm/termbits.h b/trunk/include/asm-xtensa/termbits.h similarity index 100% rename from trunk/arch/xtensa/include/asm/termbits.h rename to trunk/include/asm-xtensa/termbits.h diff --git a/trunk/arch/xtensa/include/asm/termios.h b/trunk/include/asm-xtensa/termios.h similarity index 100% rename from trunk/arch/xtensa/include/asm/termios.h rename to trunk/include/asm-xtensa/termios.h diff --git a/trunk/arch/xtensa/include/asm/thread_info.h b/trunk/include/asm-xtensa/thread_info.h similarity index 100% rename from trunk/arch/xtensa/include/asm/thread_info.h rename to trunk/include/asm-xtensa/thread_info.h diff --git a/trunk/arch/xtensa/include/asm/timex.h b/trunk/include/asm-xtensa/timex.h similarity index 100% rename from trunk/arch/xtensa/include/asm/timex.h rename to trunk/include/asm-xtensa/timex.h diff --git a/trunk/arch/xtensa/include/asm/tlb.h b/trunk/include/asm-xtensa/tlb.h similarity index 100% rename from trunk/arch/xtensa/include/asm/tlb.h rename to trunk/include/asm-xtensa/tlb.h diff --git a/trunk/arch/xtensa/include/asm/tlbflush.h b/trunk/include/asm-xtensa/tlbflush.h similarity index 100% rename from trunk/arch/xtensa/include/asm/tlbflush.h rename to trunk/include/asm-xtensa/tlbflush.h diff --git a/trunk/arch/xtensa/include/asm/topology.h b/trunk/include/asm-xtensa/topology.h similarity index 100% rename from trunk/arch/xtensa/include/asm/topology.h rename to trunk/include/asm-xtensa/topology.h diff --git a/trunk/arch/xtensa/include/asm/types.h b/trunk/include/asm-xtensa/types.h similarity index 100% rename from trunk/arch/xtensa/include/asm/types.h rename to trunk/include/asm-xtensa/types.h diff --git a/trunk/arch/xtensa/include/asm/uaccess.h b/trunk/include/asm-xtensa/uaccess.h similarity index 100% rename from trunk/arch/xtensa/include/asm/uaccess.h rename to trunk/include/asm-xtensa/uaccess.h diff --git a/trunk/arch/xtensa/include/asm/ucontext.h b/trunk/include/asm-xtensa/ucontext.h similarity index 100% rename from trunk/arch/xtensa/include/asm/ucontext.h rename to trunk/include/asm-xtensa/ucontext.h diff --git a/trunk/arch/xtensa/include/asm/unaligned.h b/trunk/include/asm-xtensa/unaligned.h similarity index 80% rename from trunk/arch/xtensa/include/asm/unaligned.h rename to trunk/include/asm-xtensa/unaligned.h index 8e7ed046bfed..8f3424fc5d18 100644 --- a/trunk/arch/xtensa/include/asm/unaligned.h +++ b/trunk/include/asm-xtensa/unaligned.h @@ -10,20 +10,20 @@ #ifndef _ASM_XTENSA_UNALIGNED_H #define _ASM_XTENSA_UNALIGNED_H -#include - -#ifdef __LITTLE_ENDIAN -# include +#ifdef __XTENSA_EL__ +# include # include # include # define get_unaligned __get_unaligned_le # define put_unaligned __put_unaligned_le -#else -# include +#elif defined(__XTENSA_EB__) +# include # include # include # define get_unaligned __get_unaligned_be # define put_unaligned __put_unaligned_be +#else +# error processor byte order undefined! #endif #endif /* _ASM_XTENSA_UNALIGNED_H */ diff --git a/trunk/arch/xtensa/include/asm/unistd.h b/trunk/include/asm-xtensa/unistd.h similarity index 100% rename from trunk/arch/xtensa/include/asm/unistd.h rename to trunk/include/asm-xtensa/unistd.h diff --git a/trunk/arch/xtensa/include/asm/user.h b/trunk/include/asm-xtensa/user.h similarity index 100% rename from trunk/arch/xtensa/include/asm/user.h rename to trunk/include/asm-xtensa/user.h diff --git a/trunk/arch/xtensa/variants/dc232b/include/variant/core.h b/trunk/include/asm-xtensa/variant-dc232b/core.h similarity index 100% rename from trunk/arch/xtensa/variants/dc232b/include/variant/core.h rename to trunk/include/asm-xtensa/variant-dc232b/core.h diff --git a/trunk/arch/xtensa/variants/dc232b/include/variant/tie-asm.h b/trunk/include/asm-xtensa/variant-dc232b/tie-asm.h similarity index 100% rename from trunk/arch/xtensa/variants/dc232b/include/variant/tie-asm.h rename to trunk/include/asm-xtensa/variant-dc232b/tie-asm.h diff --git a/trunk/arch/xtensa/variants/dc232b/include/variant/tie.h b/trunk/include/asm-xtensa/variant-dc232b/tie.h similarity index 100% rename from trunk/arch/xtensa/variants/dc232b/include/variant/tie.h rename to trunk/include/asm-xtensa/variant-dc232b/tie.h diff --git a/trunk/arch/xtensa/variants/fsf/include/variant/core.h b/trunk/include/asm-xtensa/variant-fsf/core.h similarity index 100% rename from trunk/arch/xtensa/variants/fsf/include/variant/core.h rename to trunk/include/asm-xtensa/variant-fsf/core.h diff --git a/trunk/arch/xtensa/variants/fsf/include/variant/tie-asm.h b/trunk/include/asm-xtensa/variant-fsf/tie-asm.h similarity index 100% rename from trunk/arch/xtensa/variants/fsf/include/variant/tie-asm.h rename to trunk/include/asm-xtensa/variant-fsf/tie-asm.h diff --git a/trunk/arch/xtensa/variants/fsf/include/variant/tie.h b/trunk/include/asm-xtensa/variant-fsf/tie.h similarity index 100% rename from trunk/arch/xtensa/variants/fsf/include/variant/tie.h rename to trunk/include/asm-xtensa/variant-fsf/tie.h diff --git a/trunk/arch/xtensa/include/asm/vga.h b/trunk/include/asm-xtensa/vga.h similarity index 100% rename from trunk/arch/xtensa/include/asm/vga.h rename to trunk/include/asm-xtensa/vga.h diff --git a/trunk/arch/xtensa/include/asm/xor.h b/trunk/include/asm-xtensa/xor.h similarity index 100% rename from trunk/arch/xtensa/include/asm/xor.h rename to trunk/include/asm-xtensa/xor.h diff --git a/trunk/include/linux/mtd/mtd.h b/trunk/include/linux/mtd/mtd.h index 64433eb411d7..eae26bb6430a 100644 --- a/trunk/include/linux/mtd/mtd.h +++ b/trunk/include/linux/mtd/mtd.h @@ -83,7 +83,7 @@ typedef enum { * @datbuf: data buffer - if NULL only oob data are read/written * @oobbuf: oob data buffer * - * Note, it is allowed to read more than one OOB area at one go, but not write. + * Note, it is allowed to read more then one OOB area at one go, but not write. * The interface assumes that the OOB write requests program only one page's * OOB area. */ diff --git a/trunk/include/linux/ncp_fs.h b/trunk/include/linux/ncp_fs.h index f69e66d151cc..9f2d76347f19 100644 --- a/trunk/include/linux/ncp_fs.h +++ b/trunk/include/linux/ncp_fs.h @@ -87,7 +87,7 @@ struct ncp_objectname_ioctl #define NCP_AUTH_NDS 0x32 int auth_type; size_t object_name_len; - void __user * object_name; /* a userspace data, in most cases user name */ + void __user * object_name; /* an userspace data, in most cases user name */ }; struct ncp_privatedata_ioctl diff --git a/trunk/include/linux/spi/spi.h b/trunk/include/linux/spi/spi.h index 68bb1c501d0d..82229317753d 100644 --- a/trunk/include/linux/spi/spi.h +++ b/trunk/include/linux/spi/spi.h @@ -327,9 +327,9 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum); * @tx_dma: DMA address of tx_buf, if @spi_message.is_dma_mapped * @rx_dma: DMA address of rx_buf, if @spi_message.is_dma_mapped * @len: size of rx and tx buffers (in bytes) - * @speed_hz: Select a speed other than the device default for this + * @speed_hz: Select a speed other then the device default for this * transfer. If 0 the default (from @spi_device) is used. - * @bits_per_word: select a bits_per_word other than the device default + * @bits_per_word: select a bits_per_word other then the device default * for this transfer. If 0 the default (from @spi_device) is used. * @cs_change: affects chipselect after this transfer completes * @delay_usecs: microseconds to delay after this transfer before diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h index 712ca53bc348..3b864f2d9560 100644 --- a/trunk/include/linux/types.h +++ b/trunk/include/linux/types.h @@ -176,9 +176,10 @@ typedef __u16 __bitwise __le16; typedef __u16 __bitwise __be16; typedef __u32 __bitwise __le32; typedef __u32 __bitwise __be32; +#if defined(__GNUC__) typedef __u64 __bitwise __le64; typedef __u64 __bitwise __be64; - +#endif typedef __u16 __bitwise __sum16; typedef __u32 __bitwise __wsum; diff --git a/trunk/include/mtd/ubi-user.h b/trunk/include/mtd/ubi-user.h index 2dc2eb2b8e22..ccdc562e444e 100644 --- a/trunk/include/mtd/ubi-user.h +++ b/trunk/include/mtd/ubi-user.h @@ -253,7 +253,7 @@ struct ubi_mkvol_req { * * Re-sizing is possible for both dynamic and static volumes. But while dynamic * volumes may be re-sized arbitrarily, static volumes cannot be made to be - * smaller than the number of bytes they bear. To arbitrarily shrink a static + * smaller then the number of bytes they bear. To arbitrarily shrink a static * volume, it must be wiped out first (by means of volume update operation with * zero number of bytes). */ diff --git a/trunk/init/main.c b/trunk/init/main.c index 05b313283311..b5a892c68375 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -599,8 +599,7 @@ asmlinkage void __init start_kernel(void) sched_clock_init(); profile_init(); if (!irqs_disabled()) - printk(KERN_CRIT "start_kernel(): bug: interrupts were " - "enabled early\n"); + printk("start_kernel(): bug: interrupts were enabled early\n"); early_boot_irqs_on(); local_irq_enable(); diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c index 79e40f00dcb8..30e74dd6d01b 100644 --- a/trunk/kernel/cpu.c +++ b/trunk/kernel/cpu.c @@ -379,11 +379,8 @@ static cpumask_var_t frozen_cpus; int disable_nonboot_cpus(void) { - int cpu, first_cpu, error; + int cpu, first_cpu, error = 0; - error = stop_machine_create(); - if (error) - return error; cpu_maps_update_begin(); first_cpu = cpumask_first(cpu_online_mask); /* We take down all of the non-boot CPUs in one shot to avoid races @@ -412,7 +409,6 @@ int disable_nonboot_cpus(void) printk(KERN_ERR "Non-boot CPUs are not disabled\n"); } cpu_maps_update_done(); - stop_machine_destroy(); return error; } diff --git a/trunk/kernel/pid.c b/trunk/kernel/pid.c index af9224cdd6c0..064e76afa507 100644 --- a/trunk/kernel/pid.c +++ b/trunk/kernel/pid.c @@ -475,7 +475,7 @@ pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns) EXPORT_SYMBOL(task_session_nr_ns); /* - * Used by proc to find the first pid that is greater than or equal to nr. + * Used by proc to find the first pid that is greater then or equal to nr. * * If there is a pid at nr this function is exactly the same as find_pid_ns. */ diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 7015733793e8..e651ab05655f 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -619,7 +619,7 @@ static int acquire_console_semaphore_for_printk(unsigned int cpu) static const char recursion_bug_msg [] = KERN_CRIT "BUG: recent printk recursion!\n"; static int recursion_bug; -static int new_text_line = 1; + static int new_text_line = 1; static char printk_buf[1024]; asmlinkage int vprintk(const char *fmt, va_list args) diff --git a/trunk/kernel/time/jiffies.c b/trunk/kernel/time/jiffies.c index 06f197560f3b..1ca99557e929 100644 --- a/trunk/kernel/time/jiffies.c +++ b/trunk/kernel/time/jiffies.c @@ -45,7 +45,7 @@ * * The value 8 is somewhat carefully chosen, as anything * larger can result in overflows. NSEC_PER_JIFFY grows as - * HZ shrinks, so values greater than 8 overflow 32bits when + * HZ shrinks, so values greater then 8 overflow 32bits when * HZ=100. */ #define JIFFIES_SHIFT 8 diff --git a/trunk/lib/radix-tree.c b/trunk/lib/radix-tree.c index 4bb42a0344ec..8d3fb0bd1288 100644 --- a/trunk/lib/radix-tree.c +++ b/trunk/lib/radix-tree.c @@ -640,14 +640,13 @@ EXPORT_SYMBOL(radix_tree_tag_get); * * Returns: the index of the hole if found, otherwise returns an index * outside of the set specified (in which case 'return - index >= max_scan' - * will be true). In rare cases of index wrap-around, 0 will be returned. + * will be true). * * radix_tree_next_hole may be called under rcu_read_lock. However, like - * radix_tree_gang_lookup, this will not atomically search a snapshot of - * the tree at a single point in time. For example, if a hole is created - * at index 5, then subsequently a hole is created at index 10, - * radix_tree_next_hole covering both indexes may return 10 if called - * under rcu_read_lock. + * radix_tree_gang_lookup, this will not atomically search a snapshot of the + * tree at a single point in time. For example, if a hole is created at index + * 5, then subsequently a hole is created at index 10, radix_tree_next_hole + * covering both indexes may return 10 if called under rcu_read_lock. */ unsigned long radix_tree_next_hole(struct radix_tree_root *root, unsigned long index, unsigned long max_scan) diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 6392ae5cc6b1..f0e2892fe403 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2254,7 +2254,7 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) * Add some empty padding so that we can catch * overwrites from earlier objects rather than let * tracking information or the free pointer be - * corrupted if a user writes before the start + * corrupted if an user writes before the start * of the object. */ size += sizeof(void *); diff --git a/trunk/net/sctp/auth.c b/trunk/net/sctp/auth.c index 20c576f530fa..52db5f60daa0 100644 --- a/trunk/net/sctp/auth.c +++ b/trunk/net/sctp/auth.c @@ -141,8 +141,8 @@ void sctp_auth_destroy_keys(struct list_head *keys) /* Compare two byte vectors as numbers. Return values * are: * 0 - vectors are equal - * < 0 - vector 1 is smaller than vector2 - * > 0 - vector 1 is greater than vector2 + * < 0 - vector 1 is smaller then vector2 + * > 0 - vector 1 is greater then vector2 * * Algorithm is: * This is performed by selecting the numerically smaller key vector... diff --git a/trunk/net/sctp/sm_statefuns.c b/trunk/net/sctp/sm_statefuns.c index 3a0cd075914f..1c4e5d6c29c0 100644 --- a/trunk/net/sctp/sm_statefuns.c +++ b/trunk/net/sctp/sm_statefuns.c @@ -4268,9 +4268,9 @@ static sctp_disposition_t sctp_sf_abort_violation( /* * Handle a protocol violation when the chunk length is invalid. - * "Invalid" length is identified as smaller than the minimal length a + * "Invalid" length is identified as smaller then the minimal length a * given chunk can be. For example, a SACK chunk has invalid length - * if its length is set to be smaller than the size of sctp_sack_chunk_t. + * if it's length is set to be smaller then the size of sctp_sack_chunk_t. * * We inform the other end by sending an ABORT with a Protocol Violation * error code. @@ -4300,7 +4300,7 @@ static sctp_disposition_t sctp_sf_violation_chunklen( /* * Handle a protocol violation when the parameter length is invalid. - * "Invalid" length is identified as smaller than the minimal length a + * "Invalid" length is identified as smaller then the minimal length a * given parameter can be. */ static sctp_disposition_t sctp_sf_violation_paramlen( diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index ff0a8f88de04..b14a8f33e42d 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -2717,7 +2717,7 @@ static int sctp_setsockopt_associnfo(struct sock *sk, char __user *optval, int o paths++; } - /* Only validate asocmaxrxt if we have more than + /* Only validate asocmaxrxt if we have more then * one path/transport. We do this because path * retransmissions are only counted when we have more * then one path. diff --git a/trunk/net/sctp/tsnmap.c b/trunk/net/sctp/tsnmap.c index 9bd64565021a..35c73e82553a 100644 --- a/trunk/net/sctp/tsnmap.c +++ b/trunk/net/sctp/tsnmap.c @@ -227,7 +227,7 @@ void sctp_tsnmap_skip(struct sctp_tsnmap *map, __u32 tsn) */ bitmap_zero(map->tsn_map, map->len); } else { - /* If the gap is smaller than the map size, + /* If the gap is smaller then the map size, * shift the map by 'gap' bits and update further. */ bitmap_shift_right(map->tsn_map, map->tsn_map, gap, map->len); diff --git a/trunk/sound/oss/aedsp16.c b/trunk/sound/oss/aedsp16.c index 3ee9900ffd7b..a0274f3dac08 100644 --- a/trunk/sound/oss/aedsp16.c +++ b/trunk/sound/oss/aedsp16.c @@ -157,7 +157,7 @@ Started Fri Mar 17 16:13:18 MET 1995 - v0.1 (ALPHA, was a user-level program called AudioExcelDSP16.c) + v0.1 (ALPHA, was an user-level program called AudioExcelDSP16.c) - Initial code. v0.2 (ALPHA) - Cleanups. diff --git a/trunk/sound/usb/usx2y/usbusx2y.c b/trunk/sound/usb/usx2y/usbusx2y.c index 11639bd72a51..ca26c532e77e 100644 --- a/trunk/sound/usb/usx2y/usbusx2y.c +++ b/trunk/sound/usb/usx2y/usbusx2y.c @@ -238,7 +238,7 @@ static void i_usX2Y_In04Int(struct urb *urb) send = 0; for (j = 0; j < URBS_AsyncSeq && !err; ++j) if (0 == usX2Y->AS04.urb[j]->status) { - struct us428_p4out *p4out = us428ctls->p4out + send; // FIXME if more than 1 p4out is new, 1 gets lost. + struct us428_p4out *p4out = us428ctls->p4out + send; // FIXME if more then 1 p4out is new, 1 gets lost. usb_fill_bulk_urb(usX2Y->AS04.urb[j], usX2Y->chip.dev, usb_sndbulkpipe(usX2Y->chip.dev, 0x04), &p4out->val.vol, p4out->type == eLT_Light ? sizeof(struct us428_lights) : 5,