From 0496594fc1a6e34a15e0e2669e965c930b5e7b35 Mon Sep 17 00:00:00 2001 From: Colin Tuckley Date: Mon, 10 Nov 2008 14:10:11 +0000 Subject: [PATCH] --- yaml --- r: 123631 b: refs/heads/master c: 68c3d93586223f7aeb04a815686b4d04146a2ada h: refs/heads/master i: 123629: 9884960c5976b58bced0cf1ca24385d3612223a3 123627: 49ab6142514c2176de732e60a3840c64728075fd 123623: e099152a71f880ecb6c8cdc47ba2739ed0cded7f 123615: f096afd10ffbc3847c081f2e6e915382a382bec7 v: v3 --- [refs] | 2 +- trunk/.mailmap | 2 - trunk/Documentation/00-INDEX | 48 +- trunk/Documentation/ABI/testing/sysfs-c2port | 88 - .../ABI/testing/sysfs-firmware-acpi | 16 +- trunk/Documentation/DocBook/Makefile | 4 +- trunk/Documentation/DocBook/deviceiobook.tmpl | 4 +- trunk/Documentation/DocBook/kernel-api.tmpl | 10 +- .../Documentation/DocBook/kernel-hacking.tmpl | 4 +- trunk/Documentation/DocBook/mcabook.tmpl | 4 +- trunk/Documentation/DocBook/wanbook.tmpl | 2 +- trunk/Documentation/DocBook/z8530book.tmpl | 2 +- trunk/Documentation/{PCI => }/MSI-HOWTO.txt | 0 trunk/Documentation/ManagementStyle | 2 +- trunk/Documentation/PCI/00-INDEX | 2 - .../{blockdev => }/README.DAC960 | 0 .../{serial => }/README.cycladesZ | 0 trunk/Documentation/accounting/.gitignore | 1 - trunk/Documentation/acpi/debug.txt | 148 -- trunk/Documentation/arm/empeg/README | 13 + trunk/Documentation/arm/empeg/ir.txt | 49 + trunk/Documentation/arm/empeg/mkdevs | 11 + trunk/Documentation/auxdisplay/.gitignore | 1 - trunk/Documentation/blockdev/00-INDEX | 16 - trunk/Documentation/c2port.txt | 90 - trunk/Documentation/{blockdev => }/cciss.txt | 3 - .../cgroups/freezer-subsystem.txt | 21 +- .../Documentation/{serial => }/computone.txt | 2 +- trunk/Documentation/connector/.gitignore | 1 - .../Documentation/{blockdev => }/cpqarray.txt | 0 trunk/Documentation/{serial => }/digiepca.txt | 0 trunk/Documentation/email-clients.txt | 25 - .../feature-removal-schedule.txt | 24 + trunk/Documentation/filesystems/Locking | 12 +- trunk/Documentation/filesystems/vfat.txt | 32 +- trunk/Documentation/filesystems/vfs.txt | 39 +- trunk/Documentation/filesystems/xip.txt | 9 +- trunk/Documentation/{blockdev => }/floppy.txt | 0 trunk/Documentation/ftrace.txt | 174 +- .../Documentation/{serial => }/hayes-esp.txt | 0 trunk/Documentation/hwmon/adt7462 | 67 - trunk/Documentation/hwmon/lis3lv02d | 49 - trunk/Documentation/i2c/busses/i2c-sis96x | 2 +- trunk/Documentation/ia64/.gitignore | 1 - trunk/Documentation/ics932s401 | 31 - trunk/Documentation/input/elantech.txt | 405 ---- trunk/Documentation/io-mapping.txt | 82 - .../{ioctl => }/ioctl-number.txt | 0 trunk/Documentation/ioctl/00-INDEX | 10 - trunk/Documentation/isdn/CREDITS | 2 +- trunk/Documentation/ja_JP/HOWTO | 14 +- trunk/Documentation/kernel-parameters.txt | 144 +- trunk/Documentation/lguest/Makefile | 2 +- trunk/Documentation/lguest/lguest.c | 4 +- trunk/Documentation/{serial => }/moxa-smartio | 0 trunk/Documentation/{blockdev => }/nbd.txt | 0 trunk/Documentation/networking/.gitignore | 1 - trunk/Documentation/networking/dmfe.txt | 2 +- trunk/Documentation/networking/phy.txt | 2 +- trunk/Documentation/{blockdev => }/paride.txt | 0 trunk/Documentation/pcmcia/.gitignore | 1 - .../powerpc/booting-without-of.txt | 65 +- trunk/Documentation/printk-formats.txt | 35 - .../Documentation/{blockdev => }/ramdisk.txt | 0 trunk/Documentation/{serial => }/riscom8.txt | 0 trunk/Documentation/{serial => }/rocket.txt | 0 trunk/Documentation/scheduler/00-INDEX | 2 + .../scheduler/sched-design-CFS.txt | 2 +- trunk/Documentation/scsi/aacraid.txt | 2 +- trunk/Documentation/serial/00-INDEX | 24 - trunk/Documentation/sh/new-machine.txt | 4 +- .../Documentation/{serial => }/specialix.txt | 0 trunk/Documentation/spi/.gitignore | 2 - trunk/Documentation/stable_kernel_rules.txt | 1 - trunk/Documentation/{serial => }/stallion.txt | 0 trunk/Documentation/{serial => }/sx.txt | 0 trunk/Documentation/sysctl/kernel.txt | 24 +- trunk/Documentation/{serial => }/tty.txt | 0 trunk/Documentation/video4linux/.gitignore | 1 - trunk/Documentation/video4linux/README.cx88 | 4 +- .../video4linux/bttv/CONTRIBUTORS | 2 +- trunk/Documentation/video4linux/si470x.txt | 118 - trunk/Documentation/vm/.gitignore | 1 - trunk/Documentation/w1/masters/omap-hdq | 46 - trunk/Documentation/watchdog/src/.gitignore | 2 - .../Documentation/x86/x86_64/boot-options.txt | 4 +- .../x86/x86_64/fake-numa-for-cpusets | 2 +- trunk/MAINTAINERS | 90 +- trunk/Makefile | 12 +- trunk/arch/Kconfig | 2 +- trunk/arch/arm/Kconfig | 44 +- trunk/arch/arm/Makefile | 1 + trunk/arch/arm/boot/compressed/Makefile | 6 +- .../arch/arm/boot/compressed/head-clps7500.S | 86 + trunk/arch/arm/boot/compressed/head.S | 14 +- trunk/arch/arm/boot/compressed/misc.c | 2 - trunk/arch/arm/common/Kconfig | 3 - trunk/arch/arm/common/Makefile | 1 - trunk/arch/arm/common/clkdev.c | 128 -- trunk/arch/arm/common/sharpsl_pm.c | 19 +- trunk/arch/arm/configs/neocore926_defconfig | 1302 ----------- trunk/arch/arm/include/asm/cacheflush.h | 37 +- trunk/arch/arm/include/asm/clkdev.h | 30 - trunk/arch/arm/include/asm/dma-mapping.h | 13 +- trunk/arch/arm/include/asm/dma.h | 24 +- trunk/arch/arm/include/asm/ftrace.h | 2 +- trunk/arch/arm/include/asm/hardware/iomd.h | 41 + .../arm/include/asm/hardware/iop3xx-adma.h | 5 +- .../arch/arm/include/asm/hardware/iop_adma.h | 6 - trunk/arch/arm/include/asm/hwcap.h | 1 - trunk/arch/arm/include/asm/io.h | 8 - trunk/arch/arm/include/asm/irq.h | 4 + trunk/arch/arm/include/asm/mach/map.h | 13 +- trunk/arch/arm/include/asm/memory.h | 19 +- trunk/arch/arm/include/asm/mmu_context.h | 1 - trunk/arch/arm/include/asm/page.h | 32 +- trunk/arch/arm/include/asm/processor.h | 2 +- trunk/arch/arm/include/asm/setup.h | 6 +- trunk/arch/arm/include/asm/string.h | 9 + trunk/arch/arm/include/asm/system.h | 6 +- trunk/arch/arm/include/asm/uaccess.h | 5 +- trunk/arch/arm/kernel/armksyms.c | 3 +- trunk/arch/arm/kernel/elf.c | 6 +- trunk/arch/arm/kernel/entry-common.S | 4 +- trunk/arch/arm/kernel/ftrace.c | 13 + trunk/arch/arm/kernel/head-common.S | 2 +- trunk/arch/arm/kernel/module.c | 10 +- trunk/arch/arm/kernel/setup.c | 57 +- trunk/arch/arm/kernel/thumbee.c | 2 +- trunk/arch/arm/kernel/vmlinux.lds.S | 2 +- trunk/arch/arm/lib/Makefile | 1 + trunk/arch/arm/lib/memset.S | 2 +- trunk/arch/arm/mach-aaec2000/Makefile | 2 +- trunk/arch/arm/mach-aaec2000/clock.c | 99 + trunk/arch/arm/mach-aaec2000/clock.h | 23 + trunk/arch/arm/mach-aaec2000/core.c | 29 +- .../arch/arm/mach-aaec2000/include/mach/dma.h | 9 + .../arch/arm/mach-aaec2000/include/mach/io.h | 6 +- .../arm/mach-aaec2000/include/mach/memory.h | 3 + trunk/arch/arm/mach-at91/Kconfig | 15 +- trunk/arch/arm/mach-at91/Makefile | 13 +- trunk/arch/arm/mach-at91/at91cap9.c | 8 - trunk/arch/arm/mach-at91/at91cap9_devices.c | 36 +- .../arch/arm/mach-at91/at91sam9260_devices.c | 38 +- .../arch/arm/mach-at91/at91sam9261_devices.c | 17 +- .../arch/arm/mach-at91/at91sam9263_devices.c | 17 +- trunk/arch/arm/mach-at91/at91sam9rl_devices.c | 11 + trunk/arch/arm/mach-at91/board-afeb-9260v1.c | 1 - trunk/arch/arm/mach-at91/board-cam60.c | 30 +- trunk/arch/arm/mach-at91/board-cap9adk.c | 77 +- trunk/arch/arm/mach-at91/board-neocore926.c | 397 ---- trunk/arch/arm/mach-at91/board-qil-a9260.c | 35 +- trunk/arch/arm/mach-at91/board-sam9-l9260.c | 35 +- trunk/arch/arm/mach-at91/board-sam9260ek.c | 37 +- trunk/arch/arm/mach-at91/board-sam9261ek.c | 80 +- trunk/arch/arm/mach-at91/board-sam9263ek.c | 36 +- trunk/arch/arm/mach-at91/board-sam9g20ek.c | 36 +- trunk/arch/arm/mach-at91/board-sam9rlek.c | 32 +- trunk/arch/arm/mach-at91/board-usb-a9260.c | 35 +- trunk/arch/arm/mach-at91/board-usb-a9263.c | 36 +- .../arm/mach-at91/include/mach/at91_pmc.h | 7 - .../arm/mach-at91/include/mach/at91cap9.h | 4 +- trunk/arch/arm/mach-at91/include/mach/cpu.h | 15 - trunk/arch/arm/mach-at91/include/mach/dma.h | 19 + trunk/arch/arm/mach-at91/include/mach/gpio.h | 2 - trunk/arch/arm/mach-at91/include/mach/io.h | 4 +- .../arch/arm/mach-at91/include/mach/memory.h | 11 + trunk/arch/arm/mach-at91/sam9_smc.c | 47 - trunk/arch/arm/mach-at91/sam9_smc.h | 33 - .../arch/arm/mach-clps711x/include/mach/dma.h | 19 + .../arm/mach-clps711x/include/mach/hardware.h | 22 + .../arch/arm/mach-clps711x/include/mach/io.h | 6 +- .../arm/mach-clps711x/include/mach/memory.h | 20 +- trunk/arch/arm/mach-clps7500/Makefile | 11 + trunk/arch/arm/mach-clps7500/Makefile.boot | 2 + trunk/arch/arm/mach-clps7500/core.c | 395 ++++ .../arm/mach-clps7500/include/mach/acornfb.h | 33 + .../mach-clps7500/include/mach/debug-macro.S | 21 + .../arch/arm/mach-clps7500/include/mach/dma.h | 21 + .../mach-clps7500/include/mach/entry-macro.S | 16 + .../arm/mach-clps7500/include/mach/hardware.h | 67 + .../arch/arm/mach-clps7500/include/mach/io.h | 255 +++ .../arch/arm/mach-clps7500/include/mach/irq.h | 32 + .../arm/mach-clps7500/include/mach/irqs.h | 66 + .../arm/mach-clps7500/include/mach/memory.h | 43 + .../arm/mach-clps7500/include/mach/system.h | 23 + .../arm/mach-clps7500/include/mach/timex.h | 13 + .../mach-clps7500/include/mach/uncompress.h | 35 + .../arm/mach-clps7500/include/mach/vmalloc.h | 4 + .../arch/arm/mach-davinci/include/mach/dma.h | 16 + trunk/arch/arm/mach-davinci/include/mach/io.h | 3 +- .../arm/mach-davinci/include/mach/memory.h | 7 +- .../arm/mach-davinci/include/mach/vmalloc.h | 1 + .../arch/arm/mach-ebsa110/include/mach/dma.h | 11 + .../arm/mach-ebsa110/include/mach/memory.h | 7 + trunk/arch/arm/mach-ep93xx/Kconfig | 6 - trunk/arch/arm/mach-ep93xx/Makefile | 1 - trunk/arch/arm/mach-ep93xx/clock.c | 68 +- trunk/arch/arm/mach-ep93xx/core.c | 46 +- trunk/arch/arm/mach-ep93xx/edb9307a.c | 67 - .../arm/mach-ep93xx/include/mach/clkdev.h | 7 - trunk/arch/arm/mach-ep93xx/include/mach/dma.h | 3 + .../arch/arm/mach-ep93xx/include/mach/gpio.h | 2 - trunk/arch/arm/mach-ep93xx/include/mach/io.h | 4 +- .../arm/mach-ep93xx/include/mach/memory.h | 4 + .../arm/mach-ep93xx/include/mach/platform.h | 1 - .../include/mach/{isa-dma.h => dma.h} | 2 +- .../mach-footbridge/include/mach/hardware.h | 5 + .../arm/mach-footbridge/include/mach/io.h | 3 +- .../arm/mach-footbridge/include/mach/memory.h | 9 - .../arch/arm/mach-h720x/include/mach/boards.h | 6 +- .../include/mach/{isa-dma.h => dma.h} | 9 +- trunk/arch/arm/mach-h720x/include/mach/io.h | 4 +- .../arch/arm/mach-h720x/include/mach/memory.h | 20 +- trunk/arch/arm/mach-imx/dma.c | 7 +- trunk/arch/arm/mach-imx/include/mach/gpio.h | 3 - .../arch/arm/mach-imx/include/mach/imx-dma.h | 12 +- trunk/arch/arm/mach-imx/include/mach/io.h | 4 +- trunk/arch/arm/mach-imx/include/mach/memory.h | 10 + trunk/arch/arm/mach-integrator/clock.c | 80 +- trunk/arch/arm/mach-integrator/clock.h | 25 + trunk/arch/arm/mach-integrator/core.c | 35 - trunk/arch/arm/mach-integrator/impd1.c | 26 +- .../arm/mach-integrator/include/mach/clkdev.h | 25 - .../arm/mach-integrator/include/mach/dma.h | 19 + .../arm/mach-integrator/include/mach/memory.h | 13 +- .../mach-integrator/include/mach/platform.h | 19 +- .../arch/arm/mach-integrator/integrator_cp.c | 18 +- .../arch/arm/mach-iop13xx/include/mach/adma.h | 3 +- .../arch/arm/mach-iop13xx/include/mach/dma.h | 3 + .../arm/mach-iop13xx/include/mach/memory.h | 16 +- .../arm/mach-iop13xx/include/mach/timex.h | 2 + trunk/arch/arm/mach-iop32x/include/mach/dma.h | 9 + trunk/arch/arm/mach-iop32x/include/mach/io.h | 2 +- .../arm/mach-iop32x/include/mach/memory.h | 13 + .../arm/mach-iop32x/include/mach/system.h | 3 +- .../arch/arm/mach-iop32x/include/mach/timex.h | 3 + trunk/arch/arm/mach-iop33x/include/mach/dma.h | 9 + trunk/arch/arm/mach-iop33x/include/mach/io.h | 2 +- .../arm/mach-iop33x/include/mach/memory.h | 13 + .../arch/arm/mach-iop33x/include/mach/timex.h | 3 + .../arch/arm/mach-ixp2000/include/mach/dma.h | 9 + .../arm/mach-ixp2000/include/mach/memory.h | 7 + .../arch/arm/mach-ixp23xx/include/mach/dma.h | 3 + trunk/arch/arm/mach-ixp23xx/include/mach/io.h | 2 + .../arm/mach-ixp23xx/include/mach/memory.h | 13 + trunk/arch/arm/mach-ixp4xx/include/mach/dma.h | 21 + .../arch/arm/mach-ixp4xx/include/mach/gpio.h | 3 - trunk/arch/arm/mach-ixp4xx/include/mach/io.h | 4 +- .../arm/mach-ixp4xx/include/mach/memory.h | 13 +- .../arch/arm/mach-kirkwood/include/mach/dma.h | 1 + .../arm/mach-kirkwood/include/mach/memory.h | 4 + trunk/arch/arm/mach-ks8695/include/mach/dma.h | 17 + .../arch/arm/mach-ks8695/include/mach/gpio.h | 3 - trunk/arch/arm/mach-ks8695/include/mach/io.h | 4 +- .../arm/mach-ks8695/include/mach/memory.h | 5 + trunk/arch/arm/mach-l7200/include/mach/dma.h | 23 + trunk/arch/arm/mach-l7200/include/mach/io.h | 10 +- .../arch/arm/mach-l7200/include/mach/memory.h | 3 + trunk/arch/arm/mach-lh7a40x/clocks.c | 92 +- trunk/arch/arm/mach-lh7a40x/include/mach/io.h | 6 +- .../arm/mach-lh7a40x/include/mach/memory.h | 10 + trunk/arch/arm/mach-loki/include/mach/dma.h | 1 + .../arch/arm/mach-loki/include/mach/memory.h | 4 + trunk/arch/arm/mach-msm/include/mach/io.h | 6 +- trunk/arch/arm/mach-msm/include/mach/memory.h | 4 + .../arch/arm/mach-mv78xx0/include/mach/dma.h | 1 + .../arm/mach-mv78xx0/include/mach/memory.h | 4 + trunk/arch/arm/mach-mx3/mx31ads.c | 2 - trunk/arch/arm/mach-mx3/pcm037.c | 4 +- trunk/arch/arm/mach-netx/fb.c | 7 +- trunk/arch/arm/mach-netx/include/mach/dma.h | 21 + trunk/arch/arm/mach-netx/include/mach/io.h | 2 +- .../arch/arm/mach-netx/include/mach/memory.h | 10 + trunk/arch/arm/mach-ns9xxx/gpio.c | 2 - trunk/arch/arm/mach-ns9xxx/include/mach/dma.h | 14 + .../arm/mach-ns9xxx/include/mach/hardware.h | 2 + trunk/arch/arm/mach-ns9xxx/include/mach/io.h | 2 +- .../arm/mach-ns9xxx/include/mach/memory.h | 3 + trunk/arch/arm/mach-omap1/Kconfig | 3 - trunk/arch/arm/mach-omap2/gpmc.c | 6 +- trunk/arch/arm/mach-orion5x/gpio.c | 2 - .../arch/arm/mach-orion5x/include/mach/dma.h | 1 + trunk/arch/arm/mach-orion5x/include/mach/io.h | 7 +- .../arm/mach-orion5x/include/mach/memory.h | 4 + trunk/arch/arm/mach-pnx4008/dma.c | 3 +- .../arch/arm/mach-pnx4008/include/mach/dma.h | 2 + trunk/arch/arm/mach-pnx4008/include/mach/io.h | 4 +- .../arm/mach-pnx4008/include/mach/memory.h | 5 +- trunk/arch/arm/mach-pxa/Kconfig | 3 - trunk/arch/arm/mach-pxa/clock.c | 66 +- trunk/arch/arm/mach-pxa/clock.h | 59 +- trunk/arch/arm/mach-pxa/corgi_pm.c | 4 +- trunk/arch/arm/mach-pxa/dma.c | 2 +- trunk/arch/arm/mach-pxa/ezx.c | 1 - trunk/arch/arm/mach-pxa/include/mach/clkdev.h | 7 - trunk/arch/arm/mach-pxa/include/mach/io.h | 6 +- trunk/arch/arm/mach-pxa/include/mach/memory.h | 11 +- trunk/arch/arm/mach-pxa/include/mach/pxafb.h | 1 - .../arch/arm/mach-pxa/include/mach/sharpsl.h | 1 - trunk/arch/arm/mach-pxa/mioa701.c | 2 +- trunk/arch/arm/mach-pxa/mioa701_bootresume.S | 1 - trunk/arch/arm/mach-pxa/pwm.c | 2 +- trunk/arch/arm/mach-pxa/pxa25x.c | 71 +- trunk/arch/arm/mach-pxa/pxa27x.c | 89 +- trunk/arch/arm/mach-pxa/pxa300.c | 18 +- trunk/arch/arm/mach-pxa/pxa320.c | 8 +- trunk/arch/arm/mach-pxa/pxa3xx.c | 87 +- trunk/arch/arm/mach-pxa/reset.c | 7 +- trunk/arch/arm/mach-pxa/smemc.c | 2 - trunk/arch/arm/mach-pxa/spitz.c | 16 +- trunk/arch/arm/mach-pxa/spitz_pm.c | 4 +- trunk/arch/arm/mach-pxa/ssp.c | 2 +- trunk/arch/arm/mach-pxa/time.c | 1 - trunk/arch/arm/mach-realview/Kconfig | 2 - trunk/arch/arm/mach-realview/clock.c | 80 +- trunk/arch/arm/mach-realview/clock.h | 6 + trunk/arch/arm/mach-realview/core.c | 60 +- trunk/arch/arm/mach-realview/core.h | 1 + .../arm/mach-realview/include/mach/clkdev.h | 7 - .../arch/arm/mach-realview/include/mach/dma.h | 20 + .../arch/arm/mach-realview/include/mach/io.h | 9 +- .../arm/mach-realview/include/mach/memory.h | 10 + .../arm/mach-realview/include/mach/platform.h | 19 +- trunk/arch/arm/mach-realview/realview_eb.c | 2 + .../arch/arm/mach-realview/realview_pb1176.c | 2 + .../arch/arm/mach-realview/realview_pb11mp.c | 2 + .../include/mach/{isa-dma.h => dma.h} | 8 +- trunk/arch/arm/mach-rpc/include/mach/io.h | 47 +- trunk/arch/arm/mach-rpc/include/mach/irqs.h | 1 - trunk/arch/arm/mach-rpc/include/mach/memory.h | 7 + .../arm/mach-s3c2400/include/mach/memory.h | 3 + trunk/arch/arm/mach-s3c2410/Kconfig | 1 - trunk/arch/arm/mach-s3c2410/dma.c | 5 +- .../arch/arm/mach-s3c2410/include/mach/dma.h | 23 +- .../arm/mach-s3c2410/include/mach/memory.h | 3 + .../mach-s3c2410/include/mach/system-reset.h | 2 +- trunk/arch/arm/mach-s3c2410/mach-bast.c | 4 +- trunk/arch/arm/mach-s3c2410/mach-h1940.c | 2 +- trunk/arch/arm/mach-s3c2410/mach-n30.c | 4 +- trunk/arch/arm/mach-s3c2410/mach-qt2410.c | 4 +- trunk/arch/arm/mach-s3c2412/Kconfig | 1 - trunk/arch/arm/mach-s3c2412/dma.c | 5 +- trunk/arch/arm/mach-s3c2412/mach-jive.c | 6 +- trunk/arch/arm/mach-s3c2412/mach-smdk2413.c | 2 +- trunk/arch/arm/mach-s3c2412/mach-vstms.c | 2 +- trunk/arch/arm/mach-s3c2412/s3c2412.c | 2 +- trunk/arch/arm/mach-s3c2440/Kconfig | 1 - trunk/arch/arm/mach-s3c2440/dma.c | 5 +- trunk/arch/arm/mach-s3c2440/mach-anubis.c | 2 +- trunk/arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- trunk/arch/arm/mach-s3c2440/mach-osiris.c | 2 +- trunk/arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- trunk/arch/arm/mach-s3c2442/Kconfig | 1 - trunk/arch/arm/mach-s3c2443/dma.c | 5 +- trunk/arch/arm/mach-sa1100/clock.c | 100 +- trunk/arch/arm/mach-sa1100/collie.c | 29 +- trunk/arch/arm/mach-sa1100/collie_pm.c | 22 +- trunk/arch/arm/mach-sa1100/cpu-sa1100.c | 20 +- trunk/arch/arm/mach-sa1100/cpu-sa1110.c | 18 +- trunk/arch/arm/mach-sa1100/dma.c | 10 +- .../arch/arm/mach-sa1100/include/mach/h3600.h | 12 +- trunk/arch/arm/mach-sa1100/include/mach/io.h | 8 +- .../arm/mach-sa1100/include/mach/memory.h | 13 +- trunk/arch/arm/mach-sa1100/pleb.c | 10 +- trunk/arch/arm/mach-sa1100/shannon.c | 2 +- trunk/arch/arm/mach-sa1100/sleep.S | 52 +- trunk/arch/arm/mach-sa1100/time.c | 4 +- trunk/arch/arm/mach-shark/core.c | 2 - .../include/mach/{isa-dma.h => dma.h} | 3 +- .../arm/mach-shark/include/mach/hardware.h | 2 + trunk/arch/arm/mach-shark/include/mach/io.h | 44 +- .../arch/arm/mach-shark/include/mach/memory.h | 4 +- trunk/arch/arm/mach-versatile/Kconfig | 2 - trunk/arch/arm/mach-versatile/clock.c | 80 +- trunk/arch/arm/mach-versatile/clock.h | 7 +- trunk/arch/arm/mach-versatile/core.c | 56 +- .../arm/mach-versatile/include/mach/clkdev.h | 7 - .../arm/mach-versatile/include/mach/dma.h | 20 + .../arch/arm/mach-versatile/include/mach/io.h | 8 +- .../arm/mach-versatile/include/mach/irqs.h | 86 + .../arm/mach-versatile/include/mach/memory.h | 10 + .../mach-versatile/include/mach/platform.h | 76 +- trunk/arch/arm/mm/Kconfig | 65 +- trunk/arch/arm/mm/alignment.c | 1 - trunk/arch/arm/mm/cache-feroceon-l2.c | 4 +- trunk/arch/arm/mm/cache-v3.S | 1 + trunk/arch/arm/mm/cache-v4.S | 1 + trunk/arch/arm/mm/cache-v4wt.S | 1 + trunk/arch/arm/mm/cache-v7.S | 2 - trunk/arch/arm/mm/cache-xsc3l2.c | 4 +- trunk/arch/arm/mm/copypage-feroceon.S | 95 + trunk/arch/arm/mm/copypage-feroceon.c | 111 - trunk/arch/arm/mm/copypage-v3.S | 67 + trunk/arch/arm/mm/copypage-v3.c | 81 - trunk/arch/arm/mm/copypage-v4mc.c | 53 +- trunk/arch/arm/mm/copypage-v4wb.S | 79 + trunk/arch/arm/mm/copypage-v4wb.c | 94 - trunk/arch/arm/mm/copypage-v4wt.S | 73 + trunk/arch/arm/mm/copypage-v4wt.c | 88 - trunk/arch/arm/mm/copypage-v6.c | 84 +- trunk/arch/arm/mm/copypage-xsc3.S | 97 + trunk/arch/arm/mm/copypage-xsc3.c | 113 - trunk/arch/arm/mm/copypage-xscale.c | 47 +- trunk/arch/arm/mm/fault.c | 6 +- trunk/arch/arm/mm/init.c | 60 +- trunk/arch/arm/mm/mm.h | 4 +- trunk/arch/arm/mm/mmu.c | 242 +- trunk/arch/arm/mm/nommu.c | 23 +- trunk/arch/arm/mm/pgd.c | 2 +- trunk/arch/arm/mm/proc-syms.c | 4 +- trunk/arch/arm/mm/proc-v6.S | 2 - trunk/arch/arm/mm/proc-v7.S | 31 +- trunk/arch/arm/mm/proc-xsc3.S | 2 +- trunk/arch/arm/plat-iop/setup.c | 5 +- trunk/arch/arm/plat-mxc/Kconfig | 2 - trunk/arch/arm/plat-mxc/dma-mx1-mx2.c | 2 +- trunk/arch/arm/plat-mxc/gpio.c | 2 +- .../arm/plat-mxc/include/mach/dma-mx1-mx2.h | 2 +- trunk/arch/arm/plat-mxc/include/mach/dma.h | 14 + trunk/arch/arm/plat-mxc/include/mach/io.h | 24 +- trunk/arch/arm/plat-mxc/include/mach/memory.h | 13 + trunk/arch/arm/plat-omap/Kconfig | 2 - trunk/arch/arm/plat-omap/clock.c | 20 +- trunk/arch/arm/plat-omap/dma.c | 2 +- trunk/arch/arm/plat-omap/gpio.c | 5 +- .../arm/plat-omap/include/mach/entry-macro.S | 4 +- trunk/arch/arm/plat-omap/include/mach/io.h | 6 +- trunk/arch/arm/plat-omap/include/mach/irqs.h | 2 +- .../arch/arm/plat-omap/include/mach/memory.h | 17 +- trunk/arch/arm/plat-omap/include/mach/pm.h | 2 +- .../arm/plat-s3c/include/plat/uncompress.h | 2 +- trunk/arch/arm/plat-s3c24xx/common-smdk.c | 2 +- trunk/arch/arm/plat-s3c24xx/devs.c | 4 +- trunk/arch/arm/plat-s3c24xx/dma.c | 17 +- trunk/arch/arm/tools/mach-types | 101 +- trunk/arch/arm/vfp/vfphw.S | 27 +- trunk/arch/arm/vfp/vfpmodule.c | 9 - trunk/arch/blackfin/include/asm/bfin-global.h | 2 +- trunk/arch/blackfin/include/asm/dma-mapping.h | 6 +- trunk/arch/blackfin/kernel/bfin_gpio.c | 2 +- .../blackfin/kernel/cplb-nompu/cplbinit.c | 9 +- trunk/arch/blackfin/kernel/process.c | 7 +- trunk/arch/blackfin/kernel/setup.c | 12 +- trunk/arch/blackfin/kernel/traps.c | 11 +- trunk/arch/blackfin/mach-common/cache.S | 8 +- trunk/arch/blackfin/mach-common/cpufreq.c | 14 +- trunk/arch/blackfin/mach-common/entry.S | 2 +- trunk/arch/blackfin/mm/sram-alloc.c | 8 +- trunk/arch/cris/Makefile | 87 +- trunk/arch/cris/arch-v10/boot/.gitignore | 2 - .../arch/cris/arch-v10/boot/compressed/head.S | 2 +- .../arch/cris/arch-v10/boot/compressed/misc.c | 2 +- trunk/arch/cris/arch-v10/boot/rescue/head.S | 2 +- .../cris/arch-v10/boot/rescue/kimagerescue.S | 2 +- .../cris/arch-v10/boot/rescue/testrescue.S | 2 +- .../arch/cris/arch-v10/drivers/axisflashmap.c | 2 +- trunk/arch/cris/arch-v10/drivers/ds1302.c | 4 +- trunk/arch/cris/arch-v10/drivers/gpio.c | 4 +- trunk/arch/cris/arch-v10/drivers/i2c.c | 4 +- .../arch/cris/arch-v10/drivers/sync_serial.c | 4 +- trunk/arch/cris/arch-v10/kernel/asm-offsets.c | 47 + trunk/arch/cris/arch-v10/kernel/crisksyms.c | 2 +- trunk/arch/cris/arch-v10/kernel/debugport.c | 2 +- trunk/arch/cris/arch-v10/kernel/dma.c | 2 +- trunk/arch/cris/arch-v10/kernel/entry.S | 2 +- trunk/arch/cris/arch-v10/kernel/fasttimer.c | 2 +- trunk/arch/cris/arch-v10/kernel/head.S | 2 +- .../cris/arch-v10/kernel/io_interface_mux.c | 4 +- trunk/arch/cris/arch-v10/kernel/kgdb.c | 2 +- trunk/arch/cris/arch-v10/kernel/process.c | 2 +- trunk/arch/cris/arch-v10/kernel/time.c | 2 +- trunk/arch/cris/arch-v10/kernel/traps.c | 2 +- trunk/arch/cris/arch-v10/mm/fault.c | 2 +- trunk/arch/cris/arch-v10/mm/init.c | 2 +- trunk/arch/cris/arch-v10/mm/tlb.c | 2 +- trunk/arch/cris/arch-v10/vmlinux.lds.S | 118 + .../arch/cris/arch-v32/boot/compressed/head.S | 20 +- .../arch/cris/arch-v32/drivers/mach-a3/gpio.c | 2 +- .../cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- .../cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- trunk/arch/cris/arch-v32/drivers/pci/bios.c | 2 +- .../cris/{ => arch-v32}/kernel/asm-offsets.c | 51 +- trunk/arch/cris/arch-v32/kernel/cache.c | 4 +- trunk/arch/cris/arch-v32/kernel/crisksyms.c | 8 +- trunk/arch/cris/arch-v32/kernel/debugport.c | 2 +- trunk/arch/cris/arch-v32/kernel/entry.S | 4 +- trunk/arch/cris/arch-v32/kernel/head.S | 22 +- trunk/arch/cris/arch-v32/kernel/kgdb.c | 8 +- trunk/arch/cris/arch-v32/kernel/kgdb_asm.S | 2 +- trunk/arch/cris/arch-v32/kernel/pinmux.c | 8 +- trunk/arch/cris/arch-v32/kernel/ptrace.c | 2 +- trunk/arch/cris/arch-v32/kernel/signal.c | 4 +- trunk/arch/cris/arch-v32/lib/nand_init.S | 10 +- trunk/arch/cris/arch-v32/mach-a3/dma.c | 2 +- trunk/arch/cris/arch-v32/mach-a3/io.c | 2 +- trunk/arch/cris/arch-v32/mach-fs/cpufreq.c | 6 +- trunk/arch/cris/arch-v32/mach-fs/dma.c | 2 +- trunk/arch/cris/arch-v32/mach-fs/io.c | 4 +- trunk/arch/cris/arch-v32/mach-fs/vcs_hook.c | 4 +- trunk/arch/cris/arch-v32/mm/init.c | 4 +- trunk/arch/cris/arch-v32/mm/tlb.c | 4 +- .../cris/{kernel => arch-v32}/vmlinux.lds.S | 44 +- trunk/arch/cris/include/asm/spinlock.h | 1 - trunk/arch/cris/mm/ioremap.c | 2 +- trunk/arch/ia64/Kconfig | 19 +- trunk/arch/ia64/hp/common/hwsw_iommu.c | 9 +- trunk/arch/ia64/include/asm/intrinsics.h | 2 +- trunk/arch/ia64/include/asm/io.h | 24 + trunk/arch/ia64/include/asm/iommu.h | 1 + trunk/arch/ia64/include/asm/kvm_host.h | 6 +- trunk/arch/ia64/include/asm/machvec.h | 22 +- trunk/arch/ia64/include/asm/meminit.h | 1 + trunk/arch/ia64/include/asm/paravirt_privop.h | 13 - trunk/arch/ia64/include/asm/sal.h | 15 +- trunk/arch/ia64/include/asm/sn/sn_sal.h | 45 - trunk/arch/ia64/kernel/acpi.c | 29 +- trunk/arch/ia64/kernel/entry.S | 1 - trunk/arch/ia64/kernel/head.S | 2 +- trunk/arch/ia64/kernel/mca.c | 2 +- trunk/arch/ia64/kernel/paravirt.c | 2 +- trunk/arch/ia64/kernel/pci-dma.c | 10 + trunk/arch/ia64/kernel/perfmon.c | 5 + trunk/arch/ia64/kernel/setup.c | 9 +- trunk/arch/ia64/kvm/Kconfig | 2 - trunk/arch/ia64/kvm/Makefile | 8 +- trunk/arch/ia64/kvm/kvm-ia64.c | 92 +- trunk/arch/ia64/kvm/kvm_fw.c | 9 +- trunk/arch/ia64/kvm/process.c | 2 +- trunk/arch/ia64/kvm/vcpu.h | 5 - trunk/arch/ia64/mm/discontig.c | 1 + trunk/arch/ia64/uv/kernel/setup.c | 6 - trunk/arch/ia64/xen/hypercall.S | 2 +- trunk/arch/m68k/kernel/ints.c | 2 +- trunk/arch/mips/Kconfig | 67 +- trunk/arch/mips/Makefile | 23 +- trunk/arch/mips/alchemy/common/platform.c | 98 +- trunk/arch/mips/alchemy/pb1200/platform.c | 81 - trunk/arch/mips/configs/ip22_defconfig | 1 + trunk/arch/mips/configs/ip27_defconfig | 1 + trunk/arch/mips/configs/ip28_defconfig | 2 + .../mips/configs/pnx8335-stb225_defconfig | 1149 ---------- trunk/arch/mips/emma/Kconfig | 29 - trunk/arch/mips/emma/markeins/irq.c | 331 --- .../mips/{emma => emma2rh}/common/Makefile | 2 +- trunk/arch/mips/emma2rh/common/irq.c | 105 + trunk/arch/mips/emma2rh/common/irq_emma2rh.c | 106 + .../arch/mips/{emma => emma2rh}/common/prom.c | 6 +- .../mips/{emma => emma2rh}/markeins/Makefile | 2 +- trunk/arch/mips/emma2rh/markeins/irq.c | 132 ++ .../arch/mips/emma2rh/markeins/irq_markeins.c | 158 ++ .../mips/{emma => emma2rh}/markeins/led.c | 2 +- .../{emma => emma2rh}/markeins/platform.c | 2 +- .../mips/{emma => emma2rh}/markeins/setup.c | 2 +- trunk/arch/mips/include/asm/bitops.h | 114 +- trunk/arch/mips/include/asm/break.h | 1 - trunk/arch/mips/include/asm/byteorder.h | 40 +- trunk/arch/mips/include/asm/cpu-features.h | 2 - trunk/arch/mips/include/asm/ds1286.h | 15 + .../include/asm/{emma => emma2rh}/emma2rh.h | 15 +- .../include/asm/{emma => emma2rh}/markeins.h | 0 trunk/arch/mips/include/asm/fpu_emulator.h | 17 - trunk/arch/mips/include/asm/m48t35.h | 27 + trunk/arch/mips/include/asm/mach-lemote/pci.h | 30 - .../arch/mips/include/asm/mach-pnx833x/gpio.h | 172 -- .../include/asm/mach-pnx833x/irq-mapping.h | 126 -- .../arch/mips/include/asm/mach-pnx833x/irq.h | 53 - .../mips/include/asm/mach-pnx833x/pnx833x.h | 202 -- .../arch/mips/include/asm/mach-pnx833x/war.h | 25 - .../arch/mips/include/asm/mach-rc32434/gpio.h | 2 - trunk/arch/mips/include/asm/mach-rc32434/rb.h | 14 +- .../include/asm/mach-tx49xx/mangle-port.h | 26 - trunk/arch/mips/include/asm/mipsregs.h | 1 - trunk/arch/mips/include/asm/module.h | 2 - trunk/arch/mips/include/asm/ptrace.h | 17 +- trunk/arch/mips/include/asm/time.h | 2 +- trunk/arch/mips/include/asm/txx9/generic.h | 5 - trunk/arch/mips/kernel/Makefile | 1 - trunk/arch/mips/kernel/cpu-probe.c | 247 +- trunk/arch/mips/kernel/csrc-r4k.c | 2 +- trunk/arch/mips/kernel/scall32-o32.S | 4 +- trunk/arch/mips/kernel/scall64-64.S | 2 +- trunk/arch/mips/kernel/setup.c | 4 +- trunk/arch/mips/kernel/smp.c | 12 +- trunk/arch/mips/kernel/traps.c | 29 +- trunk/arch/mips/kernel/unaligned.c | 20 +- trunk/arch/mips/lemote/lm2e/pci.c | 13 +- trunk/arch/mips/lemote/lm2e/setup.c | 11 +- trunk/arch/mips/lib/Makefile | 1 - trunk/arch/mips/lib/dump_tlb.c | 1 - trunk/arch/mips/math-emu/cp1emu.c | 12 +- trunk/arch/mips/math-emu/dsemul.c | 7 +- trunk/arch/mips/math-emu/dsemul.h | 17 + trunk/arch/mips/mm/Makefile | 1 - trunk/arch/mips/mm/dma-default.c | 2 + trunk/arch/mips/mm/sc-ip22.c | 2 +- trunk/arch/mips/mti-malta/malta-amon.c | 6 +- trunk/arch/mips/nxp/pnx833x/common/Makefile | 3 - .../arch/mips/nxp/pnx833x/common/interrupts.c | 380 ---- trunk/arch/mips/nxp/pnx833x/common/platform.c | 319 --- trunk/arch/mips/nxp/pnx833x/common/prom.c | 70 - trunk/arch/mips/nxp/pnx833x/common/reset.c | 45 - trunk/arch/mips/nxp/pnx833x/common/setup.c | 64 - trunk/arch/mips/nxp/pnx833x/stb22x/Makefile | 3 - trunk/arch/mips/nxp/pnx833x/stb22x/board.c | 133 -- trunk/arch/mips/pci/Makefile | 2 +- trunk/arch/mips/pci/fixup-emma2rh.c | 2 +- trunk/arch/mips/pci/fixup-rc32434.c | 1 - trunk/arch/mips/pci/ops-emma2rh.c | 2 +- trunk/arch/mips/pci/pci-emma2rh.c | 2 +- trunk/arch/mips/rb532/devices.c | 4 +- trunk/arch/mips/rb532/gpio.c | 191 +- trunk/arch/mips/sgi-ip22/ip22-int.c | 17 +- trunk/arch/mips/txx9/Kconfig | 6 +- trunk/arch/mips/txx9/generic/7segled.c | 112 - trunk/arch/mips/txx9/generic/Makefile | 1 - trunk/arch/mips/txx9/generic/setup.c | 37 +- trunk/arch/mips/txx9/rbtx4927/setup.c | 25 +- trunk/arch/mips/txx9/rbtx4939/setup.c | 88 +- trunk/arch/mn10300/Kconfig.debug | 9 - trunk/arch/mn10300/mm/misalignment.c | 538 +---- trunk/arch/parisc/include/asm/smp.h | 2 + trunk/arch/parisc/kernel/ptrace.c | 10 +- trunk/arch/powerpc/Kconfig | 3 +- trunk/arch/powerpc/Makefile | 2 +- trunk/arch/powerpc/boot/addnote.c | 175 +- trunk/arch/powerpc/boot/dts/gef_sbc610.dts | 2 +- trunk/arch/powerpc/boot/dts/mpc8313erdb.dts | 39 + trunk/arch/powerpc/boot/libfdt/fdt_ro.c | 9 +- trunk/arch/powerpc/boot/main.c | 2 +- trunk/arch/powerpc/boot/wrapper | 9 +- .../arch/powerpc/configs/40x/acadia_defconfig | 59 +- .../arch/powerpc/configs/40x/ep405_defconfig | 83 +- trunk/arch/powerpc/configs/40x/hcu4_defconfig | 125 +- .../powerpc/configs/40x/kilauea_defconfig | 69 +- .../arch/powerpc/configs/40x/makalu_defconfig | 69 +- .../arch/powerpc/configs/40x/walnut_defconfig | 77 +- .../arch/powerpc/configs/44x/arches_defconfig | 51 +- .../arch/powerpc/configs/44x/bamboo_defconfig | 77 +- .../powerpc/configs/44x/canyonlands_defconfig | 61 +- .../arch/powerpc/configs/44x/ebony_defconfig | 77 +- .../arch/powerpc/configs/44x/katmai_defconfig | 77 +- .../powerpc/configs/44x/rainier_defconfig | 73 +- .../powerpc/configs/44x/sam440ep_defconfig | 110 +- .../powerpc/configs/44x/sequoia_defconfig | 78 +- .../powerpc/configs/44x/taishan_defconfig | 77 +- trunk/arch/powerpc/configs/44x/warp_defconfig | 82 +- .../powerpc/configs/83xx/asp8347_defconfig | 121 +- .../configs/83xx/mpc8313_rdb_defconfig | 158 +- .../configs/83xx/mpc8315_rdb_defconfig | 158 +- .../configs/83xx/mpc832x_mds_defconfig | 125 +- .../configs/83xx/mpc832x_rdb_defconfig | 136 +- .../configs/83xx/mpc834x_itx_defconfig | 171 +- .../configs/83xx/mpc834x_itxgp_defconfig | 121 +- .../configs/83xx/mpc834x_mds_defconfig | 123 +- .../configs/83xx/mpc836x_mds_defconfig | 126 +- .../configs/83xx/mpc836x_rdk_defconfig | 119 +- .../configs/83xx/mpc837x_mds_defconfig | 123 +- .../configs/83xx/mpc837x_rdb_defconfig | 155 +- .../powerpc/configs/83xx/sbc834x_defconfig | 119 +- .../powerpc/configs/85xx/ksi8560_defconfig | 87 +- .../powerpc/configs/85xx/mpc8536_ds_defconfig | 143 +- .../configs/85xx/mpc8540_ads_defconfig | 74 +- .../powerpc/configs/85xx/mpc8544_ds_defconfig | 143 +- .../configs/85xx/mpc8560_ads_defconfig | 90 +- .../powerpc/configs/85xx/mpc8568mds_defconfig | 93 +- .../powerpc/configs/85xx/mpc8572_ds_defconfig | 143 +- .../configs/85xx/mpc85xx_cds_defconfig | 91 +- .../powerpc/configs/85xx/sbc8548_defconfig | 75 +- .../powerpc/configs/85xx/sbc8560_defconfig | 78 +- .../powerpc/configs/85xx/stx_gp3_defconfig | 115 +- .../powerpc/configs/85xx/tqm8540_defconfig | 91 +- .../powerpc/configs/85xx/tqm8541_defconfig | 96 +- .../powerpc/configs/85xx/tqm8548_defconfig | 98 +- .../powerpc/configs/85xx/tqm8555_defconfig | 96 +- .../powerpc/configs/85xx/tqm8560_defconfig | 96 +- .../powerpc/configs/86xx/gef_sbc610_defconfig | 281 +-- .../configs/86xx/mpc8610_hpcd_defconfig | 177 +- .../configs/86xx/mpc8641_hpcn_defconfig | 175 +- .../powerpc/configs/86xx/sbc8641d_defconfig | 152 +- trunk/arch/powerpc/configs/adder875_defconfig | 69 +- trunk/arch/powerpc/configs/c2k_defconfig | 179 +- trunk/arch/powerpc/configs/chrp32_defconfig | 159 +- trunk/arch/powerpc/configs/ep8248e_defconfig | 113 +- trunk/arch/powerpc/configs/ep88xc_defconfig | 67 +- trunk/arch/powerpc/configs/g5_defconfig | 142 +- trunk/arch/powerpc/configs/iseries_defconfig | 114 +- .../powerpc/configs/linkstation_defconfig | 129 +- trunk/arch/powerpc/configs/maple_defconfig | 142 +- trunk/arch/powerpc/configs/mgcoge_defconfig | 234 +- trunk/arch/powerpc/configs/mgsuvd_defconfig | 107 +- .../powerpc/configs/mpc7448_hpc2_defconfig | 78 +- .../powerpc/configs/mpc8272_ads_defconfig | 113 +- trunk/arch/powerpc/configs/mpc83xx_defconfig | 156 +- trunk/arch/powerpc/configs/mpc85xx_defconfig | 145 +- .../arch/powerpc/configs/mpc866_ads_defconfig | 77 +- trunk/arch/powerpc/configs/mpc86xx_defconfig | 144 +- .../arch/powerpc/configs/mpc885_ads_defconfig | 67 +- trunk/arch/powerpc/configs/pmac32_defconfig | 160 +- trunk/arch/powerpc/configs/ppc40x_defconfig | 106 +- trunk/arch/powerpc/configs/ppc44x_defconfig | 125 +- trunk/arch/powerpc/configs/ppc64_defconfig | 174 +- trunk/arch/powerpc/configs/ppc6xx_defconfig | 286 +-- trunk/arch/powerpc/configs/pq2fads_defconfig | 137 +- .../arch/powerpc/configs/prpmc2800_defconfig | 126 +- trunk/arch/powerpc/configs/pseries_defconfig | 169 +- .../arch/powerpc/configs/storcenter_defconfig | 83 +- trunk/arch/powerpc/include/asm/ftrace.h | 2 +- trunk/arch/powerpc/include/asm/immap_cpm2.h | 9 +- trunk/arch/powerpc/include/asm/immap_qe.h | 5 +- trunk/arch/powerpc/include/asm/iommu.h | 15 +- trunk/arch/powerpc/include/asm/kdump.h | 8 + trunk/arch/powerpc/include/asm/mpic.h | 2 - trunk/arch/powerpc/include/asm/pci.h | 2 - trunk/arch/powerpc/kernel/Makefile | 2 +- trunk/arch/powerpc/kernel/dma-iommu.c | 34 +- trunk/arch/powerpc/kernel/entry_32.S | 2 +- trunk/arch/powerpc/kernel/entry_64.S | 2 +- trunk/arch/powerpc/kernel/ftrace.c | 27 +- trunk/arch/powerpc/kernel/head_64.S | 30 +- trunk/arch/powerpc/kernel/ibmebus.c | 27 +- trunk/arch/powerpc/kernel/iommu.c | 25 +- trunk/arch/powerpc/kernel/machine_kexec_64.c | 9 +- trunk/arch/powerpc/kernel/misc_32.S | 4 - trunk/arch/powerpc/kernel/misc_64.S | 9 +- trunk/arch/powerpc/kernel/of_device.c | 1 + trunk/arch/powerpc/kernel/pci-common.c | 110 +- trunk/arch/powerpc/kernel/pci_64.c | 2 +- trunk/arch/powerpc/kernel/ppc_ksyms.c | 2 +- trunk/arch/powerpc/kernel/prom_init.c | 10 +- trunk/arch/powerpc/kernel/setup_64.c | 6 +- trunk/arch/powerpc/kernel/signal_32.c | 52 +- trunk/arch/powerpc/kernel/signal_64.c | 33 +- trunk/arch/powerpc/kernel/vio.c | 25 +- trunk/arch/powerpc/kernel/vmlinux.lds.S | 5 +- trunk/arch/powerpc/oprofile/op_model_cell.c | 13 +- trunk/arch/powerpc/platforms/40x/Kconfig | 2 +- .../arch/powerpc/platforms/85xx/mpc85xx_ds.c | 3 +- trunk/arch/powerpc/platforms/86xx/pic.c | 3 +- trunk/arch/powerpc/platforms/cell/iommu.c | 37 +- trunk/arch/powerpc/platforms/cell/ras.c | 7 +- .../platforms/embedded6xx/linkstation.c | 14 - trunk/arch/powerpc/platforms/iseries/iommu.c | 7 +- .../arch/powerpc/platforms/powermac/Makefile | 2 +- trunk/arch/powerpc/platforms/ps3/system-bus.c | 36 +- trunk/arch/powerpc/platforms/pseries/iommu.c | 4 +- .../powerpc/platforms/pseries/pci_dlpar.c | 1 - trunk/arch/powerpc/sysdev/fsl_soc.c | 26 - trunk/arch/powerpc/sysdev/mpic.c | 59 +- trunk/arch/powerpc/xmon/xmon.c | 2 - trunk/arch/s390/Kconfig | 16 +- trunk/arch/s390/appldata/appldata_base.c | 2 +- trunk/arch/s390/include/asm/kvm_virtio.h | 2 +- trunk/arch/s390/include/asm/mmu.h | 3 +- trunk/arch/s390/include/asm/mmu_context.h | 19 +- trunk/arch/s390/include/asm/pgtable.h | 8 +- trunk/arch/s390/include/asm/thread_info.h | 5 + trunk/arch/s390/kernel/entry.S | 20 +- trunk/arch/s390/kernel/entry64.S | 11 +- trunk/arch/s390/kernel/process.c | 3 - trunk/arch/s390/kernel/setup.c | 4 +- trunk/arch/s390/kernel/smp.c | 24 +- trunk/arch/s390/kernel/sys_s390.c | 2 +- trunk/arch/s390/kernel/topology.c | 11 +- trunk/arch/s390/mm/pgtable.c | 16 +- trunk/arch/sh/Kconfig | 2 +- trunk/arch/sh/Makefile | 31 +- trunk/arch/sh/boot/compressed/Makefile_32 | 2 +- trunk/arch/sh/cchips/Kconfig | 33 + trunk/arch/sh/cchips/hd6446x/Makefile | 1 + trunk/arch/sh/cchips/hd6446x/hd64465/Makefile | 6 + trunk/arch/sh/cchips/hd6446x/hd64465/gpio.c | 196 ++ trunk/arch/sh/cchips/hd6446x/hd64465/io.c | 211 ++ trunk/arch/sh/cchips/hd6446x/hd64465/setup.c | 181 ++ trunk/arch/sh/configs/migor_defconfig | 35 +- trunk/arch/sh/configs/ul2_defconfig | 1169 ---------- trunk/arch/sh/include/asm/byteorder.h | 36 +- trunk/arch/sh/include/asm/hd64465/gpio.h | 46 + trunk/arch/sh/include/asm/hd64465/hd64465.h | 256 +++ trunk/arch/sh/include/asm/hd64465/io.h | 44 + trunk/arch/sh/include/asm/io.h | 4 - trunk/arch/sh/include/asm/pgtable.h | 6 - trunk/arch/sh/include/asm/serial.h | 17 + trunk/arch/sh/include/cpu-sh4/cpu/rtc.h | 2 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 28 - trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 34 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 6 +- trunk/arch/sh/kernel/early_printk.c | 3 +- trunk/arch/sh/kernel/entry-common.S | 4 +- trunk/arch/sh/kernel/sh_ksyms_32.c | 13 +- trunk/arch/sh/kernel/timers/timer-tmu.c | 2 +- trunk/arch/sh/lib/copy_page.S | 11 +- trunk/arch/sh/mm/Makefile_32 | 2 +- trunk/arch/sh/mm/Makefile_64 | 2 +- trunk/arch/sh/mm/cache-sh2a.c | 8 +- trunk/arch/sh/mm/init.c | 12 +- trunk/arch/sh/mm/mmap.c | 31 - trunk/arch/sh/mm/pg-sh4.c | 17 - trunk/arch/sh/oprofile/op_model_sh7750.c | 6 +- trunk/arch/sh/tools/mach-types | 1 + trunk/arch/sparc/include/asm/byteorder.h | 22 +- trunk/arch/sparc/include/asm/kdebug_32.h | 1 - trunk/arch/sparc/include/asm/processor_64.h | 4 +- trunk/arch/sparc/include/asm/termbits.h | 11 +- trunk/arch/sparc/include/asm/uaccess_64.h | 4 +- trunk/arch/sparc/include/asm/unistd_32.h | 3 +- trunk/arch/sparc/include/asm/unistd_64.h | 3 +- trunk/arch/sparc/kernel/head.S | 1 + trunk/arch/sparc/kernel/of_device.c | 4 +- trunk/arch/sparc/kernel/systbls.S | 2 +- trunk/arch/sparc/kernel/time.c | 27 +- trunk/arch/sparc64/Kconfig | 3 +- trunk/arch/sparc64/Kconfig.debug | 2 +- trunk/arch/sparc64/defconfig | 232 +- trunk/arch/sparc64/kernel/Makefile | 2 - trunk/arch/sparc64/kernel/ftrace.c | 26 +- trunk/arch/sparc64/kernel/pci.c | 10 +- trunk/arch/sparc64/kernel/sys32.S | 13 +- trunk/arch/sparc64/kernel/systbls.S | 4 +- trunk/arch/sparc64/kernel/time.c | 34 +- trunk/arch/sparc64/lib/PeeCeeI.c | 139 +- trunk/arch/sparc64/lib/mcount.S | 4 +- trunk/arch/x86/Kconfig | 17 +- trunk/arch/x86/Kconfig.cpu | 24 +- trunk/arch/x86/boot/compressed/.gitignore | 2 - trunk/arch/x86/include/asm/acpi.h | 1 + trunk/arch/x86/include/asm/cpufeature.h | 2 +- trunk/arch/x86/include/asm/dma-mapping.h | 4 +- trunk/arch/x86/include/asm/es7000/wakecpu.h | 9 +- trunk/arch/x86/include/asm/fixmap.h | 4 - trunk/arch/x86/include/asm/fixmap_32.h | 4 + trunk/arch/x86/include/asm/ftrace.h | 4 +- trunk/arch/x86/include/asm/highmem.h | 5 +- trunk/arch/x86/include/asm/io.h | 6 +- trunk/arch/x86/include/asm/iomap.h | 30 - trunk/arch/x86/include/asm/iommu.h | 2 + trunk/arch/x86/include/asm/irq_vectors.h | 20 +- trunk/arch/x86/include/asm/kvm_host.h | 3 - .../include/asm/mach-default/mach_wakecpu.h | 9 +- trunk/arch/x86/include/asm/mmzone_32.h | 4 - trunk/arch/x86/include/asm/msr.h | 2 + trunk/arch/x86/include/asm/pgtable-3level.h | 4 +- trunk/arch/x86/include/asm/smp.h | 6 - trunk/arch/x86/include/asm/topology.h | 7 +- trunk/arch/x86/include/asm/tsc.h | 8 +- trunk/arch/x86/include/asm/uaccess_64.h | 2 +- trunk/arch/x86/include/asm/unistd_64.h | 4 +- trunk/arch/x86/include/asm/uv/uv_hub.h | 1 - trunk/arch/x86/include/asm/voyager.h | 1 - trunk/arch/x86/kernel/Makefile | 3 +- trunk/arch/x86/kernel/acpi/boot.c | 1 + trunk/arch/x86/kernel/amd_iommu.c | 9 +- trunk/arch/x86/kernel/amd_iommu_init.c | 6 +- .../x86/kernel/cpu/addon_cpuid_features.c | 2 +- trunk/arch/x86/kernel/cpu/common.c | 7 +- trunk/arch/x86/kernel/ds.c | 25 +- trunk/arch/x86/kernel/e820.c | 8 +- trunk/arch/x86/kernel/early-quirks.c | 18 + trunk/arch/x86/kernel/entry_32.S | 4 +- trunk/arch/x86/kernel/entry_64.S | 4 +- trunk/arch/x86/kernel/es7000_32.c | 9 +- trunk/arch/x86/kernel/ftrace.c | 50 +- trunk/arch/x86/kernel/genx2apic_uv_x.c | 7 +- trunk/arch/x86/kernel/hpet.c | 4 +- trunk/arch/x86/kernel/i386_ksyms_32.c | 2 +- trunk/arch/x86/kernel/io_apic.c | 16 - trunk/arch/x86/kernel/k8.c | 1 + trunk/arch/x86/kernel/kvmclock.c | 2 +- trunk/arch/x86/kernel/machine_kexec_32.c | 5 +- trunk/arch/x86/kernel/microcode_amd.c | 2 +- trunk/arch/x86/kernel/microcode_core.c | 4 +- trunk/arch/x86/kernel/pci-dma.c | 16 - trunk/arch/x86/kernel/pci-gart_64.c | 2 +- trunk/arch/x86/kernel/pci-swiotlb_64.c | 14 +- trunk/arch/x86/kernel/reboot.c | 15 +- trunk/arch/x86/kernel/setup.c | 2 +- trunk/arch/x86/kernel/tlb_32.c | 6 - trunk/arch/x86/kernel/tlb_64.c | 5 - trunk/arch/x86/kernel/tsc.c | 12 +- trunk/arch/x86/kernel/tsc_sync.c | 4 - trunk/arch/x86/kernel/vsmp_64.c | 2 +- trunk/arch/x86/kernel/x8664_ksyms_64.c | 2 +- trunk/arch/x86/kvm/Kconfig | 2 - trunk/arch/x86/kvm/i8254.c | 13 +- trunk/arch/x86/kvm/i8254.h | 1 - trunk/arch/x86/kvm/mmu.c | 3 +- trunk/arch/x86/kvm/vmx.c | 3 +- trunk/arch/x86/kvm/vmx.h | 1 - trunk/arch/x86/kvm/x86.c | 6 +- trunk/arch/x86/lguest/boot.c | 32 +- trunk/arch/x86/mach-voyager/setup.c | 2 +- trunk/arch/x86/mach-voyager/voyager_smp.c | 30 +- trunk/arch/x86/mm/Makefile | 2 +- trunk/arch/x86/mm/gup.c | 2 +- trunk/arch/x86/mm/init_32.c | 3 +- trunk/arch/x86/mm/init_64.c | 75 +- trunk/arch/x86/mm/iomap_32.c | 59 - trunk/arch/x86/mm/ioremap.c | 22 +- trunk/arch/x86/mm/numa_32.c | 35 - trunk/arch/x86/mm/pageattr.c | 8 +- trunk/arch/x86/mm/pat.c | 4 - trunk/arch/x86/oprofile/op_model_ppro.c | 9 +- trunk/arch/x86/power/hibernate_32.c | 4 - trunk/arch/x86/xen/Makefile | 2 +- trunk/arch/x86/xen/enlighten.c | 5 +- trunk/arch/x86/xen/mmu.c | 31 +- trunk/block/blk-core.c | 4 +- trunk/block/blk-map.c | 6 - trunk/block/blk-merge.c | 21 + trunk/block/blk-timeout.c | 20 +- trunk/block/elevator.c | 12 +- trunk/block/genhd.c | 2 - trunk/block/ioctl.c | 7 +- trunk/drivers/Kconfig | 2 - trunk/drivers/Makefile | 2 +- trunk/drivers/acpi/Kconfig | 22 +- trunk/drivers/acpi/Makefile | 8 +- trunk/drivers/acpi/ac.c | 3 +- trunk/drivers/acpi/acpi_memhotplug.c | 1 + trunk/drivers/acpi/battery.c | 3 +- trunk/drivers/acpi/bus.c | 11 +- trunk/drivers/acpi/button.c | 6 +- trunk/drivers/acpi/cm_sbs.c | 7 + trunk/drivers/acpi/container.c | 1 + trunk/drivers/acpi/debug.c | 15 - trunk/drivers/acpi/ec.c | 97 +- trunk/drivers/acpi/events/evgpe.c | 2 + trunk/drivers/acpi/events/evxfevnt.c | 41 +- trunk/drivers/acpi/fan.c | 1 + trunk/drivers/acpi/glue.c | 40 - trunk/drivers/acpi/pci_link.c | 11 +- trunk/drivers/acpi/pci_root.c | 6 + trunk/drivers/acpi/power.c | 11 +- trunk/drivers/acpi/processor_core.c | 93 +- trunk/drivers/acpi/processor_idle.c | 1 + trunk/drivers/acpi/processor_perflib.c | 7 +- trunk/drivers/acpi/processor_thermal.c | 1 + trunk/drivers/acpi/processor_throttling.c | 2 +- trunk/drivers/acpi/reboot.c | 25 +- trunk/drivers/acpi/scan.c | 42 +- trunk/drivers/acpi/sleep/main.c | 2 - trunk/drivers/acpi/sleep/proc.c | 2 +- trunk/drivers/acpi/sleep/wakeup.c | 8 +- trunk/drivers/acpi/system.c | 48 +- trunk/drivers/acpi/tables/tbfadt.c | 2 +- trunk/drivers/acpi/thermal.c | 9 +- trunk/drivers/acpi/toshiba_acpi.c | 2 - trunk/drivers/acpi/video.c | 42 +- trunk/drivers/acpi/video_detect.c | 267 --- trunk/drivers/acpi/wmi.c | 2 +- trunk/drivers/ata/ahci.c | 41 +- trunk/drivers/ata/ata_generic.c | 2 +- trunk/drivers/ata/ata_piix.c | 3 +- trunk/drivers/ata/libata-core.c | 120 +- trunk/drivers/ata/libata-eh.c | 35 +- trunk/drivers/ata/libata-scsi.c | 21 +- trunk/drivers/ata/libata-sff.c | 13 +- trunk/drivers/ata/libata.h | 19 +- trunk/drivers/ata/pata_acpi.c | 2 +- trunk/drivers/ata/pata_ali.c | 1 + trunk/drivers/ata/pata_amd.c | 1 + trunk/drivers/ata/pata_artop.c | 2 +- trunk/drivers/ata/pata_atiixp.c | 1 + trunk/drivers/ata/pata_cmd640.c | 1 + trunk/drivers/ata/pata_cmd64x.c | 2 +- trunk/drivers/ata/pata_cs5530.c | 1 + trunk/drivers/ata/pata_cs5535.c | 3 +- trunk/drivers/ata/pata_cs5536.c | 1 + trunk/drivers/ata/pata_cypress.c | 2 +- trunk/drivers/ata/pata_efar.c | 2 +- trunk/drivers/ata/pata_isapnp.c | 2 +- trunk/drivers/ata/pata_it821x.c | 7 +- trunk/drivers/ata/pata_jmicron.c | 2 +- trunk/drivers/ata/pata_legacy.c | 2 +- trunk/drivers/ata/pata_marvell.c | 2 +- trunk/drivers/ata/pata_mpiix.c | 2 +- trunk/drivers/ata/pata_netcell.c | 2 +- trunk/drivers/ata/pata_ninja32.c | 44 +- trunk/drivers/ata/pata_ns87410.c | 1 + trunk/drivers/ata/pata_ns87415.c | 2 +- trunk/drivers/ata/pata_oldpiix.c | 2 +- trunk/drivers/ata/pata_opti.c | 1 + trunk/drivers/ata/pata_optidma.c | 1 + trunk/drivers/ata/pata_pcmcia.c | 3 +- trunk/drivers/ata/pata_pdc202xx_old.c | 2 +- trunk/drivers/ata/pata_platform.c | 2 +- trunk/drivers/ata/pata_qdi.c | 2 +- trunk/drivers/ata/pata_radisys.c | 2 +- trunk/drivers/ata/pata_sc1200.c | 2 +- trunk/drivers/ata/pata_scc.c | 2 +- trunk/drivers/ata/pata_sch.c | 2 +- trunk/drivers/ata/pata_serverworks.c | 1 + trunk/drivers/ata/pata_sil680.c | 1 + trunk/drivers/ata/pata_sis.c | 2 +- trunk/drivers/ata/pata_sl82c105.c | 1 + trunk/drivers/ata/pata_triflex.c | 2 +- trunk/drivers/ata/pata_via.c | 1 + trunk/drivers/ata/pata_winbond.c | 2 +- trunk/drivers/ata/sata_nv.c | 53 +- trunk/drivers/ata/sata_promise.c | 20 - trunk/drivers/ata/sata_sil24.c | 5 - trunk/drivers/ata/sata_via.c | 153 +- trunk/drivers/base/sys.c | 10 +- trunk/drivers/block/Kconfig | 29 +- trunk/drivers/block/cciss.c | 37 +- trunk/drivers/block/cpqarray.c | 7 +- trunk/drivers/block/floppy.c | 2 +- trunk/drivers/block/loop.c | 5 +- trunk/drivers/block/ub.c | 20 +- trunk/drivers/block/xen-blkfront.c | 8 +- trunk/drivers/bluetooth/bluecard_cs.c | 2 +- trunk/drivers/bluetooth/bpa10x.c | 4 +- trunk/drivers/bluetooth/bt3c_cs.c | 6 +- trunk/drivers/bluetooth/btsdio.c | 2 +- trunk/drivers/bluetooth/btuart_cs.c | 6 +- trunk/drivers/bluetooth/dtl1_cs.c | 7 +- trunk/drivers/cdrom/gdrom.c | 5 +- trunk/drivers/char/Kconfig | 46 +- trunk/drivers/char/Makefile | 2 + trunk/drivers/char/ds1286.c | 585 +++++ trunk/drivers/char/hpet.c | 3 + trunk/drivers/char/hw_random/amd-rng.c | 2 +- trunk/drivers/char/hw_random/geode-rng.c | 2 +- trunk/drivers/char/hw_random/intel-rng.c | 2 +- trunk/drivers/char/hw_random/via-rng.c | 2 +- trunk/drivers/char/ip27-rtc.c | 329 +++ trunk/drivers/char/ipmi/ipmi_devintf.c | 3 +- trunk/drivers/char/ipmi/ipmi_msghandler.c | 20 +- trunk/drivers/char/ipmi/ipmi_si_intf.c | 16 +- trunk/drivers/char/ipmi/ipmi_watchdog.c | 1 + trunk/drivers/char/isicom.c | 6 +- trunk/drivers/char/mxser.c | 3 +- trunk/drivers/char/pcmcia/synclink_cs.c | 2 +- trunk/drivers/char/random.c | 7 + trunk/drivers/char/rtc.c | 2 + trunk/drivers/char/sonypi.c | 5 +- trunk/drivers/char/specialix.c | 2 +- trunk/drivers/char/vt.c | 10 +- trunk/drivers/cpuidle/cpuidle.c | 4 +- trunk/drivers/dca/dca-core.c | 2 +- trunk/drivers/dma/dmaengine.c | 4 +- trunk/drivers/dma/dmatest.c | 22 +- trunk/drivers/dma/ioat_dma.c | 18 +- trunk/drivers/dma/iop-adma.c | 11 +- trunk/drivers/dma/iovlock.c | 17 +- trunk/drivers/edac/Kconfig | 7 - trunk/drivers/edac/Makefile | 1 - trunk/drivers/edac/cell_edac.c | 3 - trunk/drivers/edac/i5000_edac.c | 4 +- trunk/drivers/edac/x38_edac.c | 524 ----- trunk/drivers/firewire/fw-device.c | 14 +- trunk/drivers/firewire/fw-ohci.c | 52 +- trunk/drivers/firewire/fw-sbp2.c | 40 +- trunk/drivers/firewire/fw-topology.c | 6 +- trunk/drivers/firewire/fw-transaction.h | 2 +- trunk/drivers/firmware/dmi_scan.c | 6 +- trunk/drivers/gpio/Kconfig | 8 - trunk/drivers/gpio/Makefile | 1 - trunk/drivers/gpio/gpiolib.c | 2 +- trunk/drivers/gpio/xilinx_gpio.c | 235 -- trunk/drivers/gpu/drm/drm_drv.c | 10 +- trunk/drivers/gpu/drm/drm_fops.c | 2 + trunk/drivers/gpu/drm/drm_irq.c | 80 + trunk/drivers/gpu/drm/drm_lock.c | 9 + trunk/drivers/gpu/drm/drm_stub.c | 1 + trunk/drivers/gpu/drm/i915/Makefile | 3 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 17 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 31 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 204 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 383 +++- trunk/drivers/gpu/drm/i915/i915_reg.h | 3 - trunk/drivers/gpu/drm/i915/i915_suspend.c | 9 - trunk/drivers/gpu/drm/radeon/radeon_cp.c | 30 +- trunk/drivers/gpu/drm/radeon/radeon_drv.h | 14 +- trunk/drivers/hid/Kconfig | 2 + trunk/drivers/hid/hid-apple.c | 74 +- trunk/drivers/hid/hid-core.c | 55 +- trunk/drivers/hid/hid-dell.c | 1 - trunk/drivers/hid/hid-gyration.c | 4 +- trunk/drivers/hid/hid-ids.h | 14 +- trunk/drivers/hid/hid-lg.c | 5 + trunk/drivers/hid/hid-sony.c | 44 +- trunk/drivers/hid/hidraw.c | 33 +- trunk/drivers/hid/usbhid/hid-core.c | 86 +- trunk/drivers/hid/usbhid/hiddev.c | 5 +- trunk/drivers/hid/usbhid/usbhid.h | 2 - trunk/drivers/hwmon/Kconfig | 29 - trunk/drivers/hwmon/Makefile | 2 - trunk/drivers/hwmon/adt7462.c | 2002 ----------------- trunk/drivers/hwmon/adt7470.c | 75 +- trunk/drivers/hwmon/adt7473.c | 89 +- trunk/drivers/hwmon/applesmc.c | 55 +- trunk/drivers/hwmon/ibmaem.c | 18 +- trunk/drivers/hwmon/lis3lv02d.c | 581 ----- trunk/drivers/hwmon/lis3lv02d.h | 149 -- trunk/drivers/hwmon/lm85.c | 52 +- trunk/drivers/i2c/busses/i2c-pxa.c | 2 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 6 +- trunk/drivers/i2c/busses/i2c-sh_mobile.c | 3 +- trunk/drivers/i2c/busses/scx200_i2c.c | 1 - trunk/drivers/ide/Kconfig | 2 +- trunk/drivers/ide/alim15x3.c | 2 +- trunk/drivers/ide/hpt366.c | 2 +- trunk/drivers/ide/ide-cd.c | 3 +- trunk/drivers/ide/ide-cs.c | 1 - trunk/drivers/ide/ide-disk.c | 2 +- trunk/drivers/ide/ide-gd.c | 7 +- trunk/drivers/ide/ide-iops.c | 2 +- trunk/drivers/ide/ide-pci-generic.c | 2 +- trunk/drivers/ide/ide-proc.c | 2 +- trunk/drivers/ide/ide_arm.c | 11 +- trunk/drivers/ide/it821x.c | 2 +- trunk/drivers/ide/jmicron.c | 2 +- trunk/drivers/ide/piix.c | 2 +- trunk/drivers/ide/scc_pata.c | 2 +- trunk/drivers/ide/siimage.c | 2 +- trunk/drivers/ide/tx4938ide.c | 41 +- trunk/drivers/idle/Kconfig | 12 +- trunk/drivers/idle/i7300_idle.c | 105 +- trunk/drivers/ieee1394/dv1394.c | 13 +- trunk/drivers/ieee1394/hosts.c | 4 +- trunk/drivers/ieee1394/nodemgr.c | 14 +- trunk/drivers/ieee1394/raw1394.c | 9 +- trunk/drivers/infiniband/core/uverbs_main.c | 2 + .../infiniband/hw/cxgb3/iwch_provider.c | 6 + trunk/drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 + trunk/drivers/infiniband/hw/ehca/ehca_irq.c | 44 +- trunk/drivers/infiniband/hw/ehca/ehca_qp.c | 5 - trunk/drivers/infiniband/hw/ipath/ipath_ruc.c | 10 +- trunk/drivers/infiniband/hw/mlx4/mr.c | 1 - trunk/drivers/infiniband/hw/nes/nes.c | 16 - trunk/drivers/infiniband/hw/nes/nes_hw.h | 1 - trunk/drivers/infiniband/hw/nes/nes_verbs.c | 64 +- .../drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 +- trunk/drivers/input/evdev.c | 1 + trunk/drivers/input/joydev.c | 1 + trunk/drivers/input/keyboard/pxa27x_keypad.c | 2 +- trunk/drivers/input/misc/hp_sdc_rtc.c | 13 + trunk/drivers/input/misc/sgi_btns.c | 1 - trunk/drivers/input/mouse/Kconfig | 25 +- trunk/drivers/input/mouse/Makefile | 1 - trunk/drivers/input/mouse/elantech.c | 674 ------ trunk/drivers/input/mouse/elantech.h | 124 - trunk/drivers/input/mouse/psmouse-base.c | 23 - trunk/drivers/input/mouse/psmouse.h | 1 - trunk/drivers/input/mousedev.c | 1 + trunk/drivers/input/serio/Kconfig | 2 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 8 - trunk/drivers/input/serio/serio_raw.c | 1 + trunk/drivers/isdn/i4l/isdn_net.c | 6 +- trunk/drivers/leds/leds-da903x.c | 3 +- trunk/drivers/leds/leds-hp-disk.c | 3 +- trunk/drivers/md/dm-mpath.c | 8 +- trunk/drivers/md/dm-raid1.c | 4 +- trunk/drivers/md/dm-snap.c | 32 +- trunk/drivers/md/dm-snap.h | 2 - trunk/drivers/md/dm-stripe.c | 4 +- trunk/drivers/md/dm.c | 34 +- trunk/drivers/md/linear.c | 2 - trunk/drivers/md/md.c | 57 +- trunk/drivers/md/raid10.c | 2 +- .../drivers/media/dvb/dvb-core/dvb_frontend.c | 2 - trunk/drivers/media/dvb/dvb-usb/Kconfig | 3 +- trunk/drivers/media/dvb/dvb-usb/af9015.c | 14 +- trunk/drivers/media/dvb/dvb-usb/af9015.h | 1 + trunk/drivers/media/dvb/dvb-usb/anysee.c | 4 +- trunk/drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 6 +- trunk/drivers/media/dvb/frontends/af9013.c | 6 +- trunk/drivers/media/radio/Kconfig | 14 - trunk/drivers/media/radio/radio-si470x.c | 19 +- trunk/drivers/media/video/cafe_ccic.c | 6 +- trunk/drivers/media/video/compat_ioctl32.c | 3 - trunk/drivers/media/video/cx18/cx18-driver.c | 17 +- trunk/drivers/media/video/cx18/cx18-driver.h | 20 +- trunk/drivers/media/video/cx18/cx18-dvb.c | 23 - trunk/drivers/media/video/cx18/cx18-dvb.h | 1 - trunk/drivers/media/video/cx18/cx18-io.c | 17 +- trunk/drivers/media/video/cx18/cx18-io.h | 17 - trunk/drivers/media/video/cx18/cx18-irq.c | 96 +- trunk/drivers/media/video/cx18/cx18-irq.h | 4 +- trunk/drivers/media/video/cx18/cx18-mailbox.c | 6 +- trunk/drivers/media/video/cx18/cx18-queue.c | 14 +- trunk/drivers/media/video/cx18/cx18-scb.h | 40 +- .../drivers/media/video/cx88/cx88-blackbird.c | 12 +- trunk/drivers/media/video/cx88/cx88-dvb.c | 5 - trunk/drivers/media/video/cx88/cx88-mpeg.c | 28 +- trunk/drivers/media/video/cx88/cx88-video.c | 10 +- trunk/drivers/media/video/cx88/cx88.h | 1 - trunk/drivers/media/video/gspca/Kconfig | 144 +- trunk/drivers/media/video/gspca/zc3xx.c | 12 +- trunk/drivers/media/video/ivtv/Kconfig | 5 +- trunk/drivers/media/video/ivtv/ivtv-driver.c | 26 +- trunk/drivers/media/video/pxa_camera.c | 2 +- trunk/drivers/media/video/saa7110.c | 4 +- .../media/video/saa7134/saa7134-core.c | 3 +- trunk/drivers/media/video/tvaudio.c | 231 +- trunk/drivers/media/video/usbvideo/ibmcam.c | 12 +- trunk/drivers/message/fusion/mptctl.c | 7 + trunk/drivers/message/fusion/mptlan.c | 108 + trunk/drivers/message/i2o/i2o_block.c | 12 +- trunk/drivers/message/i2o/i2o_config.c | 21 +- trunk/drivers/mfd/Kconfig | 16 +- trunk/drivers/mfd/Makefile | 2 - trunk/drivers/mfd/asic3.c | 6 +- trunk/drivers/mfd/da903x.c | 2 +- trunk/drivers/mfd/mcp-core.c | 2 +- trunk/drivers/mfd/mcp-sa11x0.c | 2 +- trunk/drivers/mfd/ucb1x00-assabet.c | 2 +- trunk/drivers/mfd/ucb1x00-core.c | 2 +- trunk/drivers/mfd/ucb1x00-ts.c | 2 +- trunk/drivers/mfd/wm8350-i2c.c | 15 +- trunk/drivers/misc/Kconfig | 16 +- trunk/drivers/misc/Makefile | 2 - trunk/drivers/misc/acer-wmi.c | 6 - trunk/drivers/misc/asus-laptop.c | 10 +- trunk/drivers/misc/c2port/Kconfig | 35 - trunk/drivers/misc/c2port/Makefile | 3 - .../drivers/misc/c2port/c2port-duramar2150.c | 158 -- trunk/drivers/misc/c2port/core.c | 1003 --------- trunk/drivers/misc/compal-laptop.c | 12 +- trunk/drivers/misc/eeepc-laptop.c | 12 +- trunk/drivers/misc/fujitsu-laptop.c | 43 +- trunk/drivers/misc/hdpuftrs/hdpu_nexus.c | 1 + trunk/drivers/misc/ics932s401.c | 515 ----- trunk/drivers/misc/intel_menlow.c | 10 +- trunk/drivers/misc/msi-laptop.c | 16 +- trunk/drivers/misc/panasonic-laptop.c | 1 + trunk/drivers/misc/sgi-gru/Makefile | 4 - trunk/drivers/misc/sgi-xp/Makefile | 4 +- trunk/drivers/misc/sgi-xp/xp.h | 4 - trunk/drivers/misc/sgi-xp/xpc_main.c | 4 +- trunk/drivers/misc/sony-laptop.c | 13 +- trunk/drivers/misc/thinkpad_acpi.c | 29 +- trunk/drivers/mmc/core/bus.c | 3 +- trunk/drivers/mmc/core/core.c | 6 +- trunk/drivers/mmc/core/host.c | 5 +- trunk/drivers/mmc/core/sdio_bus.c | 3 +- trunk/drivers/mmc/host/mmc_spi.c | 2 +- trunk/drivers/mmc/host/mmci.c | 7 +- trunk/drivers/mmc/host/pxamci.c | 7 +- trunk/drivers/mmc/host/s3cmci.c | 2 +- trunk/drivers/mmc/host/sdhci.c | 2 +- trunk/drivers/mmc/host/tifm_sd.c | 16 +- trunk/drivers/mtd/chips/cfi_cmdset_0002.c | 13 + trunk/drivers/mtd/chips/jedec_probe.c | 10 +- trunk/drivers/mtd/maps/cdb89712.c | 13 +- trunk/drivers/mtd/maps/h720x-flash.c | 6 +- trunk/drivers/mtd/maps/ixp2000.c | 2 +- trunk/drivers/mtd/maps/ixp4xx.c | 2 +- trunk/drivers/mtd/nand/pxa3xx_nand.c | 2 +- trunk/drivers/mtd/nand/s3c2410.c | 8 +- trunk/drivers/mtd/onenand/omap2.c | 1 + trunk/drivers/net/3c509.c | 6 +- trunk/drivers/net/Kconfig | 18 +- trunk/drivers/net/amd8111e.c | 23 +- trunk/drivers/net/arm/at91_ether.c | 6 +- trunk/drivers/net/atl1e/atl1e.h | 1 + trunk/drivers/net/atl1e/atl1e_hw.c | 4 + trunk/drivers/net/atlx/atl1.c | 24 +- trunk/drivers/net/atlx/atl1.h | 2 +- trunk/drivers/net/atlx/atl2.c | 8 +- trunk/drivers/net/bnx2.c | 9 +- trunk/drivers/net/bnx2x_init.h | 9 +- trunk/drivers/net/bnx2x_main.c | 10 +- trunk/drivers/net/bonding/bond_alb.c | 13 +- trunk/drivers/net/bonding/bond_main.c | 52 +- trunk/drivers/net/cris/eth_v10.c | 4 +- trunk/drivers/net/cs89x0.c | 6 +- trunk/drivers/net/cxgb3/cxgb3_main.c | 4 +- trunk/drivers/net/cxgb3/t3_hw.c | 8 +- trunk/drivers/net/e100.c | 20 +- trunk/drivers/net/e1000/e1000_ethtool.c | 8 +- trunk/drivers/net/e1000/e1000_main.c | 1 - trunk/drivers/net/e1000e/e1000.h | 5 - trunk/drivers/net/e1000e/ethtool.c | 8 +- trunk/drivers/net/e1000e/netdev.c | 25 +- trunk/drivers/net/e1000e/param.c | 25 - trunk/drivers/net/ehea/ehea.h | 2 +- trunk/drivers/net/ehea/ehea_qmr.c | 57 +- trunk/drivers/net/ehea/ehea_qmr.h | 3 - trunk/drivers/net/fs_enet/fs_enet-main.c | 6 +- trunk/drivers/net/gianfar.c | 31 +- trunk/drivers/net/gianfar_mii.c | 21 - trunk/drivers/net/gianfar_mii.h | 3 - trunk/drivers/net/ibm_newemac/core.c | 2 +- trunk/drivers/net/igb/igb_ethtool.c | 8 +- trunk/drivers/net/igb/igb_main.c | 8 +- trunk/drivers/net/ipg.c | 8 +- trunk/drivers/net/irda/ks959-sir.c | 1 + trunk/drivers/net/irda/ksdazzle-sir.c | 1 + trunk/drivers/net/irda/pxaficp_ir.c | 3 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 58 +- trunk/drivers/net/jme.c | 21 +- trunk/drivers/net/loopback.c | 9 + trunk/drivers/net/mlx4/en_main.c | 1 + trunk/drivers/net/mlx4/en_netdev.c | 10 +- trunk/drivers/net/mlx4/en_params.c | 30 +- trunk/drivers/net/mlx4/fw.c | 2 +- trunk/drivers/net/mlx4/mlx4.h | 9 +- trunk/drivers/net/mlx4/mlx4_en.h | 8 +- trunk/drivers/net/mv643xx_eth.c | 14 +- trunk/drivers/net/myri10ge/myri10ge.c | 6 +- trunk/drivers/net/niu.c | 299 +-- trunk/drivers/net/niu.h | 13 - trunk/drivers/net/phy/marvell.c | 66 - trunk/drivers/net/phy/mdio_bus.c | 2 +- trunk/drivers/net/phy/phy_device.c | 38 +- trunk/drivers/net/pppoe.c | 6 +- trunk/drivers/net/qla3xxx.c | 19 +- trunk/drivers/net/sfc/ethtool.c | 4 +- trunk/drivers/net/sh_eth.c | 4 +- trunk/drivers/net/smc911x.c | 8 +- trunk/drivers/net/smc91x.c | 4 +- trunk/drivers/net/smc91x.h | 3 +- trunk/drivers/net/tulip/dmfe.c | 12 +- trunk/drivers/net/tun.c | 2 + trunk/drivers/net/ucc_geth_ethtool.c | 7 +- trunk/drivers/net/usb/asix.c | 8 +- trunk/drivers/net/usb/dm9601.c | 15 - trunk/drivers/net/usb/hso.c | 12 +- trunk/drivers/net/via-velocity.c | 13 +- trunk/drivers/net/wan/syncppp.c | 5 +- trunk/drivers/net/wan/z85230.c | 1 + trunk/drivers/net/wireless/ath5k/base.c | 33 +- trunk/drivers/net/wireless/ath5k/debug.c | 2 +- trunk/drivers/net/wireless/ath5k/desc.c | 16 +- trunk/drivers/net/wireless/ath5k/initvals.c | 2 - trunk/drivers/net/wireless/ath5k/reset.c | 22 +- .../drivers/net/wireless/hostap/hostap_wlan.h | 5 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 13 +- trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 3 +- trunk/drivers/net/wireless/iwlwifi/iwl-rx.c | 26 +- trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 7 - .../net/wireless/iwlwifi/iwl3945-base.c | 14 +- trunk/drivers/net/wireless/libertas/cmd.c | 4 +- trunk/drivers/net/wireless/libertas/rx.c | 2 +- trunk/drivers/net/wireless/libertas/scan.c | 4 +- .../drivers/net/wireless/libertas_tf/if_usb.c | 2 +- trunk/drivers/net/wireless/p54/p54common.c | 5 +- trunk/drivers/net/wireless/p54/p54pci.c | 132 +- trunk/drivers/net/wireless/rt2x00/Kconfig | 2 +- trunk/drivers/net/wireless/rtl8187_dev.c | 3 - trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 2 - trunk/drivers/of/device.c | 11 +- trunk/drivers/oprofile/event_buffer.c | 6 +- trunk/drivers/parport/Kconfig | 2 +- trunk/drivers/parport/parport_cs.c | 2 +- trunk/drivers/pci/intel-iommu.c | 6 +- trunk/drivers/pci/pci-acpi.c | 18 +- trunk/drivers/pci/pci-sysfs.c | 2 +- trunk/drivers/pci/pci.c | 4 +- trunk/drivers/pci/quirks.c | 50 +- trunk/drivers/pci/rom.c | 6 +- trunk/drivers/pcmcia/Kconfig | 4 + trunk/drivers/pcmcia/Makefile | 1 + trunk/drivers/pcmcia/cistpl.c | 3 +- trunk/drivers/pcmcia/cs.c | 14 +- trunk/drivers/pcmcia/ds.c | 11 +- trunk/drivers/pcmcia/hd64465_ss.c | 939 ++++++++ trunk/drivers/pcmcia/pcmcia_resource.c | 6 +- trunk/drivers/pcmcia/rsrc_nonstatic.c | 6 +- trunk/drivers/pnp/interface.c | 1 + trunk/drivers/ps3/ps3-lpm.c | 1 - trunk/drivers/regulator/Kconfig | 15 +- trunk/drivers/regulator/da903x.c | 29 +- trunk/drivers/rtc/Kconfig | 29 - trunk/drivers/rtc/Makefile | 3 - trunk/drivers/rtc/interface.c | 2 +- trunk/drivers/rtc/rtc-at91sam9.c | 1 - trunk/drivers/rtc/rtc-cmos.c | 2 +- trunk/drivers/rtc/rtc-dev.c | 3 + trunk/drivers/rtc/rtc-ds1390.c | 220 -- trunk/drivers/rtc/rtc-ds3234.c | 4 +- trunk/drivers/rtc/rtc-m48t59.c | 34 +- trunk/drivers/rtc/rtc-rx8581.c | 281 --- trunk/drivers/rtc/rtc-s3c.c | 10 +- trunk/drivers/rtc/rtc-sun4v.c | 69 +- trunk/drivers/rtc/rtc-wm8350.c | 514 ----- trunk/drivers/s390/block/dasd.c | 5 - trunk/drivers/s390/char/sclp_cmd.c | 3 - trunk/drivers/s390/char/tape_block.c | 6 +- trunk/drivers/s390/char/tape_core.c | 8 +- trunk/drivers/s390/cio/device.c | 4 - trunk/drivers/s390/cio/qdio_debug.c | 19 +- trunk/drivers/s390/cio/qdio_main.c | 1 + trunk/drivers/s390/kvm/kvm_virtio.c | 4 +- trunk/drivers/s390/net/qeth_core_main.c | 3 +- trunk/drivers/s390/net/qeth_l2_main.c | 27 +- trunk/drivers/s390/net/qeth_l3_main.c | 13 +- trunk/drivers/s390/net/qeth_l3_sys.c | 7 + trunk/drivers/s390/scsi/zfcp_aux.c | 3 +- trunk/drivers/s390/scsi/zfcp_ccw.c | 4 +- trunk/drivers/s390/scsi/zfcp_dbf.c | 42 +- trunk/drivers/s390/scsi/zfcp_dbf.h | 8 +- trunk/drivers/s390/scsi/zfcp_erp.c | 1 - trunk/drivers/s390/scsi/zfcp_fsf.c | 23 +- trunk/drivers/s390/scsi/zfcp_scsi.c | 12 +- trunk/drivers/sbus/char/jsflash.c | 1 + trunk/drivers/scsi/dpt_i2o.c | 4 +- trunk/drivers/scsi/fdomain.c | 2 - trunk/drivers/scsi/megaraid.c | 11 +- trunk/drivers/scsi/megaraid.h | 2 +- trunk/drivers/scsi/megaraid/megaraid_sas.c | 12 + trunk/drivers/scsi/qla2xxx/qla_def.h | 1 + trunk/drivers/scsi/qla2xxx/qla_init.c | 26 +- trunk/drivers/scsi/qla2xxx/qla_mbx.c | 2 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 1 - trunk/drivers/scsi/qla2xxx/qla_sup.c | 19 +- trunk/drivers/scsi/qla2xxx/qla_version.h | 2 +- trunk/drivers/scsi/scsi_error.c | 5 +- trunk/drivers/scsi/sg.c | 1 + trunk/drivers/serial/Kconfig | 4 +- trunk/drivers/serial/amba-pl010.c | 2 +- trunk/drivers/serial/amba-pl011.c | 2 +- trunk/drivers/serial/atmel_serial.c | 17 +- trunk/drivers/serial/crisv10.c | 4 +- trunk/drivers/serial/crisv10.h | 2 +- trunk/drivers/serial/netx-serial.c | 4 +- trunk/drivers/serial/pxa.c | 2 +- trunk/drivers/serial/serial_lh7a40x.c | 3 +- trunk/drivers/serial/sh-sci.c | 62 +- trunk/drivers/serial/sh-sci.h | 112 +- trunk/drivers/spi/atmel_spi.c | 3 - trunk/drivers/spi/pxa2xx_spi.c | 26 +- trunk/drivers/spi/spi_imx.c | 45 +- trunk/drivers/spi/spi_s3c24xx.c | 2 +- trunk/drivers/ssb/Kconfig | 5 +- trunk/drivers/staging/Kconfig | 20 +- trunk/drivers/staging/echo/echo.c | 1 + trunk/drivers/staging/me4000/me4000.c | 4 + trunk/drivers/staging/usbip/Kconfig | 2 +- trunk/drivers/telephony/ixj.c | 1 + trunk/drivers/telephony/phonedev.c | 2 +- trunk/drivers/uio/uio.c | 3 + trunk/drivers/usb/class/cdc-acm.c | 9 +- trunk/drivers/usb/class/usbtmc.c | 2 +- trunk/drivers/usb/core/hcd.c | 35 +- trunk/drivers/usb/core/hcd.h | 1 - trunk/drivers/usb/core/hub.c | 4 - trunk/drivers/usb/core/message.c | 1 - trunk/drivers/usb/core/sysfs.c | 2 +- trunk/drivers/usb/core/urb.c | 26 +- trunk/drivers/usb/gadget/f_acm.c | 4 - trunk/drivers/usb/gadget/f_rndis.c | 3 +- trunk/drivers/usb/gadget/inode.c | 1 + trunk/drivers/usb/gadget/pxa25x_udc.c | 16 +- trunk/drivers/usb/gadget/pxa27x_udc.c | 2 +- trunk/drivers/usb/gadget/s3c2410_udc.c | 4 +- trunk/drivers/usb/host/Kconfig | 23 +- trunk/drivers/usb/host/ehci-hcd.c | 25 +- trunk/drivers/usb/host/ehci-pci.c | 21 - trunk/drivers/usb/host/ehci-ps3.c | 1 - trunk/drivers/usb/host/ehci-sched.c | 4 +- trunk/drivers/usb/host/isp1760-if.c | 22 +- trunk/drivers/usb/host/ohci-ps3.c | 3 +- trunk/drivers/usb/host/ohci-pxa27x.c | 2 +- trunk/drivers/usb/host/r8a66597-hcd.c | 5 +- trunk/drivers/usb/misc/sisusbvga/sisusb.c | 1 - trunk/drivers/usb/misc/vstusb.c | 2 +- trunk/drivers/usb/mon/mon_bin.c | 5 +- trunk/drivers/usb/musb/musb_core.c | 6 +- trunk/drivers/usb/musb/musb_debug.h | 4 +- trunk/drivers/usb/musb/musb_host.c | 159 +- trunk/drivers/usb/musb/musb_host.h | 1 - trunk/drivers/usb/musb/omap2430.c | 2 - trunk/drivers/usb/musb/tusb6010.c | 2 +- trunk/drivers/usb/serial/cp2101.c | 3 - trunk/drivers/usb/serial/ir-usb.c | 2 +- trunk/drivers/usb/serial/option.c | 6 - trunk/drivers/usb/serial/usb-serial.c | 1 - trunk/drivers/usb/storage/Kconfig | 4 +- trunk/drivers/usb/storage/unusual_devs.h | 40 +- trunk/drivers/video/Kconfig | 34 +- trunk/drivers/video/Makefile | 1 - trunk/drivers/video/amba-clcd.c | 4 +- trunk/drivers/video/atmel_lcdfb.c | 2 +- trunk/drivers/video/backlight/corgi_lcd.c | 4 +- trunk/drivers/video/backlight/da903x.c | 2 - trunk/drivers/video/backlight/lcd.c | 11 +- trunk/drivers/video/cirrusfb.c | 5 +- trunk/drivers/video/console/fbcon.c | 2 +- trunk/drivers/video/fbmem.c | 63 +- trunk/drivers/video/mb862xx/Makefile | 5 - trunk/drivers/video/mb862xx/mb862xx_reg.h | 138 -- trunk/drivers/video/mb862xx/mb862xxfb.c | 1061 --------- trunk/drivers/video/mb862xx/mb862xxfb.h | 83 - trunk/drivers/video/omap/Makefile | 1 + trunk/drivers/video/omap/lcd_sx1.c | 327 +++ trunk/drivers/video/pxafb.c | 7 +- trunk/drivers/video/sa1100fb.c | 2 +- trunk/drivers/video/tmiofb.c | 10 +- trunk/drivers/video/via/global.h | 3 + trunk/drivers/video/via/viafbdev.c | 17 +- trunk/drivers/w1/masters/Kconfig | 7 - trunk/drivers/w1/masters/Makefile | 1 - trunk/drivers/w1/masters/omap_hdq.c | 725 ------ trunk/drivers/w1/slaves/Kconfig | 7 - trunk/drivers/w1/slaves/Makefile | 2 +- trunk/drivers/w1/slaves/w1_bq27000.c | 123 - trunk/drivers/w1/w1.h | 1 - trunk/drivers/w1/w1_io.c | 3 +- trunk/drivers/watchdog/Kconfig | 8 +- trunk/drivers/watchdog/acquirewdt.c | 6 +- trunk/drivers/watchdog/advantechwdt.c | 6 +- trunk/drivers/watchdog/at91sam9_wdt.c | 2 +- trunk/drivers/watchdog/bfin_wdt.c | 2 +- trunk/drivers/watchdog/booke_wdt.c | 5 +- trunk/drivers/watchdog/eurotechwdt.c | 4 +- trunk/drivers/watchdog/i6300esb.c | 3 +- trunk/drivers/watchdog/ib700wdt.c | 6 +- trunk/drivers/watchdog/indydog.c | 2 +- trunk/drivers/watchdog/mpcore_wdt.c | 4 +- trunk/drivers/watchdog/omap_wdt.c | 2 +- trunk/drivers/watchdog/pcwd_pci.c | 2 +- trunk/drivers/watchdog/pcwd_usb.c | 2 +- trunk/drivers/watchdog/rc32434_wdt.c | 3 +- trunk/drivers/watchdog/s3c2410_wdt.c | 4 +- trunk/drivers/watchdog/sa1100_wdt.c | 3 +- trunk/drivers/watchdog/sb_wdog.c | 4 +- trunk/drivers/watchdog/sbc8360.c | 6 +- trunk/drivers/watchdog/sbc_epx_c3.c | 2 +- trunk/drivers/watchdog/smsc37b787_wdt.c | 2 +- trunk/drivers/watchdog/softdog.c | 3 +- trunk/drivers/watchdog/w83627hf_wdt.c | 6 +- trunk/drivers/watchdog/w83697hf_wdt.c | 4 +- trunk/drivers/watchdog/wafer5823wdt.c | 4 +- trunk/drivers/watchdog/wdt.c | 4 +- trunk/drivers/watchdog/wdt285.c | 3 +- trunk/drivers/watchdog/wdt_pci.c | 4 +- trunk/drivers/xen/balloon.c | 10 +- trunk/drivers/xen/events.c | 2 +- trunk/drivers/xen/manage.c | 2 + trunk/drivers/xen/xencomm.c | 23 +- trunk/fs/Makefile | 2 + trunk/fs/autofs4/dev-ioctl.c | 5 +- trunk/fs/autofs4/expire.c | 19 +- trunk/fs/block_dev.c | 23 +- trunk/fs/cifs/CHANGES | 10 +- trunk/fs/cifs/cifs_debug.c | 277 ++- trunk/fs/cifs/cifs_dfs_ref.c | 71 +- trunk/fs/cifs/cifs_spnego.c | 4 +- trunk/fs/cifs/cifsfs.c | 30 +- trunk/fs/cifs/cifsglob.h | 51 +- trunk/fs/cifs/cifsproto.h | 2 +- trunk/fs/cifs/cifssmb.c | 136 +- trunk/fs/cifs/connect.c | 873 ++++--- trunk/fs/cifs/file.c | 30 +- trunk/fs/cifs/inode.c | 4 +- trunk/fs/cifs/misc.c | 93 +- trunk/fs/cifs/readdir.c | 5 +- trunk/fs/cifs/transport.c | 48 +- trunk/fs/coda/psdev.c | 2 +- trunk/fs/dlm/lockspace.c | 2 +- trunk/fs/ecryptfs/crypto.c | 15 +- trunk/fs/ecryptfs/keystore.c | 31 +- trunk/fs/ext3/super.c | 28 +- trunk/fs/ext4/balloc.c | 77 +- trunk/fs/ext4/ext4.h | 3 +- trunk/fs/ext4/ialloc.c | 2 - trunk/fs/ext4/inode.c | 7 +- trunk/fs/ext4/mballoc.c | 1 - trunk/fs/ext4/super.c | 35 +- trunk/fs/fat/Makefile | 6 +- trunk/fs/fat/cache.c | 25 +- trunk/fs/fat/dir.c | 20 +- trunk/fs/fat/fat.h | 329 --- trunk/fs/fat/fatent.c | 24 +- trunk/fs/fat/file.c | 49 +- trunk/fs/fat/inode.c | 133 +- trunk/fs/fat/misc.c | 155 +- trunk/fs/file_table.c | 4 - trunk/fs/fuse/dev.c | 1 + trunk/fs/hostfs/hostfs.h | 2 +- trunk/fs/hostfs/hostfs_kern.c | 4 +- trunk/fs/hostfs/hostfs_user.c | 2 +- trunk/fs/inotify.c | 150 +- trunk/fs/inotify_user.c | 3 + trunk/fs/jbd/checkpoint.c | 31 +- trunk/fs/jbd/transaction.c | 1 + trunk/fs/jbd2/checkpoint.c | 32 +- trunk/fs/jbd2/commit.c | 8 +- trunk/fs/jbd2/journal.c | 2 - trunk/fs/jffs2/background.c | 10 +- trunk/fs/jffs2/compr_lzo.c | 15 +- trunk/fs/jffs2/nodemgmt.c | 2 - trunk/fs/libfs.c | 2 +- trunk/fs/lockd/svc4proc.c | 1 - trunk/fs/lockd/svcproc.c | 1 - trunk/fs/msdos/Makefile | 7 + trunk/fs/{fat/namei_msdos.c => msdos/namei.c} | 42 +- trunk/fs/namei.c | 2 +- trunk/fs/namespace.c | 4 +- trunk/fs/nfs/inode.c | 13 +- trunk/fs/nfs/super.c | 2 +- trunk/fs/nfsd/vfs.c | 4 +- trunk/fs/ocfs2/file.c | 30 +- trunk/fs/ocfs2/inode.c | 6 - trunk/fs/ocfs2/journal.c | 1 - trunk/fs/ocfs2/mmap.c | 6 +- trunk/fs/ocfs2/namei.c | 8 +- trunk/fs/ocfs2/ocfs2.h | 3 - trunk/fs/ocfs2/ocfs2_fs.h | 17 +- trunk/fs/ocfs2/xattr.c | 372 ++- trunk/fs/ocfs2/xattr.h | 38 +- trunk/fs/partitions/check.c | 31 +- trunk/fs/pipe.c | 3 + trunk/fs/proc/array.c | 2 +- trunk/fs/proc/proc_sysctl.c | 1 - trunk/fs/proc/uptime.c | 38 +- trunk/fs/splice.c | 4 +- trunk/fs/vfat/Makefile | 7 + trunk/fs/{fat/namei_vfat.c => vfat/namei.c} | 161 +- trunk/fs/xfs/xfs_da_btree.c | 5 - trunk/fs/xfs/xfs_dir2.c | 6 - trunk/fs/xfs/xfs_inode.c | 2 +- trunk/fs/xfs/xfs_log.c | 39 +- trunk/fs/xfs/xfs_log_recover.c | 8 +- trunk/fs/xfs/xfs_mount.c | 5 +- trunk/include/acpi/acpi_bus.h | 2 - trunk/include/acpi/acpi_drivers.h | 22 +- trunk/include/acpi/acpixf.h | 4 +- trunk/include/acpi/actypes.h | 1 - .../plat => include/asm-arm/plat-s3c}/iic.h | 0 .../plat => include/asm-arm/plat-s3c}/nand.h | 0 .../asm-arm/plat-s3c}/regs-ac97.h | 0 .../asm-arm/plat-s3c}/regs-iic.h | 0 .../asm-arm/plat-s3c}/regs-nand.h | 0 .../asm-arm/plat-s3c}/regs-rtc.h | 0 .../asm-arm/plat-s3c}/regs-watchdog.h | 0 .../asm-arm/plat-s3c24xx}/mci.h | 0 .../asm-arm/plat-s3c24xx}/regs-spi.h | 0 .../asm-arm/plat-s3c24xx}/regs-udc.h | 0 .../asm-arm/plat-s3c24xx}/udc.h | 0 .../include/asm => include/asm-cris}/Kbuild | 0 .../arch => include/asm-cris/arch-v10}/Kbuild | 0 .../asm-cris/arch-v10}/atomic.h | 0 .../asm-cris/arch-v10}/bitops.h | 0 .../arch => include/asm-cris/arch-v10}/bug.h | 0 .../asm-cris/arch-v10}/byteorder.h | 0 .../asm-cris/arch-v10}/cache.h | 0 .../asm-cris/arch-v10}/checksum.h | 0 .../asm-cris/arch-v10}/delay.h | 0 .../arch => include/asm-cris/arch-v10}/dma.h | 0 .../arch => include/asm-cris/arch-v10}/elf.h | 0 .../arch => include/asm-cris/arch-v10}/io.h | 2 +- .../asm-cris/arch-v10}/io_interface_mux.h | 0 .../arch => include/asm-cris/arch-v10}/irq.h | 2 +- .../asm-cris/arch-v10}/memmap.h | 0 .../arch => include/asm-cris/arch-v10}/mmu.h | 0 .../asm-cris/arch-v10}/offset.h | 0 .../arch => include/asm-cris/arch-v10}/page.h | 0 .../asm-cris/arch-v10}/pgtable.h | 0 .../asm-cris/arch-v10}/processor.h | 0 .../asm-cris/arch-v10}/ptrace.h | 0 .../asm-cris/arch-v10}/sv_addr.agh | 0 .../asm-cris/arch-v10}/sv_addr_ag.h | 0 .../asm-cris/arch-v10}/svinto.h | 0 .../asm-cris/arch-v10}/system.h | 0 .../asm-cris/arch-v10}/thread_info.h | 0 .../asm-cris/arch-v10}/timex.h | 0 .../arch => include/asm-cris/arch-v10}/tlb.h | 0 .../asm-cris/arch-v10}/uaccess.h | 0 .../asm-cris/arch-v10}/unistd.h | 0 .../arch => include/asm-cris/arch-v10}/user.h | 0 .../arch => include/asm-cris/arch-v32}/Kbuild | 0 trunk/include/asm-cris/arch-v32/arbiter.h | 30 + .../asm-cris/arch-v32}/atomic.h | 0 .../asm-cris/arch-v32}/bitops.h | 0 .../arch => include/asm-cris/arch-v32}/bug.h | 0 .../asm-cris/arch-v32}/byteorder.h | 0 .../asm-cris/arch-v32}/cache.h | 2 +- .../asm-cris/arch-v32}/checksum.h | 0 .../asm-cris/arch-v32}/cryptocop.h | 2 +- .../asm-cris/arch-v32}/delay.h | 0 .../arch => include/asm-cris/arch-v32}/dma.h | 0 .../arch => include/asm-cris/arch-v32}/elf.h | 0 .../asm-cris/arch-v32}/hwregs/Makefile | 0 .../arch-v32}/hwregs/asm/ata_defs_asm.h | 0 .../arch-v32}/hwregs/asm/bif_core_defs_asm.h | 0 .../arch-v32}/hwregs/asm/bif_dma_defs_asm.h | 0 .../arch-v32}/hwregs/asm/bif_slave_defs_asm.h | 0 .../arch-v32}/hwregs/asm/config_defs_asm.h | 0 .../asm-cris/arch-v32}/hwregs/asm/cpu_vect.h | 0 .../arch-v32}/hwregs/asm/cris_defs_asm.h | 0 .../arch-v32}/hwregs/asm/cris_supp_reg.h | 0 .../arch-v32}/hwregs/asm/dma_defs_asm.h | 0 .../arch-v32}/hwregs/asm/eth_defs_asm.h | 0 .../arch-v32}/hwregs/asm/gio_defs_asm.h | 0 .../asm-cris/arch-v32}/hwregs/asm/intr_vect.h | 0 .../arch-v32}/hwregs/asm/intr_vect_defs_asm.h | 0 .../arch-v32}/hwregs/asm/irq_nmi_defs_asm.h | 0 .../arch-v32}/hwregs/asm/marb_defs_asm.h | 0 .../arch-v32}/hwregs/asm/mmu_defs_asm.h | 0 .../arch-v32}/hwregs/asm/mmu_supp_reg.h | 0 .../arch-v32/hwregs/asm/pinmux_defs_asm.h | 632 ++++++ .../arch-v32/hwregs/asm/reg_map_asm.h | 96 + .../arch-v32}/hwregs/asm/rt_trace_defs_asm.h | 0 .../arch-v32}/hwregs/asm/ser_defs_asm.h | 0 .../arch-v32}/hwregs/asm/sser_defs_asm.h | 0 .../arch-v32}/hwregs/asm/strcop_defs_asm.h | 0 .../arch-v32}/hwregs/asm/strmux_defs_asm.h | 0 .../arch-v32}/hwregs/asm/timer_defs_asm.h | 0 .../asm-cris/arch-v32}/hwregs/ata_defs.h | 0 .../asm-cris/arch-v32}/hwregs/bif_core_defs.h | 0 .../asm-cris/arch-v32}/hwregs/bif_dma_defs.h | 0 .../arch-v32}/hwregs/bif_slave_defs.h | 0 .../asm-cris/arch-v32}/hwregs/config_defs.h | 0 .../asm-cris/arch-v32}/hwregs/cpu_vect.h | 0 .../asm-cris/arch-v32}/hwregs/dma.h | 0 .../asm-cris/arch-v32}/hwregs/dma_defs.h | 0 .../asm-cris/arch-v32}/hwregs/eth_defs.h | 0 .../asm-cris/arch-v32}/hwregs/extmem_defs.h | 0 .../asm-cris/arch-v32/hwregs/gio_defs.h | 295 +++ .../asm-cris/arch-v32/hwregs/intr_vect.h | 39 + .../asm-cris/arch-v32}/hwregs/iop/Makefile | 0 .../hwregs/iop/asm/iop_crc_par_defs_asm.h | 0 .../hwregs/iop/asm/iop_dmc_in_defs_asm.h | 0 .../hwregs/iop/asm/iop_dmc_out_defs_asm.h | 0 .../hwregs/iop/asm/iop_fifo_in_defs_asm.h | 0 .../iop/asm/iop_fifo_in_extra_defs_asm.h | 0 .../hwregs/iop/asm/iop_fifo_out_defs_asm.h | 0 .../iop/asm/iop_fifo_out_extra_defs_asm.h | 0 .../hwregs/iop/asm/iop_mpu_defs_asm.h | 0 .../hwregs/iop/asm/iop_reg_space_asm.h | 0 .../hwregs/iop/asm/iop_sap_in_defs_asm.h | 0 .../hwregs/iop/asm/iop_sap_out_defs_asm.h | 0 .../hwregs/iop/asm/iop_scrc_in_defs_asm.h | 0 .../hwregs/iop/asm/iop_scrc_out_defs_asm.h | 0 .../hwregs/iop/asm/iop_spu_defs_asm.h | 0 .../hwregs/iop/asm/iop_sw_cfg_defs_asm.h | 0 .../hwregs/iop/asm/iop_sw_cpu_defs_asm.h | 0 .../hwregs/iop/asm/iop_sw_mpu_defs_asm.h | 0 .../hwregs/iop/asm/iop_sw_spu_defs_asm.h | 0 .../hwregs/iop/asm/iop_timer_grp_defs_asm.h | 0 .../hwregs/iop/asm/iop_trigger_grp_defs_asm.h | 0 .../hwregs/iop/asm/iop_version_defs_asm.h | 0 .../arch-v32}/hwregs/iop/iop_crc_par_defs.h | 0 .../arch-v32}/hwregs/iop/iop_dmc_in_defs.h | 0 .../arch-v32}/hwregs/iop/iop_dmc_out_defs.h | 0 .../arch-v32}/hwregs/iop/iop_fifo_in_defs.h | 0 .../hwregs/iop/iop_fifo_in_extra_defs.h | 0 .../arch-v32}/hwregs/iop/iop_fifo_out_defs.h | 0 .../hwregs/iop/iop_fifo_out_extra_defs.h | 0 .../arch-v32}/hwregs/iop/iop_mpu_defs.h | 0 .../arch-v32}/hwregs/iop/iop_mpu_macros.h | 0 .../arch-v32}/hwregs/iop/iop_reg_space.h | 0 .../arch-v32}/hwregs/iop/iop_sap_in_defs.h | 0 .../arch-v32}/hwregs/iop/iop_sap_out_defs.h | 0 .../arch-v32}/hwregs/iop/iop_scrc_in_defs.h | 0 .../arch-v32}/hwregs/iop/iop_scrc_out_defs.h | 0 .../arch-v32}/hwregs/iop/iop_spu_defs.h | 0 .../arch-v32}/hwregs/iop/iop_sw_cfg_defs.h | 0 .../arch-v32}/hwregs/iop/iop_sw_cpu_defs.h | 0 .../arch-v32}/hwregs/iop/iop_sw_mpu_defs.h | 0 .../arch-v32}/hwregs/iop/iop_sw_spu_defs.h | 0 .../arch-v32}/hwregs/iop/iop_timer_grp_defs.h | 0 .../hwregs/iop/iop_trigger_grp_defs.h | 0 .../arch-v32}/hwregs/iop/iop_version_defs.h | 0 .../asm-cris/arch-v32}/hwregs/irq_nmi_defs.h | 0 .../asm-cris/arch-v32}/hwregs/marb_bp_defs.h | 0 .../asm-cris/arch-v32}/hwregs/marb_defs.h | 0 .../asm-cris/arch-v32/hwregs/pinmux_defs.h | 357 +++ .../asm-cris/arch-v32}/hwregs/reg_rdwr.h | 0 .../asm-cris/arch-v32}/hwregs/rt_trace_defs.h | 0 .../asm-cris/arch-v32}/hwregs/ser_defs.h | 0 .../asm-cris/arch-v32}/hwregs/sser_defs.h | 0 .../asm-cris/arch-v32}/hwregs/strcop.h | 0 .../asm-cris/arch-v32}/hwregs/strcop_defs.h | 0 .../asm-cris/arch-v32/hwregs/strmux_defs.h | 127 ++ .../asm-cris/arch-v32}/hwregs/supp_reg.h | 0 .../asm-cris/arch-v32}/intmem.h | 0 .../arch => include/asm-cris/arch-v32}/io.h | 4 +- .../arch => include/asm-cris/arch-v32}/irq.h | 0 .../asm-cris/arch-v32/mach-a3}/arbiter.h | 0 .../asm-cris/arch-v32/mach-a3}/dma.h | 0 .../mach-a3}/hwregs/asm/clkgen_defs_asm.h | 0 .../mach-a3}/hwregs/asm/ddr2_defs_asm.h | 0 .../mach-a3}/hwregs/asm/gio_defs_asm.h | 0 .../mach-a3}/hwregs/asm/pinmux_defs_asm.h | 0 .../mach-a3}/hwregs/asm/pio_defs_asm.h | 0 .../mach-a3}/hwregs/asm/reg_map_asm.h | 0 .../mach-a3}/hwregs/asm/timer_defs_asm.h | 0 .../arch-v32/mach-a3}/hwregs/clkgen_defs.h | 0 .../arch-v32/mach-a3}/hwregs/ddr2_defs.h | 0 .../arch-v32/mach-a3}/hwregs/gio_defs.h | 0 .../arch-v32/mach-a3}/hwregs/intr_vect.h | 0 .../arch-v32/mach-a3}/hwregs/intr_vect_defs.h | 0 .../hwregs/iop/asm/iop_reg_space_asm.h | 0 .../hwregs/iop/asm/iop_sap_in_defs_asm.h | 0 .../hwregs/iop/asm/iop_sap_out_defs_asm.h | 0 .../hwregs/iop/asm/iop_sw_cfg_defs_asm.h | 0 .../hwregs/iop/asm/iop_sw_cpu_defs_asm.h | 0 .../hwregs/iop/asm/iop_sw_mpu_defs_asm.h | 0 .../hwregs/iop/asm/iop_sw_spu_defs_asm.h | 0 .../hwregs/iop/asm/iop_version_defs_asm.h | 0 .../mach-a3}/hwregs/iop/iop_reg_space.h | 0 .../mach-a3}/hwregs/iop/iop_sap_in_defs.h | 0 .../mach-a3}/hwregs/iop/iop_sap_out_defs.h | 0 .../mach-a3}/hwregs/iop/iop_sw_cfg_defs.h | 0 .../mach-a3}/hwregs/iop/iop_sw_cpu_defs.h | 0 .../mach-a3}/hwregs/iop/iop_sw_mpu_defs.h | 0 .../mach-a3}/hwregs/iop/iop_sw_spu_defs.h | 0 .../mach-a3}/hwregs/iop/iop_version_defs.h | 0 .../arch-v32/mach-a3}/hwregs/l2cache_defs.h | 0 .../arch-v32/mach-a3}/hwregs/marb_bar_defs.h | 0 .../arch-v32/mach-a3}/hwregs/marb_foo_defs.h | 0 .../arch-v32/mach-a3}/hwregs/pinmux_defs.h | 0 .../arch-v32/mach-a3}/hwregs/pio_defs.h | 0 .../arch-v32/mach-a3}/hwregs/reg_map.h | 0 .../arch-v32/mach-a3}/hwregs/strmux_defs.h | 0 .../arch-v32/mach-a3}/hwregs/timer_defs.h | 0 .../asm-cris/arch-v32/mach-a3}/memmap.h | 0 .../asm-cris/arch-v32/mach-a3}/pinmux.h | 0 .../asm-cris/arch-v32/mach-a3}/startup.inc | 0 .../asm-cris/arch-v32/mach-fs}/arbiter.h | 0 .../mach-fs}/hwregs/asm/bif_core_defs_asm.h | 0 .../mach-fs}/hwregs/asm/config_defs_asm.h | 0 .../mach-fs}/hwregs/asm/gio_defs_asm.h | 0 .../mach-fs}/hwregs/asm/pinmux_defs_asm.h | 0 .../mach-fs}/hwregs/asm/reg_map_asm.h | 0 .../mach-fs}/hwregs/asm/timer_defs_asm.h | 0 .../arch-v32/mach-fs}/hwregs/bif_core_defs.h | 0 .../arch-v32/mach-fs}/hwregs/bif_dma_defs.h | 0 .../arch-v32/mach-fs}/hwregs/bif_slave_defs.h | 0 .../arch-v32/mach-fs}/hwregs/config_defs.h | 0 .../arch-v32/mach-fs}/hwregs/gio_defs.h | 0 .../arch-v32/mach-fs}/hwregs/intr_vect.h | 0 .../arch-v32/mach-fs}/hwregs/intr_vect_defs.h | 0 .../arch-v32/mach-fs}/hwregs/marb_bp_defs.h | 0 .../arch-v32/mach-fs}/hwregs/marb_defs.h | 0 .../arch-v32/mach-fs}/hwregs/pinmux_defs.h | 0 .../arch-v32/mach-fs}/hwregs/reg_map.h | 0 .../arch-v32/mach-fs}/hwregs/strmux_defs.h | 0 .../arch-v32/mach-fs}/hwregs/timer_defs.h | 0 .../asm-cris/arch-v32/mach-fs}/pinmux.h | 0 .../asm-cris/arch-v32/mach-fs}/startup.inc | 0 .../asm-cris/arch-v32}/memmap.h | 0 .../arch => include/asm-cris/arch-v32}/mmu.h | 0 .../asm-cris/arch-v32}/offset.h | 0 .../arch => include/asm-cris/arch-v32}/page.h | 0 .../asm-cris/arch-v32}/pgtable.h | 0 trunk/include/asm-cris/arch-v32/pinmux.h | 40 + .../asm-cris/arch-v32}/processor.h | 0 .../asm-cris/arch-v32}/ptrace.h | 0 .../asm-cris/arch-v32}/spinlock.h | 0 .../asm-cris/arch-v32}/system.h | 0 .../asm-cris/arch-v32}/thread_info.h | 0 .../asm-cris/arch-v32}/timex.h | 0 .../arch => include/asm-cris/arch-v32}/tlb.h | 0 .../asm-cris/arch-v32}/uaccess.h | 0 .../asm-cris/arch-v32}/unistd.h | 0 .../arch => include/asm-cris/arch-v32}/user.h | 0 .../include/asm => include/asm-cris}/atomic.h | 2 +- .../include/asm => include/asm-cris}/auxvec.h | 0 .../asm => include/asm-cris}/axisflashmap.h | 0 .../include/asm => include/asm-cris}/bitops.h | 2 +- .../include/asm => include/asm-cris}/bug.h | 2 +- .../include/asm => include/asm-cris}/bugs.h | 0 .../asm => include/asm-cris}/byteorder.h | 2 +- .../include/asm => include/asm-cris}/cache.h | 2 +- .../asm => include/asm-cris}/cacheflush.h | 0 .../asm => include/asm-cris}/checksum.h | 2 +- .../asm => include/asm-cris}/cputime.h | 0 .../asm => include/asm-cris}/current.h | 0 .../include/asm => include/asm-cris}/delay.h | 2 +- .../include/asm => include/asm-cris}/device.h | 0 .../include/asm => include/asm-cris}/div64.h | 0 .../asm => include/asm-cris}/dma-mapping.h | 0 .../include/asm => include/asm-cris}/dma.h | 2 +- .../include/asm => include/asm-cris}/elf.h | 2 +- .../asm-cris}/emergency-restart.h | 0 .../include/asm => include/asm-cris}/errno.h | 0 .../asm => include/asm-cris}/eshlibld.h | 0 .../asm => include/asm-cris}/ethernet.h | 0 .../asm => include/asm-cris}/etraxgpio.h | 0 .../asm => include/asm-cris}/etraxi2c.h | 0 .../asm => include/asm-cris}/fasttimer.h | 0 .../include/asm => include/asm-cris}/fb.h | 0 .../include/asm => include/asm-cris}/fcntl.h | 0 .../include/asm => include/asm-cris}/futex.h | 0 .../asm => include/asm-cris}/hardirq.h | 0 .../include/asm => include/asm-cris}/hw_irq.h | 0 .../include/asm => include/asm-cris}/io.h | 2 +- .../include/asm => include/asm-cris}/ioctl.h | 0 .../include/asm => include/asm-cris}/ioctls.h | 0 .../include/asm => include/asm-cris}/ipcbuf.h | 0 .../include/asm => include/asm-cris}/irq.h | 2 +- .../asm => include/asm-cris}/irq_regs.h | 0 .../include/asm => include/asm-cris}/kdebug.h | 0 .../asm => include/asm-cris}/kmap_types.h | 0 .../asm => include/asm-cris}/linkage.h | 0 .../include/asm => include/asm-cris}/local.h | 0 .../include/asm => include/asm-cris}/mman.h | 0 .../include/asm => include/asm-cris}/mmu.h | 2 +- .../asm => include/asm-cris}/mmu_context.h | 0 .../include/asm => include/asm-cris}/module.h | 0 .../include/asm => include/asm-cris}/msgbuf.h | 0 .../include/asm => include/asm-cris}/mutex.h | 0 .../include/asm => include/asm-cris}/page.h | 2 +- .../include/asm => include/asm-cris}/param.h | 0 .../include/asm => include/asm-cris}/pci.h | 0 .../include/asm => include/asm-cris}/percpu.h | 0 .../asm => include/asm-cris}/pgalloc.h | 0 .../asm => include/asm-cris}/pgtable.h | 2 +- .../include/asm => include/asm-cris}/poll.h | 0 .../asm => include/asm-cris}/posix_types.h | 0 .../asm => include/asm-cris}/processor.h | 2 +- .../include/asm => include/asm-cris}/ptrace.h | 2 +- .../asm => include/asm-cris}/resource.h | 0 .../include/asm => include/asm-cris}/rs485.h | 0 .../include/asm => include/asm-cris}/rtc.h | 0 .../asm => include/asm-cris}/scatterlist.h | 0 .../asm => include/asm-cris}/sections.h | 0 .../asm => include/asm-cris}/segment.h | 0 .../include/asm => include/asm-cris}/sembuf.h | 0 .../include/asm => include/asm-cris}/setup.h | 0 .../include/asm => include/asm-cris}/shmbuf.h | 0 .../asm => include/asm-cris}/shmparam.h | 0 .../asm => include/asm-cris}/sigcontext.h | 0 .../asm => include/asm-cris}/siginfo.h | 0 .../include/asm => include/asm-cris}/signal.h | 0 .../include/asm => include/asm-cris}/smp.h | 0 .../include/asm => include/asm-cris}/socket.h | 0 .../asm => include/asm-cris}/sockios.h | 0 trunk/include/asm-cris/spinlock.h | 1 + .../include/asm => include/asm-cris}/stat.h | 0 .../include/asm => include/asm-cris}/statfs.h | 0 .../include/asm => include/asm-cris}/string.h | 0 .../asm => include/asm-cris}/sync_serial.h | 0 .../include/asm => include/asm-cris}/system.h | 2 +- .../asm => include/asm-cris}/termbits.h | 0 .../asm => include/asm-cris}/termios.h | 0 .../asm => include/asm-cris}/thread_info.h | 2 +- .../include/asm => include/asm-cris}/timex.h | 2 +- .../include/asm => include/asm-cris}/tlb.h | 2 +- .../asm => include/asm-cris}/tlbflush.h | 0 .../asm => include/asm-cris}/topology.h | 0 .../include/asm => include/asm-cris}/types.h | 0 .../asm => include/asm-cris}/uaccess.h | 2 +- .../asm => include/asm-cris}/ucontext.h | 0 .../asm => include/asm-cris}/unaligned.h | 0 .../include/asm => include/asm-cris}/unistd.h | 2 +- .../include/asm => include/asm-cris}/user.h | 2 +- trunk/include/asm-generic/kdebug.h | 1 - trunk/include/asm-generic/memory_model.h | 2 +- trunk/include/drm/drmP.h | 5 + trunk/include/drm/drm_pciids.h | 46 +- trunk/include/drm/i915_drm.h | 13 - trunk/include/linux/acpi.h | 48 +- trunk/include/linux/bio.h | 6 +- trunk/include/linux/c2port.h | 65 - trunk/include/linux/cgroup.h | 4 + trunk/include/linux/cnt32_to_63.h | 22 +- trunk/include/linux/cpumask.h | 559 +---- trunk/include/linux/cpuset.h | 4 + trunk/include/linux/freezer.h | 5 + trunk/include/linux/fs.h | 7 + trunk/include/linux/fsl_devices.h | 3 +- trunk/include/linux/ftrace.h | 48 +- trunk/include/linux/genhd.h | 4 +- trunk/include/linux/hid.h | 7 - trunk/include/linux/highmem.h | 2 - trunk/include/linux/hrtimer.h | 7 +- trunk/include/linux/i7300_idle.h | 83 - trunk/include/linux/if_vlan.h | 7 - trunk/include/linux/init.h | 6 +- trunk/include/linux/inotify.h | 11 - trunk/include/linux/input.h | 2 - trunk/include/linux/io-mapping.h | 125 - trunk/include/linux/kernel.h | 46 +- trunk/include/linux/kvm.h | 6 - trunk/include/linux/kvm_host.h | 7 +- trunk/include/linux/libata.h | 4 - trunk/include/linux/lockdep.h | 5 +- trunk/include/linux/mfd/wm8350/rtc.h | 2 - trunk/include/linux/mmc/card.h | 2 +- trunk/include/linux/mmc/host.h | 2 +- trunk/include/linux/mmc/sdio_func.h | 2 +- trunk/include/linux/mod_devicetable.h | 1 - trunk/include/linux/msdos_fs.h | 281 ++- trunk/include/linux/mtd/cfi.h | 22 +- trunk/include/linux/net.h | 6 +- trunk/include/linux/netdevice.h | 1 + trunk/include/linux/pci.h | 2 +- trunk/include/linux/phonet.h | 1 - trunk/include/linux/raid/md_k.h | 8 +- trunk/include/linux/ratelimit.h | 7 + trunk/include/linux/resource.h | 4 +- trunk/include/linux/ring_buffer.h | 3 - trunk/include/linux/sched.h | 15 +- trunk/include/linux/security.h | 6 - trunk/include/linux/serial_core.h | 3 - trunk/include/linux/slab.h | 28 - trunk/include/linux/smp.h | 9 - trunk/include/linux/spi/spi_bitbang.h | 3 - trunk/include/linux/ssb/ssb.h | 42 +- trunk/include/linux/string.h | 2 +- trunk/include/linux/syscalls.h | 3 +- trunk/include/linux/telephony.h | 2 +- trunk/include/linux/timer.h | 5 - trunk/include/linux/topology.h | 8 +- trunk/include/linux/usb.h | 2 - trunk/include/linux/workqueue.h | 8 - trunk/include/net/af_unix.h | 1 - trunk/include/net/mac80211.h | 31 +- trunk/include/net/net_namespace.h | 2 - trunk/include/net/phonet/phonet.h | 2 +- trunk/include/net/scm.h | 5 +- trunk/include/net/sock.h | 3 +- trunk/include/scsi/scsi_tcq.h | 14 +- trunk/include/sound/core.h | 10 +- trunk/include/sound/soc.h | 3 +- trunk/include/video/atmel_lcdc.h | 2 +- trunk/init/Kconfig | 24 +- trunk/init/do_mounts_md.c | 3 +- trunk/ipc/util.c | 14 +- trunk/kernel/Makefile | 8 +- trunk/kernel/audit_tree.c | 91 +- trunk/kernel/auditfilter.c | 14 +- trunk/kernel/cgroup.c | 22 +- trunk/kernel/cgroup_freezer.c | 70 +- trunk/kernel/cpu.c | 3 - trunk/kernel/cpuset.c | 31 +- trunk/kernel/exit.c | 14 +- trunk/kernel/fork.c | 11 - trunk/kernel/freezer.c | 20 +- trunk/kernel/hrtimer.c | 26 +- trunk/kernel/irq/proc.c | 2 +- trunk/kernel/kallsyms.c | 17 +- trunk/kernel/kprobes.c | 23 +- trunk/kernel/lockdep.c | 17 +- trunk/kernel/posix-cpu-timers.c | 7 +- trunk/kernel/power/Kconfig | 2 +- trunk/kernel/power/main.c | 2 +- trunk/kernel/printk.c | 39 + trunk/kernel/profile.c | 4 +- trunk/kernel/relay.c | 9 +- trunk/kernel/resource.c | 8 +- trunk/kernel/sched.c | 44 +- trunk/kernel/sched_debug.c | 48 +- trunk/kernel/sched_fair.c | 248 +- trunk/kernel/sched_features.h | 1 - trunk/kernel/sched_idletask.c | 5 +- trunk/kernel/sched_rt.c | 5 +- trunk/kernel/sched_stats.h | 15 +- trunk/kernel/signal.c | 3 +- trunk/kernel/smp.c | 18 +- trunk/kernel/softirq.c | 7 +- trunk/kernel/stop_machine.c | 5 +- trunk/kernel/sys_ni.c | 2 +- trunk/kernel/sysctl.c | 2 +- trunk/kernel/time/tick-sched.c | 4 - trunk/kernel/timer.c | 129 +- trunk/kernel/trace/Kconfig | 31 +- trunk/kernel/trace/Makefile | 6 +- trunk/kernel/trace/ftrace.c | 751 +++++-- trunk/kernel/trace/ring_buffer.c | 180 +- trunk/kernel/trace/trace.c | 83 +- trunk/kernel/trace/trace.h | 22 +- trunk/kernel/trace/trace_functions.c | 2 +- trunk/kernel/trace/trace_irqsoff.c | 4 +- trunk/kernel/trace/trace_sched_wakeup.c | 4 +- trunk/kernel/trace/trace_selftest.c | 18 +- trunk/kernel/trace/trace_stack.c | 4 - trunk/kernel/tracepoint.c | 8 - trunk/kernel/workqueue.c | 45 - trunk/lib/Makefile | 2 +- trunk/lib/cpumask.c | 79 - trunk/lib/dynamic_printk.c | 4 +- trunk/lib/scatterlist.c | 2 +- trunk/lib/swiotlb.c | 16 +- trunk/mm/filemap.c | 242 +- trunk/mm/hugetlb.c | 54 +- trunk/mm/internal.h | 29 - trunk/mm/memory_hotplug.c | 3 + trunk/mm/mempolicy.c | 18 +- trunk/mm/migrate.c | 7 +- trunk/mm/mlock.c | 18 +- trunk/mm/mmap.c | 5 +- trunk/mm/nommu.c | 3 +- trunk/mm/oom_kill.c | 3 +- trunk/mm/page_alloc.c | 32 +- trunk/mm/page_cgroup.c | 4 +- trunk/mm/page_isolation.c | 5 +- trunk/mm/shmem.c | 8 +- trunk/mm/sparse-vmemmap.c | 2 +- trunk/mm/vmalloc.c | 33 +- trunk/mm/vmscan.c | 44 +- trunk/net/8021q/vlan_core.c | 46 +- trunk/net/8021q/vlanproc.c | 2 +- trunk/net/9p/Kconfig | 10 +- trunk/net/9p/client.c | 59 +- trunk/net/9p/trans_rdma.c | 5 +- trunk/net/compat.c | 54 +- trunk/net/core/dev.c | 3 - trunk/net/core/net_namespace.c | 32 - trunk/net/core/pktgen.c | 28 +- trunk/net/core/rtnetlink.c | 4 +- trunk/net/core/scm.c | 22 +- trunk/net/core/skbuff.c | 14 +- trunk/net/core/sock.c | 2 + trunk/net/dsa/slave.c | 72 +- trunk/net/dsa/tag_dsa.c | 1 - trunk/net/dsa/tag_edsa.c | 1 - trunk/net/dsa/tag_trailer.c | 1 - trunk/net/ipv4/af_inet.c | 1 - trunk/net/ipv4/cipso_ipv4.c | 7 +- trunk/net/ipv4/ip_input.c | 10 +- trunk/net/ipv4/ipmr.c | 9 +- trunk/net/ipv4/proc.c | 58 +- trunk/net/ipv4/tcp.c | 3 +- trunk/net/ipv4/tcp_htcp.c | 14 +- trunk/net/ipv4/tcp_output.c | 10 +- trunk/net/ipv4/udp.c | 13 +- trunk/net/ipv4/xfrm4_state.c | 1 - trunk/net/ipv6/addrconf.c | 4 +- trunk/net/ipv6/datagram.c | 5 - trunk/net/ipv6/ip6mr.c | 13 +- trunk/net/ipv6/ipv6_sockglue.c | 5 - trunk/net/ipv6/proc.c | 6 +- trunk/net/ipv6/udp.c | 36 +- trunk/net/ipv6/xfrm6_state.c | 1 - trunk/net/key/af_key.c | 2 +- trunk/net/mac80211/debugfs_sta.c | 2 +- trunk/net/mac80211/mlme.c | 22 + trunk/net/mac80211/rc80211_minstrel_debugfs.c | 6 +- trunk/net/netfilter/ipvs/ip_vs_xmit.c | 3 +- trunk/net/netfilter/nf_conntrack_helper.c | 3 - trunk/net/netfilter/nf_conntrack_proto.c | 5 - trunk/net/netfilter/nf_conntrack_proto_gre.c | 4 +- trunk/net/netlabel/netlabel_addrlist.c | 2 - trunk/net/netlabel/netlabel_addrlist.h | 22 - trunk/net/netlabel/netlabel_mgmt.c | 2 +- trunk/net/phonet/af_phonet.c | 61 +- trunk/net/rfkill/rfkill-input.c | 5 - trunk/net/rfkill/rfkill.c | 2 +- trunk/net/sched/sch_api.c | 2 - trunk/net/sched/sch_generic.c | 7 +- trunk/net/socket.c | 81 +- trunk/net/sunrpc/auth.c | 18 +- trunk/net/sunrpc/auth_generic.c | 20 +- trunk/net/sunrpc/xprtsock.c | 58 +- trunk/net/unix/af_unix.c | 33 +- trunk/net/unix/garbage.c | 49 +- trunk/net/xfrm/xfrm_policy.c | 6 +- trunk/net/xfrm/xfrm_user.c | 2 +- trunk/scripts/Makefile.build | 10 +- trunk/scripts/Makefile.modpost | 2 +- trunk/scripts/bootgraph.pl | 19 +- trunk/scripts/checksyscalls.sh | 4 +- trunk/scripts/headers_check.pl | 10 +- trunk/scripts/headers_install.pl | 17 +- trunk/scripts/kernel-doc | 6 +- trunk/scripts/mod/sumversion.c | 12 +- trunk/scripts/package/builddeb | 24 +- trunk/scripts/package/mkspec | 5 +- trunk/scripts/recordmcount.pl | 28 +- trunk/scripts/setlocalversion | 6 +- trunk/security/commoncap.c | 6 +- trunk/security/keys/internal.h | 1 - trunk/security/keys/process_keys.c | 2 +- trunk/security/keys/request_key.c | 4 - trunk/security/security.c | 9 - trunk/security/selinux/hooks.c | 8 +- trunk/sound/aoa/soundbus/core.c | 2 +- trunk/sound/core/control.c | 8 +- trunk/sound/core/init.c | 5 +- trunk/sound/core/pcm_native.c | 1 + trunk/sound/core/rawmidi.c | 8 - trunk/sound/core/timer.c | 1 + trunk/sound/drivers/ml403-ac97cr.c | 4 +- trunk/sound/drivers/pcsp/pcsp_input.c | 4 +- trunk/sound/isa/Kconfig | 2 +- trunk/sound/isa/ad1848/ad1848.c | 6 +- trunk/sound/isa/adlib.c | 12 +- trunk/sound/isa/cs423x/cs4231.c | 8 +- trunk/sound/isa/cs423x/cs4236.c | 8 +- trunk/sound/isa/es1688/es1688.c | 9 +- trunk/sound/isa/gus/gusclassic.c | 13 +- trunk/sound/isa/gus/gusextreme.c | 19 +- trunk/sound/isa/sb/sb8.c | 4 +- trunk/sound/oss/dmasound/dmasound.h | 2 +- trunk/sound/oss/dmasound/dmasound_core.c | 4 +- trunk/sound/oss/kahlua.c | 2 +- trunk/sound/pci/ac97/ac97_codec.c | 6 +- trunk/sound/pci/ad1889.c | 2 +- trunk/sound/pci/atiixp.c | 2 +- trunk/sound/pci/atiixp_modem.c | 2 +- trunk/sound/pci/au88x0/au88x0.c | 3 +- trunk/sound/pci/bt87x.c | 3 +- trunk/sound/pci/cs4281.c | 4 +- trunk/sound/pci/cs5530.c | 4 +- trunk/sound/pci/emu10k1/emu10k1_main.c | 3 - trunk/sound/pci/hda/hda_beep.c | 8 - trunk/sound/pci/hda/hda_beep.h | 1 - trunk/sound/pci/hda/hda_codec.c | 1 - trunk/sound/pci/hda/hda_intel.c | 31 +- trunk/sound/pci/hda/hda_proc.c | 2 - trunk/sound/pci/hda/patch_analog.c | 3 - trunk/sound/pci/hda/patch_realtek.c | 107 +- trunk/sound/pci/hda/patch_sigmatel.c | 204 +- trunk/sound/pci/ice1712/ice1712.c | 6 +- trunk/sound/pci/intel8x0.c | 1 - trunk/sound/pci/mixart/mixart.c | 3 +- trunk/sound/pci/pcxhr/pcxhr.c | 5 +- trunk/sound/pci/rme9652/hdsp.c | 27 +- trunk/sound/soc/blackfin/bf5xx-i2s.c | 34 +- trunk/sound/soc/codecs/wm9713.c | 2 +- trunk/sound/soc/fsl/mpc5200_psc_i2s.c | 14 +- trunk/sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- trunk/sound/soc/soc-core.c | 6 +- trunk/sound/sound_core.c | 2 +- trunk/sound/sparc/dbri.c | 2 - trunk/sound/usb/usbquirks.h | 30 - trunk/virt/kvm/irq_comm.c | 42 +- trunk/virt/kvm/kvm_main.c | 12 +- 2216 files changed, 22492 insertions(+), 40789 deletions(-) delete mode 100644 trunk/Documentation/ABI/testing/sysfs-c2port rename trunk/Documentation/{PCI => }/MSI-HOWTO.txt (100%) rename trunk/Documentation/{blockdev => }/README.DAC960 (100%) rename trunk/Documentation/{serial => }/README.cycladesZ (100%) delete mode 100644 trunk/Documentation/accounting/.gitignore delete mode 100644 trunk/Documentation/acpi/debug.txt create mode 100644 trunk/Documentation/arm/empeg/README create mode 100644 trunk/Documentation/arm/empeg/ir.txt create mode 100644 trunk/Documentation/arm/empeg/mkdevs delete mode 100644 trunk/Documentation/auxdisplay/.gitignore delete mode 100644 trunk/Documentation/blockdev/00-INDEX delete mode 100644 trunk/Documentation/c2port.txt rename trunk/Documentation/{blockdev => }/cciss.txt (99%) rename trunk/Documentation/{serial => }/computone.txt (99%) delete mode 100644 trunk/Documentation/connector/.gitignore rename trunk/Documentation/{blockdev => }/cpqarray.txt (100%) rename trunk/Documentation/{serial => }/digiepca.txt (100%) rename trunk/Documentation/{blockdev => }/floppy.txt (100%) rename trunk/Documentation/{serial => }/hayes-esp.txt (100%) delete mode 100644 trunk/Documentation/hwmon/adt7462 delete mode 100644 trunk/Documentation/hwmon/lis3lv02d delete mode 100644 trunk/Documentation/ia64/.gitignore delete mode 100644 trunk/Documentation/ics932s401 delete mode 100644 trunk/Documentation/input/elantech.txt delete mode 100644 trunk/Documentation/io-mapping.txt rename trunk/Documentation/{ioctl => }/ioctl-number.txt (100%) delete mode 100644 trunk/Documentation/ioctl/00-INDEX rename trunk/Documentation/{serial => }/moxa-smartio (100%) rename trunk/Documentation/{blockdev => }/nbd.txt (100%) delete mode 100644 trunk/Documentation/networking/.gitignore rename trunk/Documentation/{blockdev => }/paride.txt (100%) delete mode 100644 trunk/Documentation/pcmcia/.gitignore delete mode 100644 trunk/Documentation/printk-formats.txt rename trunk/Documentation/{blockdev => }/ramdisk.txt (100%) rename trunk/Documentation/{serial => }/riscom8.txt (100%) rename trunk/Documentation/{serial => }/rocket.txt (100%) delete mode 100644 trunk/Documentation/serial/00-INDEX rename trunk/Documentation/{serial => }/specialix.txt (100%) delete mode 100644 trunk/Documentation/spi/.gitignore rename trunk/Documentation/{serial => }/stallion.txt (100%) rename trunk/Documentation/{serial => }/sx.txt (100%) rename trunk/Documentation/{serial => }/tty.txt (100%) delete mode 100644 trunk/Documentation/video4linux/.gitignore delete mode 100644 trunk/Documentation/video4linux/si470x.txt delete mode 100644 trunk/Documentation/vm/.gitignore delete mode 100644 trunk/Documentation/w1/masters/omap-hdq delete mode 100644 trunk/Documentation/watchdog/src/.gitignore create mode 100644 trunk/arch/arm/boot/compressed/head-clps7500.S delete mode 100644 trunk/arch/arm/common/clkdev.c delete mode 100644 trunk/arch/arm/configs/neocore926_defconfig delete mode 100644 trunk/arch/arm/include/asm/clkdev.h create mode 100644 trunk/arch/arm/mach-aaec2000/clock.c create mode 100644 trunk/arch/arm/mach-aaec2000/clock.h create mode 100644 trunk/arch/arm/mach-aaec2000/include/mach/dma.h delete mode 100644 trunk/arch/arm/mach-at91/board-neocore926.c create mode 100644 trunk/arch/arm/mach-at91/include/mach/dma.h delete mode 100644 trunk/arch/arm/mach-at91/sam9_smc.c delete mode 100644 trunk/arch/arm/mach-at91/sam9_smc.h create mode 100644 trunk/arch/arm/mach-clps711x/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-clps7500/Makefile create mode 100644 trunk/arch/arm/mach-clps7500/Makefile.boot create mode 100644 trunk/arch/arm/mach-clps7500/core.c create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/acornfb.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/debug-macro.S create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/hardware.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/io.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/irq.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/irqs.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/memory.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/system.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/timex.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/uncompress.h create mode 100644 trunk/arch/arm/mach-clps7500/include/mach/vmalloc.h create mode 100644 trunk/arch/arm/mach-davinci/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-ebsa110/include/mach/dma.h delete mode 100644 trunk/arch/arm/mach-ep93xx/edb9307a.c delete mode 100644 trunk/arch/arm/mach-ep93xx/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-ep93xx/include/mach/dma.h rename trunk/arch/arm/mach-footbridge/include/mach/{isa-dma.h => dma.h} (91%) rename trunk/arch/arm/mach-h720x/include/mach/{isa-dma.h => dma.h} (60%) delete mode 100644 trunk/arch/arm/mach-integrator/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-integrator/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-iop13xx/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-iop32x/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-iop33x/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-ixp2000/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-ixp23xx/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-ixp4xx/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-kirkwood/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-ks8695/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-l7200/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-loki/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-mv78xx0/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-netx/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-ns9xxx/include/mach/dma.h create mode 100644 trunk/arch/arm/mach-orion5x/include/mach/dma.h delete mode 100644 trunk/arch/arm/mach-pxa/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-realview/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-realview/include/mach/dma.h rename trunk/arch/arm/mach-rpc/include/mach/{isa-dma.h => dma.h} (71%) rename trunk/arch/arm/mach-shark/include/mach/{isa-dma.h => dma.h} (79%) delete mode 100644 trunk/arch/arm/mach-versatile/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-versatile/include/mach/dma.h create mode 100644 trunk/arch/arm/mm/copypage-feroceon.S delete mode 100644 trunk/arch/arm/mm/copypage-feroceon.c create mode 100644 trunk/arch/arm/mm/copypage-v3.S delete mode 100644 trunk/arch/arm/mm/copypage-v3.c create mode 100644 trunk/arch/arm/mm/copypage-v4wb.S delete mode 100644 trunk/arch/arm/mm/copypage-v4wb.c create mode 100644 trunk/arch/arm/mm/copypage-v4wt.S delete mode 100644 trunk/arch/arm/mm/copypage-v4wt.c create mode 100644 trunk/arch/arm/mm/copypage-xsc3.S delete mode 100644 trunk/arch/arm/mm/copypage-xsc3.c create mode 100644 trunk/arch/arm/plat-mxc/include/mach/dma.h delete mode 100644 trunk/arch/cris/arch-v10/boot/.gitignore create mode 100644 trunk/arch/cris/arch-v10/kernel/asm-offsets.c create mode 100644 trunk/arch/cris/arch-v10/vmlinux.lds.S rename trunk/arch/cris/{ => arch-v32}/kernel/asm-offsets.c (55%) rename trunk/arch/cris/{kernel => arch-v32}/vmlinux.lds.S (73%) delete mode 100644 trunk/arch/cris/include/asm/spinlock.h delete mode 100644 trunk/arch/mips/configs/pnx8335-stb225_defconfig delete mode 100644 trunk/arch/mips/emma/Kconfig delete mode 100644 trunk/arch/mips/emma/markeins/irq.c rename trunk/arch/mips/{emma => emma2rh}/common/Makefile (88%) create mode 100644 trunk/arch/mips/emma2rh/common/irq.c create mode 100644 trunk/arch/mips/emma2rh/common/irq_emma2rh.c rename trunk/arch/mips/{emma => emma2rh}/common/prom.c (95%) rename trunk/arch/mips/{emma => emma2rh}/markeins/Makefile (85%) create mode 100644 trunk/arch/mips/emma2rh/markeins/irq.c create mode 100644 trunk/arch/mips/emma2rh/markeins/irq_markeins.c rename trunk/arch/mips/{emma => emma2rh}/markeins/led.c (97%) rename trunk/arch/mips/{emma => emma2rh}/markeins/platform.c (99%) rename trunk/arch/mips/{emma => emma2rh}/markeins/setup.c (99%) create mode 100644 trunk/arch/mips/include/asm/ds1286.h rename trunk/arch/mips/include/asm/{emma => emma2rh}/emma2rh.h (97%) rename trunk/arch/mips/include/asm/{emma => emma2rh}/markeins.h (100%) create mode 100644 trunk/arch/mips/include/asm/m48t35.h delete mode 100644 trunk/arch/mips/include/asm/mach-lemote/pci.h delete mode 100644 trunk/arch/mips/include/asm/mach-pnx833x/gpio.h delete mode 100644 trunk/arch/mips/include/asm/mach-pnx833x/irq-mapping.h delete mode 100644 trunk/arch/mips/include/asm/mach-pnx833x/irq.h delete mode 100644 trunk/arch/mips/include/asm/mach-pnx833x/pnx833x.h delete mode 100644 trunk/arch/mips/include/asm/mach-pnx833x/war.h delete mode 100644 trunk/arch/mips/include/asm/mach-tx49xx/mangle-port.h create mode 100644 trunk/arch/mips/math-emu/dsemul.h delete mode 100644 trunk/arch/mips/nxp/pnx833x/common/Makefile delete mode 100644 trunk/arch/mips/nxp/pnx833x/common/interrupts.c delete mode 100644 trunk/arch/mips/nxp/pnx833x/common/platform.c delete mode 100644 trunk/arch/mips/nxp/pnx833x/common/prom.c delete mode 100644 trunk/arch/mips/nxp/pnx833x/common/reset.c delete mode 100644 trunk/arch/mips/nxp/pnx833x/common/setup.c delete mode 100644 trunk/arch/mips/nxp/pnx833x/stb22x/Makefile delete mode 100644 trunk/arch/mips/nxp/pnx833x/stb22x/board.c delete mode 100644 trunk/arch/mips/txx9/generic/7segled.c create mode 100644 trunk/arch/sh/cchips/hd6446x/hd64465/Makefile create mode 100644 trunk/arch/sh/cchips/hd6446x/hd64465/gpio.c create mode 100644 trunk/arch/sh/cchips/hd6446x/hd64465/io.c create mode 100644 trunk/arch/sh/cchips/hd6446x/hd64465/setup.c delete mode 100644 trunk/arch/sh/configs/ul2_defconfig create mode 100644 trunk/arch/sh/include/asm/hd64465/gpio.h create mode 100644 trunk/arch/sh/include/asm/hd64465/hd64465.h create mode 100644 trunk/arch/sh/include/asm/hd64465/io.h delete mode 100644 trunk/arch/sh/mm/mmap.c delete mode 100644 trunk/arch/x86/include/asm/iomap.h delete mode 100644 trunk/arch/x86/mm/iomap_32.c delete mode 100644 trunk/drivers/acpi/video_detect.c create mode 100644 trunk/drivers/char/ds1286.c create mode 100644 trunk/drivers/char/ip27-rtc.c delete mode 100644 trunk/drivers/edac/x38_edac.c delete mode 100644 trunk/drivers/gpio/xilinx_gpio.c delete mode 100644 trunk/drivers/hwmon/adt7462.c delete mode 100644 trunk/drivers/hwmon/lis3lv02d.c delete mode 100644 trunk/drivers/hwmon/lis3lv02d.h delete mode 100644 trunk/drivers/input/mouse/elantech.c delete mode 100644 trunk/drivers/input/mouse/elantech.h delete mode 100644 trunk/drivers/misc/c2port/Kconfig delete mode 100644 trunk/drivers/misc/c2port/Makefile delete mode 100644 trunk/drivers/misc/c2port/c2port-duramar2150.c delete mode 100644 trunk/drivers/misc/c2port/core.c delete mode 100644 trunk/drivers/misc/ics932s401.c create mode 100644 trunk/drivers/pcmcia/hd64465_ss.c delete mode 100644 trunk/drivers/rtc/rtc-ds1390.c delete mode 100644 trunk/drivers/rtc/rtc-rx8581.c delete mode 100644 trunk/drivers/rtc/rtc-wm8350.c delete mode 100644 trunk/drivers/video/mb862xx/Makefile delete mode 100644 trunk/drivers/video/mb862xx/mb862xx_reg.h delete mode 100644 trunk/drivers/video/mb862xx/mb862xxfb.c delete mode 100644 trunk/drivers/video/mb862xx/mb862xxfb.h create mode 100644 trunk/drivers/video/omap/lcd_sx1.c delete mode 100644 trunk/drivers/w1/masters/omap_hdq.c delete mode 100644 trunk/drivers/w1/slaves/w1_bq27000.c delete mode 100644 trunk/fs/fat/fat.h create mode 100644 trunk/fs/msdos/Makefile rename trunk/fs/{fat/namei_msdos.c => msdos/namei.c} (97%) create mode 100644 trunk/fs/vfat/Makefile rename trunk/fs/{fat/namei_vfat.c => vfat/namei.c} (89%) rename trunk/{arch/arm/plat-s3c/include/plat => include/asm-arm/plat-s3c}/iic.h (100%) rename trunk/{arch/arm/plat-s3c/include/plat => include/asm-arm/plat-s3c}/nand.h (100%) rename trunk/{arch/arm/plat-s3c/include/plat => include/asm-arm/plat-s3c}/regs-ac97.h (100%) rename trunk/{arch/arm/plat-s3c/include/plat => include/asm-arm/plat-s3c}/regs-iic.h (100%) rename trunk/{arch/arm/plat-s3c/include/plat => include/asm-arm/plat-s3c}/regs-nand.h (100%) rename trunk/{arch/arm/plat-s3c/include/plat => include/asm-arm/plat-s3c}/regs-rtc.h (100%) rename trunk/{arch/arm/plat-s3c/include/plat => include/asm-arm/plat-s3c}/regs-watchdog.h (100%) rename trunk/{arch/arm/plat-s3c24xx/include/plat => include/asm-arm/plat-s3c24xx}/mci.h (100%) rename trunk/{arch/arm/plat-s3c24xx/include/plat => include/asm-arm/plat-s3c24xx}/regs-spi.h (100%) rename trunk/{arch/arm/plat-s3c24xx/include/plat => include/asm-arm/plat-s3c24xx}/regs-udc.h (100%) rename trunk/{arch/arm/plat-s3c24xx/include/plat => include/asm-arm/plat-s3c24xx}/udc.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/Kbuild (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/Kbuild (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/atomic.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/bitops.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/bug.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/byteorder.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/cache.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/checksum.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/delay.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/dma.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/elf.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/io.h (99%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/io_interface_mux.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/irq.h (99%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/memmap.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/mmu.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/offset.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/page.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/pgtable.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/processor.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/ptrace.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/sv_addr.agh (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/sv_addr_ag.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/svinto.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/system.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/thread_info.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/timex.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/tlb.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/uaccess.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/unistd.h (100%) rename trunk/{arch/cris/include/arch-v10/arch => include/asm-cris/arch-v10}/user.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/Kbuild (100%) create mode 100644 trunk/include/asm-cris/arch-v32/arbiter.h rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/atomic.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/bitops.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/bug.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/byteorder.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/cache.h (93%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/checksum.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/cryptocop.h (99%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/delay.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/dma.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/elf.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/Makefile (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/ata_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/bif_core_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/bif_dma_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/bif_slave_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/config_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/cpu_vect.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/cris_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/cris_supp_reg.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/dma_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/eth_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/gio_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/intr_vect.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/intr_vect_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/irq_nmi_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/marb_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/mmu_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/mmu_supp_reg.h (100%) create mode 100644 trunk/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h create mode 100644 trunk/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/rt_trace_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/ser_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/sser_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/strcop_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/strmux_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/asm/timer_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/ata_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/bif_core_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/bif_dma_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/bif_slave_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/config_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/cpu_vect.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/dma.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/dma_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/eth_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/extmem_defs.h (100%) create mode 100644 trunk/include/asm-cris/arch-v32/hwregs/gio_defs.h create mode 100644 trunk/include/asm-cris/arch-v32/hwregs/intr_vect.h rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/Makefile (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_crc_par_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_dmc_in_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_dmc_out_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_fifo_in_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_fifo_out_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_mpu_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_reg_space_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_sap_in_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_sap_out_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_scrc_in_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_scrc_out_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_spu_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_sw_cfg_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_sw_cpu_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_sw_mpu_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_sw_spu_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_timer_grp_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_trigger_grp_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/asm/iop_version_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_crc_par_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_dmc_in_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_dmc_out_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_fifo_in_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_fifo_in_extra_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_fifo_out_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_fifo_out_extra_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_mpu_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_mpu_macros.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_reg_space.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_sap_in_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_sap_out_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_scrc_in_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_scrc_out_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_spu_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_sw_cfg_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_sw_cpu_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_sw_mpu_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_sw_spu_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_timer_grp_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_trigger_grp_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/iop/iop_version_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/irq_nmi_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/marb_bp_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/marb_defs.h (100%) create mode 100644 trunk/include/asm-cris/arch-v32/hwregs/pinmux_defs.h rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/reg_rdwr.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/rt_trace_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/ser_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/sser_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/strcop.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/strcop_defs.h (100%) create mode 100644 trunk/include/asm-cris/arch-v32/hwregs/strmux_defs.h rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/hwregs/supp_reg.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/intmem.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/io.h (98%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/irq.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/arbiter.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/dma.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/asm/clkgen_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/asm/ddr2_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/asm/gio_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/asm/pinmux_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/asm/pio_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/asm/reg_map_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/asm/timer_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/clkgen_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/ddr2_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/gio_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/intr_vect.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/intr_vect_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/asm/iop_reg_space_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/asm/iop_sap_in_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/asm/iop_sap_out_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/asm/iop_sw_cfg_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/asm/iop_sw_cpu_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/asm/iop_sw_mpu_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/asm/iop_sw_spu_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/asm/iop_version_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/iop_reg_space.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/iop_sap_in_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/iop_sap_out_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/iop_sw_cfg_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/iop_sw_cpu_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/iop_sw_mpu_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/iop_sw_spu_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/iop/iop_version_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/l2cache_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/marb_bar_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/marb_foo_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/pinmux_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/pio_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/reg_map.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/strmux_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/hwregs/timer_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/memmap.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/pinmux.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-a3/mach => include/asm-cris/arch-v32/mach-a3}/startup.inc (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/arbiter.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/asm/bif_core_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/asm/config_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/asm/gio_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/asm/pinmux_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/asm/reg_map_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/asm/timer_defs_asm.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/bif_core_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/bif_dma_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/bif_slave_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/config_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/gio_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/intr_vect.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/intr_vect_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/marb_bp_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/marb_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/pinmux_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/reg_map.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/strmux_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/hwregs/timer_defs.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/pinmux.h (100%) rename trunk/{arch/cris/include/arch-v32/mach-fs/mach => include/asm-cris/arch-v32/mach-fs}/startup.inc (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/memmap.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/mmu.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/offset.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/page.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/pgtable.h (100%) create mode 100644 trunk/include/asm-cris/arch-v32/pinmux.h rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/processor.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/ptrace.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/spinlock.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/system.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/thread_info.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/timex.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/tlb.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/uaccess.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/unistd.h (100%) rename trunk/{arch/cris/include/arch-v32/arch => include/asm-cris/arch-v32}/user.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/atomic.h (99%) rename trunk/{arch/cris/include/asm => include/asm-cris}/auxvec.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/axisflashmap.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/bitops.h (99%) rename trunk/{arch/cris/include/asm => include/asm-cris}/bug.h (64%) rename trunk/{arch/cris/include/asm => include/asm-cris}/bugs.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/byteorder.h (94%) rename trunk/{arch/cris/include/asm => include/asm-cris}/cache.h (71%) rename trunk/{arch/cris/include/asm => include/asm-cris}/cacheflush.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/checksum.h (98%) rename trunk/{arch/cris/include/asm => include/asm-cris}/cputime.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/current.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/delay.h (94%) rename trunk/{arch/cris/include/asm => include/asm-cris}/device.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/div64.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/dma-mapping.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/dma.h (93%) rename trunk/{arch/cris/include/asm => include/asm-cris}/elf.h (99%) rename trunk/{arch/cris/include/asm => include/asm-cris}/emergency-restart.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/errno.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/eshlibld.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/ethernet.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/etraxgpio.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/etraxi2c.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/fasttimer.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/fb.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/fcntl.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/futex.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/hardirq.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/hw_irq.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/io.h (99%) rename trunk/{arch/cris/include/asm => include/asm-cris}/ioctl.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/ioctls.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/ipcbuf.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/irq.h (83%) rename trunk/{arch/cris/include/asm => include/asm-cris}/irq_regs.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/kdebug.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/kmap_types.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/linkage.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/local.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/mman.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/mmu.h (78%) rename trunk/{arch/cris/include/asm => include/asm-cris}/mmu_context.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/module.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/msgbuf.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/mutex.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/page.h (98%) rename trunk/{arch/cris/include/asm => include/asm-cris}/param.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/pci.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/percpu.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/pgalloc.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/pgtable.h (99%) rename trunk/{arch/cris/include/asm => include/asm-cris}/poll.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/posix_types.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/processor.h (98%) rename trunk/{arch/cris/include/asm => include/asm-cris}/ptrace.h (91%) rename trunk/{arch/cris/include/asm => include/asm-cris}/resource.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/rs485.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/rtc.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/scatterlist.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/sections.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/segment.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/sembuf.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/setup.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/shmbuf.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/shmparam.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/sigcontext.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/siginfo.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/signal.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/smp.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/socket.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/sockios.h (100%) create mode 100644 trunk/include/asm-cris/spinlock.h rename trunk/{arch/cris/include/asm => include/asm-cris}/stat.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/statfs.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/string.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/sync_serial.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/system.h (98%) rename trunk/{arch/cris/include/asm => include/asm-cris}/termbits.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/termios.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/thread_info.h (98%) rename trunk/{arch/cris/include/asm => include/asm-cris}/timex.h (92%) rename trunk/{arch/cris/include/asm => include/asm-cris}/tlb.h (93%) rename trunk/{arch/cris/include/asm => include/asm-cris}/tlbflush.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/topology.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/types.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/uaccess.h (99%) rename trunk/{arch/cris/include/asm => include/asm-cris}/ucontext.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/unaligned.h (100%) rename trunk/{arch/cris/include/asm => include/asm-cris}/unistd.h (99%) rename trunk/{arch/cris/include/asm => include/asm-cris}/user.h (98%) delete mode 100644 trunk/include/linux/c2port.h delete mode 100644 trunk/include/linux/i7300_idle.h delete mode 100644 trunk/include/linux/io-mapping.h diff --git a/[refs] b/[refs] index ff9d6ea91efb..01f3c0589983 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93982535a201399c0023c1166a7f16a335134d5a +refs/heads/master: 68c3d93586223f7aeb04a815686b4d04146a2ada diff --git a/trunk/.mailmap b/trunk/.mailmap index 97f7b4fb6139..eba9bf953ef5 100644 --- a/trunk/.mailmap +++ b/trunk/.mailmap @@ -80,8 +80,6 @@ Nguyen Anh Quynh Paolo 'Blaisorblade' Giarrusso Patrick Mochel Peter A Jonsson -Peter Oruba -Peter Oruba Praveen BP Rajesh Shah Ralf Baechle diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX index 2a39aeba1464..7286ad090db7 100644 --- a/trunk/Documentation/00-INDEX +++ b/trunk/Documentation/00-INDEX @@ -42,8 +42,14 @@ IRQ.txt - description of what an IRQ is. ManagementStyle - how to (attempt to) manage kernel hackers. +MSI-HOWTO.txt + - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ. RCU/ - directory with info on RCU (read-copy update). +README.DAC960 + - info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux. +README.cycladesZ + - info on Cyclades-Z firmware loading. SAK.txt - info on Secure Attention Keys. SM501.txt @@ -80,16 +86,20 @@ blackfin/ - directory with documentation for the Blackfin arch. block/ - info on the Block I/O (BIO) layer. -blockdev/ - - info on block devices & drivers cachetlb.txt - describes the cache/TLB flushing interfaces Linux uses. +cciss.txt + - info, major/minor #'s for Compaq's SMART Array Controllers. cdrom/ - directory with information on the CD-ROM drivers that Linux has. +computone.txt + - info on Computone Intelliport II/Plus Multiport Serial Driver. connector/ - docs on the netlink based userspace<->kernel space communication mod. console/ - documentation on Linux console drivers. +cpqarray.txt + - info on using Compaq's SMART2 Intelligent Disk Array Controllers. cpu-freq/ - info on CPU frequency and voltage scaling. cpu-hotplug.txt @@ -116,6 +126,8 @@ device-mapper/ - directory with info on Device Mapper. devices.txt - plain ASCII listing of all the nodes in /dev/ with major minor #'s. +digiepca.txt + - info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards. dontdiff - file containing a list of files that should never be diff'ed. driver-model/ @@ -140,10 +152,14 @@ filesystems/ - info on the vfs and the various filesystems that Linux supports. firmware_class/ - request_firmware() hotplug interface info. +floppy.txt + - notes and driver options for the floppy disk driver. frv/ - Fujitsu FR-V Linux documentation. gpio.txt - overview of GPIO (General Purpose Input/Output) access conventions. +hayes-esp.txt + - info on using the Hayes ESP serial driver. highuid.txt - notes on the change from 16 bit to 32 bit user/group IDs. timers/ @@ -156,7 +172,7 @@ i2c/ - directory with info about the I2C bus/protocol (2 wire, kHz speed). i2o/ - directory with info about the Linux I2O subsystem. -x86/i386/ +i386/ - directory with info about Linux on Intel 32 bit architecture. ia64/ - directory with info about Linux on Intel 64 bit architecture. @@ -170,6 +186,8 @@ io_ordering.txt - info on ordering I/O writes to memory-mapped addresses. ioctl/ - directory with documents describing various IOCTL calls. +ioctl-number.txt + - how to implement and register device/driver ioctl calls. iostats.txt - info on I/O statistics Linux kernel provides. irqflags-tracing.txt @@ -232,10 +250,14 @@ mips/ - directory with info about Linux on MIPS architecture. mono.txt - how to execute Mono-based .NET binaries with the help of BINFMT_MISC. +moxa-smartio + - file with info on installing/using Moxa multiport serial driver. mutex-design.txt - info on the generic mutex subsystem. namespaces/ - directory with various information about namespaces +nbd.txt + - info on a TCP implementation of a network block device. netlabel/ - directory with information on the NetLabel subsystem. networking/ @@ -248,6 +270,8 @@ numastat.txt - info on how to read Numa policy hit/miss statistics in sysfs. oops-tracing.txt - how to decode those nasty internal kernel error dump messages. +paride.txt + - information about the parallel port IDE subsystem. parisc/ - directory with info on using Linux on PA-RISC architecture. parport.txt @@ -266,16 +290,20 @@ powerpc/ - directory with info on using Linux with the PowerPC. preempt-locking.txt - info on locking under a preemptive kernel. -printk-formats.txt - - how to get printk format specifiers right prio_tree.txt - info on radix-priority-search-tree use for indexing vmas. +ramdisk.txt + - short guide on how to set up and use the RAM disk. rbtree.txt - info on what red-black trees are and what they are for. +riscom8.txt + - notes on using the RISCom/8 multi-port serial driver. robust-futex-ABI.txt - documentation of the robust futex ABI. robust-futexes.txt - a description of what robust futexes are. +rocket.txt + - info on the Comtrol RocketPort multiport serial driver. rt-mutex-design.txt - description of the RealTime mutex implementation design. rt-mutex.txt @@ -304,6 +332,8 @@ sparc/ - directory with info on using Linux on Sparc architecture. sparse.txt - info on how to obtain and use the sparse tool for typechecking. +specialix.txt + - info on hardware/driver for specialix IO8+ multiport serial card. spi/ - overview of Linux kernel Serial Peripheral Interface (SPI) support. spinlocks.txt @@ -312,10 +342,14 @@ stable_api_nonsense.txt - info on why the kernel does not have a stable in-kernel api or abi. stable_kernel_rules.txt - rules and procedures for the -stable kernel releases. +stallion.txt + - info on using the Stallion multiport serial driver. svga.txt - short guide on selecting video modes at boot via VGA BIOS. sysfs-rules.txt - How not to use sysfs. +sx.txt + - info on the Specialix SX/SI multiport serial driver. sysctl/ - directory with info on the /proc/sys/* files. sysrq.txt @@ -324,6 +358,8 @@ telephony/ - directory with info on telephony (e.g. voice over IP) support. time_interpolators.txt - info on time interpolators. +tty.txt + - guide to the locking policies of the tty layer. uml/ - directory with information about User Mode Linux. unicode.txt @@ -346,7 +382,7 @@ w1/ - directory with documents regarding the 1-wire (w1) subsystem. watchdog/ - how to auto-reboot Linux if it has "fallen and can't get up". ;-) -x86/x86_64/ +x86_64/ - directory with info on Linux support for AMD x86-64 (Hammer) machines. zorro.txt - info on writing drivers for Zorro bus devices found on Amigas. diff --git a/trunk/Documentation/ABI/testing/sysfs-c2port b/trunk/Documentation/ABI/testing/sysfs-c2port deleted file mode 100644 index 716cffc457e9..000000000000 --- a/trunk/Documentation/ABI/testing/sysfs-c2port +++ /dev/null @@ -1,88 +0,0 @@ -What: /sys/class/c2port/ -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/ directory will contain files and - directories that will provide a unified interface to - the C2 port interface. - -What: /sys/class/c2port/c2portX -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/ directory is related to X-th - C2 port into the system. Each directory will contain files to - manage and control its C2 port. - -What: /sys/class/c2port/c2portX/access -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/access file enable the access - to the C2 port from the system. No commands can be sent - till this entry is set to 0. - -What: /sys/class/c2port/c2portX/dev_id -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/dev_id file show the device ID - of the connected micro. - -What: /sys/class/c2port/c2portX/flash_access -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/flash_access file enable the - access to the on-board flash of the connected micro. - No commands can be sent till this entry is set to 0. - -What: /sys/class/c2port/c2portX/flash_block_size -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/flash_block_size file show - the on-board flash block size of the connected micro. - -What: /sys/class/c2port/c2portX/flash_blocks_num -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/flash_blocks_num file show - the on-board flash blocks number of the connected micro. - -What: /sys/class/c2port/c2portX/flash_data -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/flash_data file export - the content of the on-board flash of the connected micro. - -What: /sys/class/c2port/c2portX/flash_erase -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/flash_erase file execute - the "erase" command on the on-board flash of the connected - micro. - -What: /sys/class/c2port/c2portX/flash_erase -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/flash_erase file show the - on-board flash size of the connected micro. - -What: /sys/class/c2port/c2portX/reset -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/reset file execute a "reset" - command on the connected micro. - -What: /sys/class/c2port/c2portX/rev_id -Date: October 2008 -Contact: Rodolfo Giometti -Description: - The /sys/class/c2port/c2portX/rev_id file show the revision ID - of the connected micro. diff --git a/trunk/Documentation/ABI/testing/sysfs-firmware-acpi b/trunk/Documentation/ABI/testing/sysfs-firmware-acpi index e8ffc70ffe12..f27be7d1a49f 100644 --- a/trunk/Documentation/ABI/testing/sysfs-firmware-acpi +++ b/trunk/Documentation/ABI/testing/sysfs-firmware-acpi @@ -89,7 +89,7 @@ Description: error - an interrupt that can't be accounted for above. - invalid: it's either a GPE or a Fixed Event that + invalid: it's either a wakeup GPE or a GPE/Fixed Event that doesn't have an event handler. disable: the GPE/Fixed Event is valid but disabled. @@ -117,30 +117,30 @@ Description: and other user space applications so that the machine won't shutdown when pressing the power button. # cat ff_pwr_btn - 0 enabled + 0 # press the power button for 3 times; # cat ff_pwr_btn - 3 enabled + 3 # echo disable > ff_pwr_btn # cat ff_pwr_btn - 3 disabled + disable # press the power button for 3 times; # cat ff_pwr_btn - 3 disabled + disable # echo enable > ff_pwr_btn # cat ff_pwr_btn - 4 enabled + 4 /* * this is because the status bit is set even if the enable bit is cleared, * and it triggers an ACPI fixed event when the enable bit is set again */ # press the power button for 3 times; # cat ff_pwr_btn - 7 enabled + 7 # echo disable > ff_pwr_btn # press the power button for 3 times; # echo clear > ff_pwr_btn /* clear the status bit */ # echo disable > ff_pwr_btn # cat ff_pwr_btn - 7 enabled + 7 diff --git a/trunk/Documentation/DocBook/Makefile b/trunk/Documentation/DocBook/Makefile index 9b1f6ca100d1..fabc06466b93 100644 --- a/trunk/Documentation/DocBook/Makefile +++ b/trunk/Documentation/DocBook/Makefile @@ -136,7 +136,7 @@ quiet_cmd_db2ps = PS $@ %.ps : %.xml $(call cmd,db2ps) -quiet_cmd_db2pdf = PDF $@ +quiet_cmd_db2pdf = PDF $@ cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template)) %.pdf : %.xml $(call cmd,db2pdf) @@ -148,7 +148,7 @@ build_main_index = rm -rf $(main_idx) && \ echo '

Kernel Version: $(KERNELVERSION)

' >> $(main_idx) && \ cat $(HTML) >> $(main_idx) -quiet_cmd_db2html = HTML $@ +quiet_cmd_db2html = HTML $@ cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \ echo ' \ $(patsubst %.html,%,$(notdir $@))

' > $@ diff --git a/trunk/Documentation/DocBook/deviceiobook.tmpl b/trunk/Documentation/DocBook/deviceiobook.tmpl index 3ed88126ab8f..9ee6f3cbb414 100644 --- a/trunk/Documentation/DocBook/deviceiobook.tmpl +++ b/trunk/Documentation/DocBook/deviceiobook.tmpl @@ -24,7 +24,7 @@ Cox

- alan@lxorguk.ukuu.org.uk + alan@redhat.com
@@ -316,7 +316,7 @@ CPU B: spin_unlock_irqrestore(&dev_lock, flags) Public Functions Provided -!Iarch/x86/include/asm/io_32.h +!Iinclude/asm-x86/io_32.h !Elib/iomap.c diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl index 5818ff75786a..9d0058e788e5 100644 --- a/trunk/Documentation/DocBook/kernel-api.tmpl +++ b/trunk/Documentation/DocBook/kernel-api.tmpl @@ -45,8 +45,8 @@ Atomic and pointer manipulation -!Iarch/x86/include/asm/atomic_32.h -!Iarch/x86/include/asm/unaligned.h +!Iinclude/asm-x86/atomic_32.h +!Iinclude/asm-x86/unaligned.h Delaying, scheduling, and timer routines @@ -119,7 +119,7 @@ X!Ilib/string.c !Elib/string.c Bit Operations -!Iarch/x86/include/asm/bitops.h +!Iinclude/asm-x86/bitops.h @@ -155,7 +155,7 @@ X!Ilib/string.c !Emm/slab.c User Space Memory Access -!Iarch/x86/include/asm/uaccess_32.h +!Iinclude/asm-x86/uaccess_32.h !Earch/x86/lib/usercopy_32.c More Memory Management Functions @@ -265,7 +265,7 @@ X!Earch/x86/kernel/mca_32.c --> MCA Bus DMA -!Iarch/x86/include/asm/mca_dma.h +!Iinclude/asm-x86/mca_dma.h diff --git a/trunk/Documentation/DocBook/kernel-hacking.tmpl b/trunk/Documentation/DocBook/kernel-hacking.tmpl index a50d6cd58573..ae15d55350ec 100644 --- a/trunk/Documentation/DocBook/kernel-hacking.tmpl +++ b/trunk/Documentation/DocBook/kernel-hacking.tmpl @@ -1239,7 +1239,7 @@ static struct block_device_operations opt_fops = { - arch/x86/include/asm/delay.h: + include/asm-x86/delay_32.h: #define ndelay(n) (__builtin_constant_p(n) ? \ @@ -1265,7 +1265,7 @@ static struct block_device_operations opt_fops = { - arch/x86/include/asm/uaccess_32.h: + include/asm-x86/uaccess_32.h: diff --git a/trunk/Documentation/DocBook/mcabook.tmpl b/trunk/Documentation/DocBook/mcabook.tmpl index 467ccac6ec50..529a53dc1389 100644 --- a/trunk/Documentation/DocBook/mcabook.tmpl +++ b/trunk/Documentation/DocBook/mcabook.tmpl @@ -12,7 +12,7 @@ Cox
- alan@lxorguk.ukuu.org.uk + alan@redhat.com
@@ -101,7 +101,7 @@ DMA Functions Provided -!Iarch/x86/include/asm/mca_dma.h +!Iinclude/asm-x86/mca_dma.h diff --git a/trunk/Documentation/DocBook/wanbook.tmpl b/trunk/Documentation/DocBook/wanbook.tmpl index 8c93db122f04..9eebcc304de4 100644 --- a/trunk/Documentation/DocBook/wanbook.tmpl +++ b/trunk/Documentation/DocBook/wanbook.tmpl @@ -12,7 +12,7 @@ Cox
- alan@lxorguk.ukuu.org.uk + alan@redhat.com
diff --git a/trunk/Documentation/DocBook/z8530book.tmpl b/trunk/Documentation/DocBook/z8530book.tmpl index 6f3883be877e..a42a8a4c7689 100644 --- a/trunk/Documentation/DocBook/z8530book.tmpl +++ b/trunk/Documentation/DocBook/z8530book.tmpl @@ -12,7 +12,7 @@ Cox
- alan@lxorguk.ukuu.org.uk + alan@redhat.com
diff --git a/trunk/Documentation/PCI/MSI-HOWTO.txt b/trunk/Documentation/MSI-HOWTO.txt similarity index 100% rename from trunk/Documentation/PCI/MSI-HOWTO.txt rename to trunk/Documentation/MSI-HOWTO.txt diff --git a/trunk/Documentation/ManagementStyle b/trunk/Documentation/ManagementStyle index a5f0ea58c788..49a8efa5afeb 100644 --- a/trunk/Documentation/ManagementStyle +++ b/trunk/Documentation/ManagementStyle @@ -17,7 +17,7 @@ companies. If you sign purchase orders or you have any clue about the budget of your group, you're almost certainly not a kernel manager. These suggestions may or may not apply to you. -First off, I'd suggest buying "Seven Habits of Highly Effective +First off, I'd suggest buying "Seven Habits of Highly Successful People", and NOT read it. Burn it, it's a great symbolic gesture. (*) This document does so not so much by answering the question, but by diff --git a/trunk/Documentation/PCI/00-INDEX b/trunk/Documentation/PCI/00-INDEX index 812b17fe3ed0..49f43946c6b6 100644 --- a/trunk/Documentation/PCI/00-INDEX +++ b/trunk/Documentation/PCI/00-INDEX @@ -1,7 +1,5 @@ 00-INDEX - this file -MSI-HOWTO.txt - - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ. PCI-DMA-mapping.txt - info for PCI drivers using DMA portably across all platforms PCIEBUS-HOWTO.txt diff --git a/trunk/Documentation/blockdev/README.DAC960 b/trunk/Documentation/README.DAC960 similarity index 100% rename from trunk/Documentation/blockdev/README.DAC960 rename to trunk/Documentation/README.DAC960 diff --git a/trunk/Documentation/serial/README.cycladesZ b/trunk/Documentation/README.cycladesZ similarity index 100% rename from trunk/Documentation/serial/README.cycladesZ rename to trunk/Documentation/README.cycladesZ diff --git a/trunk/Documentation/accounting/.gitignore b/trunk/Documentation/accounting/.gitignore deleted file mode 100644 index 86485203c4ae..000000000000 --- a/trunk/Documentation/accounting/.gitignore +++ /dev/null @@ -1 +0,0 @@ -getdelays diff --git a/trunk/Documentation/acpi/debug.txt b/trunk/Documentation/acpi/debug.txt deleted file mode 100644 index 65bf47c46b6d..000000000000 --- a/trunk/Documentation/acpi/debug.txt +++ /dev/null @@ -1,148 +0,0 @@ - ACPI Debug Output - - -The ACPI CA, the Linux ACPI core, and some ACPI drivers can generate debug -output. This document describes how to use this facility. - -Compile-time configuration --------------------------- - -ACPI debug output is globally enabled by CONFIG_ACPI_DEBUG. If this config -option is turned off, the debug messages are not even built into the -kernel. - -Boot- and run-time configuration --------------------------------- - -When CONFIG_ACPI_DEBUG=y, you can select the component and level of messages -you're interested in. At boot-time, use the acpi.debug_layer and -acpi.debug_level kernel command line options. After boot, you can use the -debug_layer and debug_level files in /sys/module/acpi/parameters/ to control -the debug messages. - -debug_layer (component) ------------------------ - -The "debug_layer" is a mask that selects components of interest, e.g., a -specific driver or part of the ACPI interpreter. To build the debug_layer -bitmask, look for the "#define _COMPONENT" in an ACPI source file. - -You can set the debug_layer mask at boot-time using the acpi.debug_layer -command line argument, and you can change it after boot by writing values -to /sys/module/acpi/parameters/debug_layer. - -The possible components are defined in include/acpi/acoutput.h and -include/acpi/acpi_drivers.h. Reading /sys/module/acpi/parameters/debug_layer -shows the supported mask values, currently these: - - ACPI_UTILITIES 0x00000001 - ACPI_HARDWARE 0x00000002 - ACPI_EVENTS 0x00000004 - ACPI_TABLES 0x00000008 - ACPI_NAMESPACE 0x00000010 - ACPI_PARSER 0x00000020 - ACPI_DISPATCHER 0x00000040 - ACPI_EXECUTER 0x00000080 - ACPI_RESOURCES 0x00000100 - ACPI_CA_DEBUGGER 0x00000200 - ACPI_OS_SERVICES 0x00000400 - ACPI_CA_DISASSEMBLER 0x00000800 - ACPI_COMPILER 0x00001000 - ACPI_TOOLS 0x00002000 - ACPI_BUS_COMPONENT 0x00010000 - ACPI_AC_COMPONENT 0x00020000 - ACPI_BATTERY_COMPONENT 0x00040000 - ACPI_BUTTON_COMPONENT 0x00080000 - ACPI_SBS_COMPONENT 0x00100000 - ACPI_FAN_COMPONENT 0x00200000 - ACPI_PCI_COMPONENT 0x00400000 - ACPI_POWER_COMPONENT 0x00800000 - ACPI_CONTAINER_COMPONENT 0x01000000 - ACPI_SYSTEM_COMPONENT 0x02000000 - ACPI_THERMAL_COMPONENT 0x04000000 - ACPI_MEMORY_DEVICE_COMPONENT 0x08000000 - ACPI_VIDEO_COMPONENT 0x10000000 - ACPI_PROCESSOR_COMPONENT 0x20000000 - -debug_level ------------ - -The "debug_level" is a mask that selects different types of messages, e.g., -those related to initialization, method execution, informational messages, etc. -To build debug_level, look at the level specified in an ACPI_DEBUG_PRINT() -statement. - -The ACPI interpreter uses several different levels, but the Linux -ACPI core and ACPI drivers generally only use ACPI_LV_INFO. - -You can set the debug_level mask at boot-time using the acpi.debug_level -command line argument, and you can change it after boot by writing values -to /sys/module/acpi/parameters/debug_level. - -The possible levels are defined in include/acpi/acoutput.h. Reading -/sys/module/acpi/parameters/debug_level shows the supported mask values, -currently these: - - ACPI_LV_INIT 0x00000001 - ACPI_LV_DEBUG_OBJECT 0x00000002 - ACPI_LV_INFO 0x00000004 - ACPI_LV_INIT_NAMES 0x00000020 - ACPI_LV_PARSE 0x00000040 - ACPI_LV_LOAD 0x00000080 - ACPI_LV_DISPATCH 0x00000100 - ACPI_LV_EXEC 0x00000200 - ACPI_LV_NAMES 0x00000400 - ACPI_LV_OPREGION 0x00000800 - ACPI_LV_BFIELD 0x00001000 - ACPI_LV_TABLES 0x00002000 - ACPI_LV_VALUES 0x00004000 - ACPI_LV_OBJECTS 0x00008000 - ACPI_LV_RESOURCES 0x00010000 - ACPI_LV_USER_REQUESTS 0x00020000 - ACPI_LV_PACKAGE 0x00040000 - ACPI_LV_ALLOCATIONS 0x00100000 - ACPI_LV_FUNCTIONS 0x00200000 - ACPI_LV_OPTIMIZATIONS 0x00400000 - ACPI_LV_MUTEX 0x01000000 - ACPI_LV_THREADS 0x02000000 - ACPI_LV_IO 0x04000000 - ACPI_LV_INTERRUPTS 0x08000000 - ACPI_LV_AML_DISASSEMBLE 0x10000000 - ACPI_LV_VERBOSE_INFO 0x20000000 - ACPI_LV_FULL_TABLES 0x40000000 - ACPI_LV_EVENTS 0x80000000 - -Examples --------- - -For example, drivers/acpi/bus.c contains this: - - #define _COMPONENT ACPI_BUS_COMPONENT - ... - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device insertion detected\n")); - -To turn on this message, set the ACPI_BUS_COMPONENT bit in acpi.debug_layer -and the ACPI_LV_INFO bit in acpi.debug_level. (The ACPI_DEBUG_PRINT -statement uses ACPI_DB_INFO, which is macro based on the ACPI_LV_INFO -definition.) - -Enable all AML "Debug" output (stores to the Debug object while interpreting -AML) during boot: - - acpi.debug_layer=0xffffffff acpi.debug_level=0x2 - -Enable PCI and PCI interrupt routing debug messages: - - acpi.debug_layer=0x400000 acpi.debug_level=0x4 - -Enable all ACPI hardware-related messages: - - acpi.debug_layer=0x2 acpi.debug_level=0xffffffff - -Enable all ACPI_DB_INFO messages after boot: - - # echo 0x4 > /sys/module/acpi/parameters/debug_level - -Show all valid component values: - - # cat /sys/module/acpi/parameters/debug_layer diff --git a/trunk/Documentation/arm/empeg/README b/trunk/Documentation/arm/empeg/README new file mode 100644 index 000000000000..09cc8d03ae58 --- /dev/null +++ b/trunk/Documentation/arm/empeg/README @@ -0,0 +1,13 @@ +Empeg, Ltd's Empeg MP3 Car Audio Player + +The initial design is to go in your car, but you can use it at home, on a +boat... almost anywhere. The principle is to store CD-quality music using +MPEG technology onto a hard disk in the unit, and use the power of the +embedded computer to serve up the music you want. + +For more details, see: + + http://www.empeg.com + + + diff --git a/trunk/Documentation/arm/empeg/ir.txt b/trunk/Documentation/arm/empeg/ir.txt new file mode 100644 index 000000000000..10a297450164 --- /dev/null +++ b/trunk/Documentation/arm/empeg/ir.txt @@ -0,0 +1,49 @@ +Infra-red driver documentation. + +Mike Crowe +(C) Empeg Ltd 1999 + +Not a lot here yet :-) + +The Kenwood KCA-R6A remote control generates a sequence like the following: + +Go low for approx 16T (Around 9000us) +Go high for approx 8T (Around 4000us) +Go low for less than 2T (Around 750us) + +For each of the 32 bits + Go high for more than 2T (Around 1500us) == 1 + Go high for less than T (Around 400us) == 0 + Go low for less than 2T (Around 750us) + +Rather than repeat a signal when the button is held down certain buttons +generate the following code to indicate repetition. + +Go low for approx 16T +Go high for approx 4T +Go low for less than 2T + +(By removing the <2T from the start of the sequence and placing at the end + it can be considered a stop bit but I found it easier to deal with it at + the start). + +The 32 bits are encoded as XxYy where x and y are the actual data values +while X and Y are the logical inverses of the associated data values. Using +LSB first yields sensible codes for the numbers. + +All codes are of the form b9xx + +The numeric keys generate the code 0x where x is the number pressed. + +Tuner 1c +Tape 1d +CD 1e +CD-MD-CH 1f +Track- 0a +Track+ 0b +Rewind 0c +FF 0d +DNPP 5e +Play/Pause 0e +Vol+ 14 +Vol- 15 diff --git a/trunk/Documentation/arm/empeg/mkdevs b/trunk/Documentation/arm/empeg/mkdevs new file mode 100644 index 000000000000..7a85e28d14f3 --- /dev/null +++ b/trunk/Documentation/arm/empeg/mkdevs @@ -0,0 +1,11 @@ +#!/bin/sh +mknod /dev/display c 244 0 +mknod /dev/ir c 242 0 +mknod /dev/usb0 c 243 0 +mknod /dev/audio c 245 4 +mknod /dev/dsp c 245 3 +mknod /dev/mixer c 245 0 +mknod /dev/empeg_state c 246 0 +mknod /dev/radio0 c 81 64 +ln -sf radio0 radio +ln -sf usb0 usb diff --git a/trunk/Documentation/auxdisplay/.gitignore b/trunk/Documentation/auxdisplay/.gitignore deleted file mode 100644 index 7af222860a96..000000000000 --- a/trunk/Documentation/auxdisplay/.gitignore +++ /dev/null @@ -1 +0,0 @@ -cfag12864b-example diff --git a/trunk/Documentation/blockdev/00-INDEX b/trunk/Documentation/blockdev/00-INDEX deleted file mode 100644 index 86f054c47013..000000000000 --- a/trunk/Documentation/blockdev/00-INDEX +++ /dev/null @@ -1,16 +0,0 @@ -00-INDEX - - this file -README.DAC960 - - info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux. -cciss.txt - - info, major/minor #'s for Compaq's SMART Array Controllers. -cpqarray.txt - - info on using Compaq's SMART2 Intelligent Disk Array Controllers. -floppy.txt - - notes and driver options for the floppy disk driver. -nbd.txt - - info on a TCP implementation of a network block device. -paride.txt - - information about the parallel port IDE subsystem. -ramdisk.txt - - short guide on how to set up and use the RAM disk. diff --git a/trunk/Documentation/c2port.txt b/trunk/Documentation/c2port.txt deleted file mode 100644 index d9bf93ea4398..000000000000 --- a/trunk/Documentation/c2port.txt +++ /dev/null @@ -1,90 +0,0 @@ - C2 port support - --------------- - -(C) Copyright 2007 Rodolfo Giometti - -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. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - - - -Overview --------- - -This driver implements the support for Linux of Silicon Labs (Silabs) -C2 Interface used for in-system programming of micro controllers. - -By using this driver you can reprogram the in-system flash without EC2 -or EC3 debug adapter. This solution is also useful in those systems -where the micro controller is connected via special GPIOs pins. - -References ----------- - -The C2 Interface main references are at (http://www.silabs.com) -Silicon Laboratories site], see: - -- AN127: FLASH Programming via the C2 Interface at -http://www.silabs.com/public/documents/tpub_doc/anote/Microcontrollers/Small_Form_Factor/en/an127.pdf, and - -- C2 Specification at -http://www.silabs.com/public/documents/tpub_doc/spec/Microcontrollers/en/C2spec.pdf, - -however it implements a two wire serial communication protocol (bit -banging) designed to enable in-system programming, debugging, and -boundary-scan testing on low pin-count Silicon Labs devices. Currently -this code supports only flash programming but extensions are easy to -add. - -Using the driver ----------------- - -Once the driver is loaded you can use sysfs support to get C2port's -info or read/write in-system flash. - -# ls /sys/class/c2port/c2port0/ -access flash_block_size flash_erase rev_id -dev_id flash_blocks_num flash_size subsystem/ -flash_access flash_data reset uevent - -Initially the C2port access is disabled since you hardware may have -such lines multiplexed with other devices so, to get access to the -C2port, you need the command: - -# echo 1 > /sys/class/c2port/c2port0/access - -after that you should read the device ID and revision ID of the -connected micro controller: - -# cat /sys/class/c2port/c2port0/dev_id -8 -# cat /sys/class/c2port/c2port0/rev_id -1 - -However, for security reasons, the in-system flash access in not -enabled yet, to do so you need the command: - -# echo 1 > /sys/class/c2port/c2port0/flash_access - -After that you can read the whole flash: - -# cat /sys/class/c2port/c2port0/flash_data > image - -erase it: - -# echo 1 > /sys/class/c2port/c2port0/flash_erase - -and write it: - -# cat image > /sys/class/c2port/c2port0/flash_data - -after writing you have to reset the device to execute the new code: - -# echo 1 > /sys/class/c2port/c2port0/reset diff --git a/trunk/Documentation/blockdev/cciss.txt b/trunk/Documentation/cciss.txt similarity index 99% rename from trunk/Documentation/blockdev/cciss.txt rename to trunk/Documentation/cciss.txt index 89698e8df7d4..8244c6442faa 100644 --- a/trunk/Documentation/blockdev/cciss.txt +++ b/trunk/Documentation/cciss.txt @@ -21,14 +21,11 @@ This driver is known to work with the following cards: * SA E200 * SA E200i * SA E500 - * SA P700m * SA P212 * SA P410 * SA P410i * SA P411 * SA P812 - * SA P712m - * SA P711m Detecting drive failures: ------------------------- diff --git a/trunk/Documentation/cgroups/freezer-subsystem.txt b/trunk/Documentation/cgroups/freezer-subsystem.txt index 41f37fea1276..c50ab58b72eb 100644 --- a/trunk/Documentation/cgroups/freezer-subsystem.txt +++ b/trunk/Documentation/cgroups/freezer-subsystem.txt @@ -1,4 +1,4 @@ -The cgroup freezer is useful to batch job management system which start + The cgroup freezer is useful to batch job management system which start and stop sets of tasks in order to schedule the resources of a machine according to the desires of a system administrator. This sort of program is often used on HPC clusters to schedule access to the cluster as a @@ -6,7 +6,7 @@ whole. The cgroup freezer uses cgroups to describe the set of tasks to be started/stopped by the batch job management system. It also provides a means to start and stop the tasks composing the job. -The cgroup freezer will also be useful for checkpointing running groups + The cgroup freezer will also be useful for checkpointing running groups of tasks. The freezer allows the checkpoint code to obtain a consistent image of the tasks by attempting to force the tasks in a cgroup into a quiescent state. Once the tasks are quiescent another task can @@ -16,7 +16,7 @@ recoverable error occur. This also allows the checkpointed tasks to be migrated between nodes in a cluster by copying the gathered information to another node and restarting the tasks there. -Sequences of SIGSTOP and SIGCONT are not always sufficient for stopping + Sequences of SIGSTOP and SIGCONT are not always sufficient for stopping and resuming tasks in userspace. Both of these signals are observable from within the tasks we wish to freeze. While SIGSTOP cannot be caught, blocked, or ignored it can be seen by waiting or ptracing parent tasks. @@ -37,29 +37,26 @@ demonstrate this problem using nested bash shells: -This happens because bash can observe both signals and choose how it + This happens because bash can observe both signals and choose how it responds to them. -Another example of a program which catches and responds to these + Another example of a program which catches and responds to these signals is gdb. In fact any program designed to use ptrace is likely to have a problem with this method of stopping and resuming tasks. -In contrast, the cgroup freezer uses the kernel freezer code to + In contrast, the cgroup freezer uses the kernel freezer code to prevent the freeze/unfreeze cycle from becoming visible to the tasks being frozen. This allows the bash example above and gdb to run as expected. -The freezer subsystem in the container filesystem defines a file named + The freezer subsystem in the container filesystem defines a file named freezer.state. Writing "FROZEN" to the state file will freeze all tasks in the cgroup. Subsequently writing "THAWED" will unfreeze the tasks in the cgroup. Reading will return the current state. -Note freezer.state doesn't exist in root cgroup, which means root cgroup -is non-freezable. - * Examples of usage : - # mkdir /containers + # mkdir /containers/freezer # mount -t cgroup -ofreezer freezer /containers # mkdir /containers/0 # echo $some_pid > /containers/0/tasks @@ -97,6 +94,6 @@ things happens: the freezer.state file 2) Userspace retries the freezing operation by writing "FROZEN" to the freezer.state file (writing "FREEZING" is not legal - and returns EINVAL) + and returns EIO) 3) The tasks that blocked the cgroup from entering the "FROZEN" state disappear from the cgroup's set of tasks. diff --git a/trunk/Documentation/serial/computone.txt b/trunk/Documentation/computone.txt similarity index 99% rename from trunk/Documentation/serial/computone.txt rename to trunk/Documentation/computone.txt index c57ea4781e5d..5e2a0c76bfa0 100644 --- a/trunk/Documentation/serial/computone.txt +++ b/trunk/Documentation/computone.txt @@ -247,7 +247,7 @@ shar archive to make it easier to extract the script from the documentation. To create the ip2mkdev shell script change to a convenient directory (/tmp works just fine) and run the following command: - unshar Documentation/serial/computone.txt + unshar Documentation/computone.txt (This file) You should now have a file ip2mkdev in your current working directory with diff --git a/trunk/Documentation/connector/.gitignore b/trunk/Documentation/connector/.gitignore deleted file mode 100644 index d2b9c32accd4..000000000000 --- a/trunk/Documentation/connector/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ucon diff --git a/trunk/Documentation/blockdev/cpqarray.txt b/trunk/Documentation/cpqarray.txt similarity index 100% rename from trunk/Documentation/blockdev/cpqarray.txt rename to trunk/Documentation/cpqarray.txt diff --git a/trunk/Documentation/serial/digiepca.txt b/trunk/Documentation/digiepca.txt similarity index 100% rename from trunk/Documentation/serial/digiepca.txt rename to trunk/Documentation/digiepca.txt diff --git a/trunk/Documentation/email-clients.txt b/trunk/Documentation/email-clients.txt index a618efab7b15..2ebb94d6ed8e 100644 --- a/trunk/Documentation/email-clients.txt +++ b/trunk/Documentation/email-clients.txt @@ -213,29 +213,4 @@ TkRat (GUI) Works. Use "Insert file..." or external editor. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Gmail (Web GUI) - -If you just have to use Gmail to send patches, it CAN be made to work. It -requires a bit of external help, though. - -The first problem is that Gmail converts tabs to spaces. This will -totally break your patches. To prevent this, you have to use a different -editor. There is a firefox extension called "ViewSourceWith" -(https://addons.mozilla.org/en-US/firefox/addon/394) which allows you to -edit any text box in the editor of your choice. Configure it to launch -your favorite editor. When you want to send a patch, use this technique. -Once you have crafted your messsage + patch, save and exit the editor, -which should reload the Gmail edit box. GMAIL WILL PRESERVE THE TABS. -Hoorah. Apparently you can cut-n-paste literal tabs, but Gmail will -convert those to spaces upon sending! - -The second problem is that Gmail converts tabs to spaces on replies. If -you reply to a patch, don't expect to be able to apply it as a patch. - -The last problem is that Gmail will base64-encode any message that has a -non-ASCII character. That includes things like European names. Be aware. - -Gmail is not convenient for lkml patches, but CAN be made to work. - ### diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index c28a2ac88f9d..05d71b4b9430 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -56,6 +56,30 @@ Who: Mauro Carvalho Chehab --------------------------- +What: old tuner-3036 i2c driver +When: 2.6.28 +Why: This driver is for VERY old i2c-over-parallel port teletext receiver + boxes. Rather then spending effort on converting this driver to V4L2, + and since it is extremely unlikely that anyone still uses one of these + devices, it was decided to drop it. +Who: Hans Verkuil + Mauro Carvalho Chehab + + --------------------------- + +What: V4L2 dpc7146 driver +When: 2.6.28 +Why: Old driver for the dpc7146 demonstration board that is no longer + relevant. The last time this was tested on actual hardware was + probably around 2002. Since this is a driver for a demonstration + board the decision was made to remove it rather than spending a + lot of effort continually updating this driver to stay in sync + with the latest internal V4L2 or I2C API. +Who: Hans Verkuil + Mauro Carvalho Chehab + +--------------------------- + What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl]) When: November 2005 Files: drivers/pcmcia/: pcmcia_ioctl.c diff --git a/trunk/Documentation/filesystems/Locking b/trunk/Documentation/filesystems/Locking index 23d2f4460deb..8362860e21a7 100644 --- a/trunk/Documentation/filesystems/Locking +++ b/trunk/Documentation/filesystems/Locking @@ -161,12 +161,8 @@ prototypes: int (*set_page_dirty)(struct page *page); int (*readpages)(struct file *filp, struct address_space *mapping, struct list_head *pages, unsigned nr_pages); - int (*write_begin)(struct file *, struct address_space *mapping, - loff_t pos, unsigned len, unsigned flags, - struct page **pagep, void **fsdata); - int (*write_end)(struct file *, struct address_space *mapping, - loff_t pos, unsigned len, unsigned copied, - struct page *page, void *fsdata); + int (*prepare_write)(struct file *, struct page *, unsigned, unsigned); + int (*commit_write)(struct file *, struct page *, unsigned, unsigned); sector_t (*bmap)(struct address_space *, sector_t); int (*invalidatepage) (struct page *, unsigned long); int (*releasepage) (struct page *, int); @@ -184,6 +180,8 @@ sync_page: no maybe writepages: no set_page_dirty no no readpages: no +prepare_write: no yes yes +commit_write: no yes yes write_begin: no locks the page yes write_end: no yes, unlocks yes perform_write: no n/a yes @@ -193,7 +191,7 @@ releasepage: no yes direct_IO: no launder_page: no yes - ->write_begin(), ->write_end(), ->sync_page() and ->readpage() + ->prepare_write(), ->commit_write(), ->sync_page() and ->readpage() may be called from the request handler (/dev/loop). ->readpage() unlocks the page, either synchronously or via I/O diff --git a/trunk/Documentation/filesystems/vfat.txt b/trunk/Documentation/filesystems/vfat.txt index 3a5ddc96901a..bbac4f1d9056 100644 --- a/trunk/Documentation/filesystems/vfat.txt +++ b/trunk/Documentation/filesystems/vfat.txt @@ -8,12 +8,6 @@ if you want to format from within Linux. VFAT MOUNT OPTIONS ---------------------------------------------------------------------- -uid=### -- Set the owner of all files on this filesystem. - The default is the uid of current process. - -gid=### -- Set the group of all files on this filesystem. - The default is the gid of current process. - umask=### -- The permission mask (for files and directories, see umask(1)). The default is the umask of current process. @@ -42,7 +36,7 @@ codepage=### -- Sets the codepage number for converting to shortname characters on FAT filesystem. By default, FAT_DEFAULT_CODEPAGE setting is used. -iocharset= -- Character set to use for converting between the +iocharset=name -- Character set to use for converting between the encoding is used for user visible filename and 16 bit Unicode characters. Long filenames are stored on disk in Unicode format, but Unix for the most part doesn't @@ -92,8 +86,6 @@ check=s|r|n -- Case sensitivity checking setting. r: relaxed, case insensitive n: normal, default setting, currently case insensitive -nocase -- This was deprecated for vfat. Use shortname=win95 instead. - shortname=lower|win95|winnt|mixed -- Shortname display/create setting. lower: convert to lowercase for display, @@ -107,31 +99,11 @@ shortname=lower|win95|winnt|mixed tz=UTC -- Interpret timestamps as UTC rather than local time. This option disables the conversion of timestamps between local time (as used by Windows on FAT) and UTC - (which Linux uses internally). This is particularly + (which Linux uses internally). This is particuluarly useful when mounting devices (like digital cameras) that are set to UTC in order to avoid the pitfalls of local time. -showexec -- If set, the execute permission bits of the file will be - allowed only if the extension part of the name is .EXE, - .COM, or .BAT. Not set by default. - -debug -- Can be set, but unused by the current implementation. - -sys_immutable -- If set, ATTR_SYS attribute on FAT is handled as - IMMUTABLE flag on Linux. Not set by default. - -flush -- If set, the filesystem will try to flush to disk more - early than normal. Not set by default. - -rodir -- FAT has the ATTR_RO (read-only) attribute. But on Windows, - the ATTR_RO of the directory will be just ignored actually, - and is used by only applications as flag. E.g. it's setted - for the customized folder. - - If you want to use ATTR_RO as read-only flag even for - the directory, set this option. - : 0,1,yes,no,true,false TODO diff --git a/trunk/Documentation/filesystems/vfs.txt b/trunk/Documentation/filesystems/vfs.txt index 5579bda58a6d..c4d348dabe94 100644 --- a/trunk/Documentation/filesystems/vfs.txt +++ b/trunk/Documentation/filesystems/vfs.txt @@ -492,7 +492,7 @@ written-back to storage typically in whole pages, however the address_space has finer control of write sizes. The read process essentially only requires 'readpage'. The write -process is more complicated and uses write_begin/write_end or +process is more complicated and uses prepare_write/commit_write or set_page_dirty to write data into the address_space, and writepage, sync_page, and writepages to writeback data to storage. @@ -521,6 +521,8 @@ struct address_space_operations { int (*set_page_dirty)(struct page *page); int (*readpages)(struct file *filp, struct address_space *mapping, struct list_head *pages, unsigned nr_pages); + int (*prepare_write)(struct file *, struct page *, unsigned, unsigned); + int (*commit_write)(struct file *, struct page *, unsigned, unsigned); int (*write_begin)(struct file *, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata); @@ -596,7 +598,37 @@ struct address_space_operations { readpages is only used for read-ahead, so read errors are ignored. If anything goes wrong, feel free to give up. - write_begin: + prepare_write: called by the generic write path in VM to set up a write + request for a page. This indicates to the address space that + the given range of bytes is about to be written. The + address_space should check that the write will be able to + complete, by allocating space if necessary and doing any other + internal housekeeping. If the write will update parts of + any basic-blocks on storage, then those blocks should be + pre-read (if they haven't been read already) so that the + updated blocks can be written out properly. + The page will be locked. + + Note: the page _must not_ be marked uptodate in this function + (or anywhere else) unless it actually is uptodate right now. As + soon as a page is marked uptodate, it is possible for a concurrent + read(2) to copy it to userspace. + + commit_write: If prepare_write succeeds, new data will be copied + into the page and then commit_write will be called. It will + typically update the size of the file (if appropriate) and + mark the inode as dirty, and do any other related housekeeping + operations. It should avoid returning an error if possible - + errors should have been handled by prepare_write. + + write_begin: This is intended as a replacement for prepare_write. The + key differences being that: + - it returns a locked page (in *pagep) rather than being + given a pre locked page; + - it must be able to cope with short writes (where the + length passed to write_begin is greater than the number + of bytes copied into the page). + Called by the generic buffered write code to ask the filesystem to prepare to write len bytes at the given offset in the file. The address_space should check that the write will be able to complete, @@ -608,9 +640,6 @@ struct address_space_operations { The filesystem must return the locked pagecache page for the specified offset, in *pagep, for the caller to write into. - It must be able to cope with short writes (where the length passed to - write_begin is greater than the number of bytes copied into the page). - flags is a field for AOP_FLAG_xxx flags, described in include/linux/fs.h. diff --git a/trunk/Documentation/filesystems/xip.txt b/trunk/Documentation/filesystems/xip.txt index 0466ee569278..3cc4010521a0 100644 --- a/trunk/Documentation/filesystems/xip.txt +++ b/trunk/Documentation/filesystems/xip.txt @@ -39,11 +39,10 @@ The block device operation is optional, these block devices support it as of today: - dcssblk: s390 dcss block device driver -An address space operation named get_xip_mem is used to retrieve references -to a page frame number and a kernel address. To obtain these values a reference -to an address_space is provided. This function assigns values to the kmem and -pfn parameters. The third argument indicates whether the function should allocate -blocks if needed. +An address space operation named get_xip_page is used to retrieve reference +to a struct page. To address the target page, a reference to an address_space, +and a sector number is provided. A 3rd argument indicates whether the +function should allocate blocks if needed. This address space operation is mutually exclusive with readpage&writepage that do page cache read/write operations. diff --git a/trunk/Documentation/blockdev/floppy.txt b/trunk/Documentation/floppy.txt similarity index 100% rename from trunk/Documentation/blockdev/floppy.txt rename to trunk/Documentation/floppy.txt diff --git a/trunk/Documentation/ftrace.txt b/trunk/Documentation/ftrace.txt index 9cc4d685dde5..d330fe3103da 100644 --- a/trunk/Documentation/ftrace.txt +++ b/trunk/Documentation/ftrace.txt @@ -8,7 +8,7 @@ Copyright 2008 Red Hat Inc. Reviewers: Elias Oltmanns, Randy Dunlap, Andrew Morton, John Kacur, and David Teigland. -Written for: 2.6.28-rc2 +Written for: 2.6.27-rc1 Introduction ------------ @@ -50,26 +50,26 @@ of ftrace. Here is a list of some of the key files: Note: all time values are in microseconds. - current_tracer: This is used to set or display the current tracer + current_tracer : This is used to set or display the current tracer that is configured. - available_tracers: This holds the different types of tracers that + available_tracers : This holds the different types of tracers that have been compiled into the kernel. The tracers listed here can be configured by echoing their name into current_tracer. - tracing_enabled: This sets or displays whether the current_tracer + tracing_enabled : This sets or displays whether the current_tracer is activated and tracing or not. Echo 0 into this file to disable the tracer or 1 to enable it. - trace: This file holds the output of the trace in a human readable + trace : This file holds the output of the trace in a human readable format (described below). - latency_trace: This file shows the same trace but the information + latency_trace : This file shows the same trace but the information is organized more to display possible latencies in the system (described below). - trace_pipe: The output is the same as the "trace" file but this + trace_pipe : The output is the same as the "trace" file but this file is meant to be streamed with live tracing. Reads from this file will block until new data is retrieved. Unlike the "trace" and "latency_trace" @@ -82,11 +82,11 @@ of ftrace. Here is a list of some of the key files: tracer is not adding more data, they will display the same information every time they are read. - iter_ctrl: This file lets the user control the amount of data + iter_ctrl : This file lets the user control the amount of data that is displayed in one of the above output files. - trace_max_latency: Some of the tracers record the max latency. + trace_max_latency : Some of the tracers record the max latency. For example, the time interrupts are disabled. This time is saved in this file. The max trace will also be stored, and displayed by either @@ -94,26 +94,29 @@ of ftrace. Here is a list of some of the key files: only be recorded if the latency is greater than the value in this file. (in microseconds) - trace_entries: This sets or displays the number of bytes each CPU - buffer can hold. The tracer buffers are the same size - for each CPU. The displayed number is the size of the - CPU buffer and not total size of all buffers. The + trace_entries : This sets or displays the number of trace + entries each CPU buffer can hold. The tracer buffers + are the same size for each CPU. The displayed number + is the size of the CPU buffer and not total size. The trace buffers are allocated in pages (blocks of memory that the kernel uses for allocation, usually 4 KB in size). - If the last page allocated has room for more bytes - than requested, the rest of the page will be used, - making the actual allocation bigger than requested. - (Note, the size may not be a multiple of the page size due - to buffer managment overhead.) + Since each entry is smaller than a page, if the last + allocated page has room for more entries than were + requested, the rest of the page is used to allocate + entries. This can only be updated when the current_tracer - is set to "nop". + is set to "none". - tracing_cpumask: This is a mask that lets the user only trace + NOTE: It is planned on changing the allocated buffers + from being the number of possible CPUS to + the number of online CPUS. + + tracing_cpumask : This is a mask that lets the user only trace on specified CPUS. The format is a hex string representing the CPUS. - set_ftrace_filter: When dynamic ftrace is configured in (see the + set_ftrace_filter : When dynamic ftrace is configured in (see the section below "dynamic ftrace"), the code is dynamically modified (code text rewrite) to disable calling of the function profiler (mcount). This lets tracing be configured @@ -127,11 +130,14 @@ of ftrace. Here is a list of some of the key files: be traced. If a function exists in both set_ftrace_filter and set_ftrace_notrace, the function will _not_ be traced. - available_filter_functions: This lists the functions that ftrace - has processed and can trace. These are the function - names that you can pass to "set_ftrace_filter" or - "set_ftrace_notrace". (See the section "dynamic ftrace" - below for more details.) + available_filter_functions : When a function is encountered the first + time by the dynamic tracer, it is recorded and + later the call is converted into a nop. This file + lists the functions that have been recorded + by the dynamic tracer and these functions can + be used to set the ftrace filter by the above + "set_ftrace_filter" file. (See the section "dynamic ftrace" + below for more details). The Tracers @@ -139,7 +145,7 @@ The Tracers Here is the list of current tracers that may be configured. - function - function tracer that uses mcount to trace all functions. + ftrace - function tracer that uses mcount to trace all functions. sched_switch - traces the context switches between tasks. @@ -160,8 +166,8 @@ Here is the list of current tracers that may be configured. the highest priority task to get scheduled after it has been woken up. - nop - This is not a tracer. To remove all tracers from tracing - simply echo "nop" into current_tracer. + none - This is not a tracer. To remove all tracers from tracing + simply echo "none" into current_tracer. Examples of using the tracer @@ -176,7 +182,7 @@ Output format: Here is an example of the output format of the file "trace" -------- -# tracer: function +# tracer: ftrace # # TASK-PID CPU# TIMESTAMP FUNCTION # | | | | | @@ -186,7 +192,7 @@ Here is an example of the output format of the file "trace" -------- A header is printed with the tracer name that is represented by the trace. -In this case the tracer is "function". Then a header showing the format. Task +In this case the tracer is "ftrace". Then a header showing the format. Task name "bash", the task PID "4251", the CPU that it was running on "01", the timestamp in . format, the function name that was traced "path_put" and the parent function that called this function @@ -285,9 +291,6 @@ explains which is which. CPU#: The CPU which the process was running on. irqs-off: 'd' interrupts are disabled. '.' otherwise. - Note: If the architecture does not support a way to - read the irq flags variable, an 'X' will always - be printed here. need-resched: 'N' task need_resched is set, '.' otherwise. @@ -997,20 +1000,22 @@ is the stack for the hard interrupt. This hides the fact that NEED_RESCHED has been set. We do not see the 'N' until we switch back to the task's assigned stack. -function --------- +ftrace +------ -This tracer is the function tracer. Enabling the function tracer -can be done from the debug file system. Make sure the ftrace_enabled is -set; otherwise this tracer is a nop. +ftrace is not only the name of the tracing infrastructure, but it +is also a name of one of the tracers. The tracer is the function +tracer. Enabling the function tracer can be done from the +debug file system. Make sure the ftrace_enabled is set otherwise +this tracer is a nop. # sysctl kernel.ftrace_enabled=1 - # echo function > /debug/tracing/current_tracer + # echo ftrace > /debug/tracing/current_tracer # echo 1 > /debug/tracing/tracing_enabled # usleep 1 # echo 0 > /debug/tracing/tracing_enabled # cat /debug/tracing/trace -# tracer: function +# tracer: ftrace # # TASK-PID CPU# TIMESTAMP FUNCTION # | | | | | @@ -1032,10 +1037,10 @@ set; otherwise this tracer is a nop. [...] -Note: function tracer uses ring buffers to store the above entries. -The newest data may overwrite the oldest data. Sometimes using echo to -stop the trace is not sufficient because the tracing could have overwritten -the data that you wanted to record. For this reason, it is sometimes better to +Note: ftrace uses ring buffers to store the above entries. The newest data +may overwrite the oldest data. Sometimes using echo to stop the trace +is not sufficient because the tracing could have overwritten the data +that you wanted to record. For this reason, it is sometimes better to disable tracing directly from a program. This allows you to stop the tracing at the point that you hit the part that you are interested in. To disable the tracing directly from a C program, something like following @@ -1069,31 +1074,18 @@ every kernel function, produced by the -pg switch in gcc), starts of pointing to a simple return. (Enabling FTRACE will include the -pg switch in the compiling of the kernel.) -At compile time every C file object is run through the -recordmcount.pl script (located in the scripts directory). This -script will process the C object using objdump to find all the -locations in the .text section that call mcount. (Note, only -the .text section is processed, since processing other sections -like .init.text may cause races due to those sections being freed). - -A new section called "__mcount_loc" is created that holds references -to all the mcount call sites in the .text section. This section is -compiled back into the original object. The final linker will add -all these references into a single table. - -On boot up, before SMP is initialized, the dynamic ftrace code -scans this table and updates all the locations into nops. It also -records the locations, which are added to the available_filter_functions -list. Modules are processed as they are loaded and before they are -executed. When a module is unloaded, it also removes its functions from -the ftrace function list. This is automatic in the module unload -code, and the module author does not need to worry about it. - -When tracing is enabled, kstop_machine is called to prevent races -with the CPUS executing code being modified (which can cause the -CPU to do undesireable things), and the nops are patched back -to calls. But this time, they do not call mcount (which is just -a function stub). They now call into the ftrace infrastructure. +When dynamic ftrace is initialized, it calls kstop_machine to make +the machine act like a uniprocessor so that it can freely modify code +without worrying about other processors executing that same code. At +initialization, the mcount calls are changed to call a "record_ip" +function. After this, the first time a kernel function is called, +it has the calling address saved in a hash table. + +Later on the ftraced kernel thread is awoken and will again call +kstop_machine if new functions have been recorded. The ftraced thread +will change all calls to mcount to "nop". Just calling mcount +and having mcount return has shown a 10% overhead. By converting +it to a nop, there is no measurable overhead to the system. One special side-effect to the recording of the functions being traced is that we can now selectively choose which functions we @@ -1256,6 +1248,36 @@ Produces: We can see that there's no more lock or preempt tracing. +ftraced +------- + +As mentioned above, when dynamic ftrace is configured in, a kernel +thread wakes up once a second and checks to see if there are mcount +calls that need to be converted into nops. If there are not any, then +it simply goes back to sleep. But if there are some, it will call +kstop_machine to convert the calls to nops. + +There may be a case in which you do not want this added latency. +Perhaps you are doing some audio recording and this activity might +cause skips in the playback. There is an interface to disable +and enable the "ftraced" kernel thread. + + # echo 0 > /debug/tracing/ftraced_enabled + +This will disable the calling of kstop_machine to update the +mcount calls to nops. Remember that there is a large overhead +to calling mcount. Without this kernel thread, that overhead will +exist. + +If there are recorded calls to mcount, any write to the ftraced_enabled +file will cause the kstop_machine to run. This means that a +user can manually perform the updates when they want to by simply +echoing a '0' into the ftraced_enabled file. + +The updates are also done at the beginning of enabling a tracer +that uses ftrace function recording. + + trace_pipe ---------- @@ -1264,14 +1286,14 @@ on the tracing is different. Every read from trace_pipe is consumed. This means that subsequent reads will be different. The trace is live. - # echo function > /debug/tracing/current_tracer + # echo ftrace > /debug/tracing/current_tracer # cat /debug/tracing/trace_pipe > /tmp/trace.out & [1] 4153 # echo 1 > /debug/tracing/tracing_enabled # usleep 1 # echo 0 > /debug/tracing/tracing_enabled # cat /debug/tracing/trace -# tracer: function +# tracer: ftrace # # TASK-PID CPU# TIMESTAMP FUNCTION # | | | | | @@ -1292,7 +1314,7 @@ is live. Note, reading the trace_pipe file will block until more input is added. By changing the tracer, trace_pipe will issue an EOF. We needed -to set the function tracer _before_ we "cat" the trace_pipe file. +to set the ftrace tracer _before_ cating the trace_pipe file. trace entries @@ -1309,10 +1331,10 @@ number of entries. 65620 Note, to modify this, you must have tracing completely disabled. To do that, -echo "nop" into the current_tracer. If the current_tracer is not set -to "nop", an EINVAL error will be returned. +echo "none" into the current_tracer. If the current_tracer is not set +to "none", an EINVAL error will be returned. - # echo nop > /debug/tracing/current_tracer + # echo none > /debug/tracing/current_tracer # echo 100000 > /debug/tracing/trace_entries # cat /debug/tracing/trace_entries 100045 diff --git a/trunk/Documentation/serial/hayes-esp.txt b/trunk/Documentation/hayes-esp.txt similarity index 100% rename from trunk/Documentation/serial/hayes-esp.txt rename to trunk/Documentation/hayes-esp.txt diff --git a/trunk/Documentation/hwmon/adt7462 b/trunk/Documentation/hwmon/adt7462 deleted file mode 100644 index ec660b328275..000000000000 --- a/trunk/Documentation/hwmon/adt7462 +++ /dev/null @@ -1,67 +0,0 @@ -Kernel driver adt7462 -====================== - -Supported chips: - * Analog Devices ADT7462 - Prefix: 'adt7462' - Addresses scanned: I2C 0x58, 0x5C - Datasheet: Publicly available at the Analog Devices website - -Author: Darrick J. Wong - -Description ------------ - -This driver implements support for the Analog Devices ADT7462 chip family. - -This chip is a bit of a beast. It has 8 counters for measuring fan speed. It -can also measure 13 voltages or 4 temperatures, or various combinations of the -two. See the chip documentation for more details about the exact set of -configurations. This driver does not allow one to configure the chip; that is -left to the system designer. - -A sophisticated control system for the PWM outputs is designed into the ADT7462 -that allows fan speed to be adjusted automatically based on any of the three -temperature sensors. Each PWM output is individually adjustable and -programmable. Once configured, the ADT7462 will adjust the PWM outputs in -response to the measured temperatures without further host intervention. This -feature can also be disabled for manual control of the PWM's. - -Each of the measured inputs (voltage, temperature, fan speed) has -corresponding high/low limit values. The ADT7462 will signal an ALARM if -any measured value exceeds either limit. - -The ADT7462 samples all inputs continuously. The driver will not read -the registers more often than once every other second. Further, -configuration data is only read once per minute. - -Special Features ----------------- - -The ADT7462 have a 10-bit ADC and can therefore measure temperatures -with 0.25 degC resolution. - -The Analog Devices datasheet is very detailed and describes a procedure for -determining an optimal configuration for the automatic PWM control. - -The driver will report sensor labels when it is able to determine that -information from the configuration registers. - -Configuration Notes -------------------- - -Besides standard interfaces driver adds the following: - -* PWM Control - -* pwm#_auto_point1_pwm and temp#_auto_point1_temp and -* pwm#_auto_point2_pwm and temp#_auto_point2_temp - - -point1: Set the pwm speed at a lower temperature bound. -point2: Set the pwm speed at a higher temperature bound. - -The ADT7462 will scale the pwm between the lower and higher pwm speed when -the temperature is between the two temperature boundaries. PWM values range -from 0 (off) to 255 (full speed). Fan speed will be set to maximum when the -temperature sensor associated with the PWM control exceeds temp#_max. - diff --git a/trunk/Documentation/hwmon/lis3lv02d b/trunk/Documentation/hwmon/lis3lv02d deleted file mode 100644 index 65dfb0c0fd67..000000000000 --- a/trunk/Documentation/hwmon/lis3lv02d +++ /dev/null @@ -1,49 +0,0 @@ -Kernel driver lis3lv02d -================== - -Supported chips: - - * STMicroelectronics LIS3LV02DL and LIS3LV02DQ - -Author: - Yan Burman - Eric Piel - - -Description ------------ - -This driver provides support for the accelerometer found in various HP laptops -sporting the feature officially called "HP Mobile Data Protection System 3D" or -"HP 3D DriveGuard". It detect automatically laptops with this sensor. Known models -(for now the HP 2133, nc6420, nc2510, nc8510, nc84x0, nw9440 and nx9420) will -have their axis automatically oriented on standard way (eg: you can directly -play neverball). The accelerometer data is readable via -/sys/devices/platform/lis3lv02d. - -Sysfs attributes under /sys/devices/platform/lis3lv02d/: -position - 3D position that the accelerometer reports. Format: "(x,y,z)" -calibrate - read: values (x, y, z) that are used as the base for input class device operation. - write: forces the base to be recalibrated with the current position. -rate - reports the sampling rate of the accelerometer device in HZ - -This driver also provides an absolute input class device, allowing -the laptop to act as a pinball machine-esque joystick. - -Axes orientation ----------------- - -For better compatibility between the various laptops. The values reported by -the accelerometer are converted into a "standard" organisation of the axes -(aka "can play neverball out of the box"): - * When the laptop is horizontal the position reported is about 0 for X and Y -and a positive value for Z - * If the left side is elevated, X increases (becomes positive) - * If the front side (where the touchpad is) is elevated, Y decreases (becomes negative) - * If the laptop is put upside-down, Z becomes negative - -If your laptop model is not recognized (cf "dmesg"), you can send an email to the -authors to add it to the database. When reporting a new laptop, please include -the output of "dmidecode" plus the value of /sys/devices/platform/lis3lv02d/position -in these four cases. - diff --git a/trunk/Documentation/i2c/busses/i2c-sis96x b/trunk/Documentation/i2c/busses/i2c-sis96x index 70e6a0cc1e15..266481fd26e2 100644 --- a/trunk/Documentation/i2c/busses/i2c-sis96x +++ b/trunk/Documentation/i2c/busses/i2c-sis96x @@ -42,7 +42,7 @@ I suspect that this driver could be made to work for the following SiS chipsets as well: 635, and 635T. If anyone owns a board with those chips AND is willing to risk crashing & burning an otherwise well-behaved kernel in the name of progress... please contact me at or -via the linux-i2c mailing list: . Please send bug +via the project's mailing list: . Please send bug reports and/or success stories as well. diff --git a/trunk/Documentation/ia64/.gitignore b/trunk/Documentation/ia64/.gitignore deleted file mode 100644 index ab806edc8732..000000000000 --- a/trunk/Documentation/ia64/.gitignore +++ /dev/null @@ -1 +0,0 @@ -aliasing-test diff --git a/trunk/Documentation/ics932s401 b/trunk/Documentation/ics932s401 deleted file mode 100644 index 07a739f406d8..000000000000 --- a/trunk/Documentation/ics932s401 +++ /dev/null @@ -1,31 +0,0 @@ -Kernel driver ics932s401 -====================== - -Supported chips: - * IDT ICS932S401 - Prefix: 'ics932s401' - Addresses scanned: I2C 0x69 - Datasheet: Publically available at the IDT website - -Author: Darrick J. Wong - -Description ------------ - -This driver implements support for the IDT ICS932S401 chip family. - -This chip has 4 clock outputs--a base clock for the CPU (which is likely -multiplied to get the real CPU clock), a system clock, a PCI clock, a USB -clock, and a reference clock. The driver reports selected and actual -frequency. If spread spectrum mode is enabled, the driver also reports by what -percent the clock signal is being spread, which should be between 0 and -0.5%. -All frequencies are reported in KHz. - -The ICS932S401 monitors all inputs continuously. The driver will not read -the registers more often than once every other second. - -Special Features ----------------- - -The clocks could be reprogrammed to increase system speed. I will not help you -do this, as you risk damaging your system! diff --git a/trunk/Documentation/input/elantech.txt b/trunk/Documentation/input/elantech.txt deleted file mode 100644 index a10c3b6ba7c4..000000000000 --- a/trunk/Documentation/input/elantech.txt +++ /dev/null @@ -1,405 +0,0 @@ -Elantech Touchpad Driver -======================== - - Copyright (C) 2007-2008 Arjan Opmeer - - Extra information for hardware version 1 found and - provided by Steve Havelka - - Version 2 (EeePC) hardware support based on patches - received from Woody at Xandros and forwarded to me - by user StewieGriffin at the eeeuser.com forum - - -Contents -~~~~~~~~ - - 1. Introduction - 2. Extra knobs - 3. Hardware version 1 - 3.1 Registers - 3.2 Native relative mode 4 byte packet format - 3.3 Native absolute mode 4 byte packet format - 4. Hardware version 2 - 4.1 Registers - 4.2 Native absolute mode 6 byte packet format - 4.2.1 One finger touch - 4.2.2 Two finger touch - - - -1. Introduction - ~~~~~~~~~~~~ - -Currently the Linux Elantech touchpad driver is aware of two different -hardware versions unimaginatively called version 1 and version 2. Version 1 -is found in "older" laptops and uses 4 bytes per packet. Version 2 seems to -be introduced with the EeePC and uses 6 bytes per packet. - -The driver tries to support both hardware versions and should be compatible -with the Xorg Synaptics touchpad driver and its graphical configuration -utilities. - -Additionally the operation of the touchpad can be altered by adjusting the -contents of some of its internal registers. These registers are represented -by the driver as sysfs entries under /sys/bus/serio/drivers/psmouse/serio? -that can be read from and written to. - -Currently only the registers for hardware version 1 are somewhat understood. -Hardware version 2 seems to use some of the same registers but it is not -known whether the bits in the registers represent the same thing or might -have changed their meaning. - -On top of that, some register settings have effect only when the touchpad is -in relative mode and not in absolute mode. As the Linux Elantech touchpad -driver always puts the hardware into absolute mode not all information -mentioned below can be used immediately. But because there is no freely -available Elantech documentation the information is provided here anyway for -completeness sake. - - -///////////////////////////////////////////////////////////////////////////// - - -2. Extra knobs - ~~~~~~~~~~~ - -Currently the Linux Elantech touchpad driver provides two extra knobs under -/sys/bus/serio/drivers/psmouse/serio? for the user. - -* debug - - Turn different levels of debugging ON or OFF. - - By echoing "0" to this file all debugging will be turned OFF. - - Currently a value of "1" will turn on some basic debugging and a value of - "2" will turn on packet debugging. For hardware version 1 the default is - OFF. For version 2 the default is "1". - - Turning packet debugging on will make the driver dump every packet - received to the syslog before processing it. Be warned that this can - generate quite a lot of data! - -* paritycheck - - Turns parity checking ON or OFF. - - By echoing "0" to this file parity checking will be turned OFF. Any - non-zero value will turn it ON. For hardware version 1 the default is ON. - For version 2 the default it is OFF. - - Hardware version 1 provides basic data integrity verification by - calculating a parity bit for the last 3 bytes of each packet. The driver - can check these bits and reject any packet that appears corrupted. Using - this knob you can bypass that check. - - It is not known yet whether hardware version 2 provides the same parity - bits. Hence checking is disabled by default. Currently even turning it on - will do nothing. - - -///////////////////////////////////////////////////////////////////////////// - - -3. Hardware version 1 - ================== - -3.1 Registers - ~~~~~~~~~ - -By echoing a hexadecimal value to a register it contents can be altered. - -For example: - - echo -n 0x16 > reg_10 - -* reg_10 - - bit 7 6 5 4 3 2 1 0 - B C T D L A S E - - E: 1 = enable smart edges unconditionally - S: 1 = enable smart edges only when dragging - A: 1 = absolute mode (needs 4 byte packets, see reg_11) - L: 1 = enable drag lock (see reg_22) - D: 1 = disable dynamic resolution - T: 1 = disable tapping - C: 1 = enable corner tap - B: 1 = swap left and right button - -* reg_11 - - bit 7 6 5 4 3 2 1 0 - 1 0 0 H V 1 F P - - P: 1 = enable parity checking for relative mode - F: 1 = enable native 4 byte packet mode - V: 1 = enable vertical scroll area - H: 1 = enable horizontal scroll area - -* reg_20 - - single finger width? - -* reg_21 - - scroll area width (small: 0x40 ... wide: 0xff) - -* reg_22 - - drag lock time out (short: 0x14 ... long: 0xfe; - 0xff = tap again to release) - -* reg_23 - - tap make timeout? - -* reg_24 - - tap release timeout? - -* reg_25 - - smart edge cursor speed (0x02 = slow, 0x03 = medium, 0x04 = fast) - -* reg_26 - - smart edge activation area width? - - -3.2 Native relative mode 4 byte packet format - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -byte 0: - bit 7 6 5 4 3 2 1 0 - c c p2 p1 1 M R L - - L, R, M = 1 when Left, Right, Middle mouse button pressed - some models have M as byte 3 odd parity bit - when parity checking is enabled (reg_11, P = 1): - p1..p2 = byte 1 and 2 odd parity bit - c = 1 when corner tap detected - -byte 1: - bit 7 6 5 4 3 2 1 0 - dx7 dx6 dx5 dx4 dx3 dx2 dx1 dx0 - - dx7..dx0 = x movement; positive = right, negative = left - byte 1 = 0xf0 when corner tap detected - -byte 2: - bit 7 6 5 4 3 2 1 0 - dy7 dy6 dy5 dy4 dy3 dy2 dy1 dy0 - - dy7..dy0 = y movement; positive = up, negative = down - -byte 3: - parity checking enabled (reg_11, P = 1): - - bit 7 6 5 4 3 2 1 0 - w h n1 n0 ds3 ds2 ds1 ds0 - - normally: - ds3..ds0 = scroll wheel amount and direction - positive = down or left - negative = up or right - when corner tap detected: - ds0 = 1 when top right corner tapped - ds1 = 1 when bottom right corner tapped - ds2 = 1 when bottom left corner tapped - ds3 = 1 when top left corner tapped - n1..n0 = number of fingers on touchpad - only models with firmware 2.x report this, models with - firmware 1.x seem to map one, two and three finger taps - directly to L, M and R mouse buttons - h = 1 when horizontal scroll action - w = 1 when wide finger touch? - - otherwise (reg_11, P = 0): - - bit 7 6 5 4 3 2 1 0 - ds7 ds6 ds5 ds4 ds3 ds2 ds1 ds0 - - ds7..ds0 = vertical scroll amount and direction - negative = up - positive = down - - -3.3 Native absolute mode 4 byte packet format - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -byte 0: - firmware version 1.x: - - bit 7 6 5 4 3 2 1 0 - D U p1 p2 1 p3 R L - - L, R = 1 when Left, Right mouse button pressed - p1..p3 = byte 1..3 odd parity bit - D, U = 1 when rocker switch pressed Up, Down - - firmware version 2.x: - - bit 7 6 5 4 3 2 1 0 - n1 n0 p2 p1 1 p3 R L - - L, R = 1 when Left, Right mouse button pressed - p1..p3 = byte 1..3 odd parity bit - n1..n0 = number of fingers on touchpad - -byte 1: - firmware version 1.x: - - bit 7 6 5 4 3 2 1 0 - f 0 th tw x9 x8 y9 y8 - - tw = 1 when two finger touch - th = 1 when three finger touch - f = 1 when finger touch - - firmware version 2.x: - - bit 7 6 5 4 3 2 1 0 - . . . . x9 x8 y9 y8 - -byte 2: - bit 7 6 5 4 3 2 1 0 - x7 x6 x5 x4 x3 x2 x1 x0 - - x9..x0 = absolute x value (horizontal) - -byte 3: - bit 7 6 5 4 3 2 1 0 - y7 y6 y5 y4 y3 y2 y1 y0 - - y9..y0 = absolute y value (vertical) - - -///////////////////////////////////////////////////////////////////////////// - - -4. Hardware version 2 - ================== - - -4.1 Registers - ~~~~~~~~~ - -By echoing a hexadecimal value to a register it contents can be altered. - -For example: - - echo -n 0x56 > reg_10 - -* reg_10 - - bit 7 6 5 4 3 2 1 0 - 0 1 0 1 0 1 D 0 - - D: 1 = enable drag and drop - -* reg_11 - - bit 7 6 5 4 3 2 1 0 - 1 0 0 0 S 0 1 0 - - S: 1 = enable vertical scroll - -* reg_21 - - unknown (0x00) - -* reg_22 - - drag and drop release time out (short: 0x70 ... long 0x7e; - 0x7f = never i.e. tap again to release) - - -4.2 Native absolute mode 6 byte packet format - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -4.2.1 One finger touch - ~~~~~~~~~~~~~~~~ - -byte 0: - - bit 7 6 5 4 3 2 1 0 - n1 n0 . . . . R L - - L, R = 1 when Left, Right mouse button pressed - n1..n0 = numbers of fingers on touchpad - -byte 1: - - bit 7 6 5 4 3 2 1 0 - x15 x14 x13 x12 x11 x10 x9 x8 - -byte 2: - - bit 7 6 5 4 3 2 1 0 - x7 x6 x5 x4 x4 x2 x1 x0 - - x15..x0 = absolute x value (horizontal) - -byte 3: - - bit 7 6 5 4 3 2 1 0 - . . . . . . . . - -byte 4: - - bit 7 6 5 4 3 2 1 0 - y15 y14 y13 y12 y11 y10 y8 y8 - -byte 5: - - bit 7 6 5 4 3 2 1 0 - y7 y6 y5 y4 y3 y2 y1 y0 - - y15..y0 = absolute y value (vertical) - - -4.2.2 Two finger touch - ~~~~~~~~~~~~~~~~ - -byte 0: - - bit 7 6 5 4 3 2 1 0 - n1 n0 ay8 ax8 . . R L - - L, R = 1 when Left, Right mouse button pressed - n1..n0 = numbers of fingers on touchpad - -byte 1: - - bit 7 6 5 4 3 2 1 0 - ax7 ax6 ax5 ax4 ax3 ax2 ax1 ax0 - - ax8..ax0 = first finger absolute x value - -byte 2: - - bit 7 6 5 4 3 2 1 0 - ay7 ay6 ay5 ay4 ay3 ay2 ay1 ay0 - - ay8..ay0 = first finger absolute y value - -byte 3: - - bit 7 6 5 4 3 2 1 0 - . . by8 bx8 . . . . - -byte 4: - - bit 7 6 5 4 3 2 1 0 - bx7 bx6 bx5 bx4 bx3 bx2 bx1 bx0 - - bx8..bx0 = second finger absolute x value - -byte 5: - - bit 7 6 5 4 3 2 1 0 - by7 by8 by5 by4 by3 by2 by1 by0 - - by8..by0 = second finger absolute y value diff --git a/trunk/Documentation/io-mapping.txt b/trunk/Documentation/io-mapping.txt deleted file mode 100644 index 473e43b2d588..000000000000 --- a/trunk/Documentation/io-mapping.txt +++ /dev/null @@ -1,82 +0,0 @@ -The io_mapping functions in linux/io-mapping.h provide an abstraction for -efficiently mapping small regions of an I/O device to the CPU. The initial -usage is to support the large graphics aperture on 32-bit processors where -ioremap_wc cannot be used to statically map the entire aperture to the CPU -as it would consume too much of the kernel address space. - -A mapping object is created during driver initialization using - - struct io_mapping *io_mapping_create_wc(unsigned long base, - unsigned long size) - - 'base' is the bus address of the region to be made - mappable, while 'size' indicates how large a mapping region to - enable. Both are in bytes. - - This _wc variant provides a mapping which may only be used - with the io_mapping_map_atomic_wc or io_mapping_map_wc. - -With this mapping object, individual pages can be mapped either atomically -or not, depending on the necessary scheduling environment. Of course, atomic -maps are more efficient: - - void *io_mapping_map_atomic_wc(struct io_mapping *mapping, - unsigned long offset) - - 'offset' is the offset within the defined mapping region. - Accessing addresses beyond the region specified in the - creation function yields undefined results. Using an offset - which is not page aligned yields an undefined result. The - return value points to a single page in CPU address space. - - This _wc variant returns a write-combining map to the - page and may only be used with mappings created by - io_mapping_create_wc - - Note that the task may not sleep while holding this page - mapped. - - void io_mapping_unmap_atomic(void *vaddr) - - 'vaddr' must be the the value returned by the last - io_mapping_map_atomic_wc call. This unmaps the specified - page and allows the task to sleep once again. - -If you need to sleep while holding the lock, you can use the non-atomic -variant, although they may be significantly slower. - - void *io_mapping_map_wc(struct io_mapping *mapping, - unsigned long offset) - - This works like io_mapping_map_atomic_wc except it allows - the task to sleep while holding the page mapped. - - void io_mapping_unmap(void *vaddr) - - This works like io_mapping_unmap_atomic, except it is used - for pages mapped with io_mapping_map_wc. - -At driver close time, the io_mapping object must be freed: - - void io_mapping_free(struct io_mapping *mapping) - -Current Implementation: - -The initial implementation of these functions uses existing mapping -mechanisms and so provides only an abstraction layer and no new -functionality. - -On 64-bit processors, io_mapping_create_wc calls ioremap_wc for the whole -range, creating a permanent kernel-visible mapping to the resource. The -map_atomic and map functions add the requested offset to the base of the -virtual address returned by ioremap_wc. - -On 32-bit processors with HIGHMEM defined, io_mapping_map_atomic_wc uses -kmap_atomic_pfn to map the specified page in an atomic fashion; -kmap_atomic_pfn isn't really supposed to be used with device pages, but it -provides an efficient mapping for this usage. - -On 32-bit processors without HIGHMEM defined, io_mapping_map_atomic_wc and -io_mapping_map_wc both use ioremap_wc, a terribly inefficient function which -performs an IPI to inform all processors about the new mapping. This results -in a significant performance penalty. diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl-number.txt similarity index 100% rename from trunk/Documentation/ioctl/ioctl-number.txt rename to trunk/Documentation/ioctl-number.txt diff --git a/trunk/Documentation/ioctl/00-INDEX b/trunk/Documentation/ioctl/00-INDEX deleted file mode 100644 index d2fe4d4729ef..000000000000 --- a/trunk/Documentation/ioctl/00-INDEX +++ /dev/null @@ -1,10 +0,0 @@ -00-INDEX - - this file -cdrom.txt - - summary of CDROM ioctl calls -hdio.txt - - summary of HDIO_ ioctl calls -ioctl-decoding.txt - - how to decode the bits of an IOCTL code -ioctl-number.txt - - how to implement and register device/driver ioctl calls diff --git a/trunk/Documentation/isdn/CREDITS b/trunk/Documentation/isdn/CREDITS index c1679e913fca..8cac6c2f23ee 100644 --- a/trunk/Documentation/isdn/CREDITS +++ b/trunk/Documentation/isdn/CREDITS @@ -5,7 +5,7 @@ I want to thank all who contributed to this project and especially to: Thomas Bogendörfer (tsbogend@bigbug.franken.de) Tester, lots of bugfixes and hints. -Alan Cox (alan@lxorguk.ukuu.org.uk) +Alan Cox (alan@redhat.com) For help getting into standard-kernel. Henner Eisen (eis@baty.hanse.de) diff --git a/trunk/Documentation/ja_JP/HOWTO b/trunk/Documentation/ja_JP/HOWTO index 55476982b5ca..0775cf4798b2 100644 --- a/trunk/Documentation/ja_JP/HOWTO +++ b/trunk/Documentation/ja_JP/HOWTO @@ -11,14 +11,14 @@ for non English (read: Japanese) speakers and is not intended as a fork. So if you have any comments or updates for this file, please try to update the original English file first. -Last Updated: 2008/10/24 +Last Updated: 2008/08/21 ================================== これは、 -linux-2.6.28/Documentation/HOWTO +linux-2.6.27/Documentation/HOWTO の和訳です。 翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ > -翻訳日： 2008/10/24 +翻訳日： 2008/8/5 翻訳者： Tsugikazu Shibata 校正者： 松倉さん 小林 雅典さん (Masanori Kobayasi) @@ -110,8 +110,8 @@ Linux カーネルソースツリーは幅広い範囲のドキュメントを 新しいドキュメントファイルも追加することを勧めます。 カーネルの変更が、カーネルがユーザ空間に公開しているインターフェイスの 変更を引き起こす場合、その変更を説明するマニュアルページのパッチや情報 -をマニュアルページのメンテナ mtk.manpages@gmail.com に送り、CC を -linux-api@ver.kernel.org に送ることを勧めます。 +をマニュアルページのメンテナ mtk.manpages@gmail.com に送ることを勧めま +す。 以下はカーネルソースツリーに含まれている読んでおくべきファイルの一覧で す- @@ -149,7 +149,7 @@ linux-api@ver.kernel.org に送ることを勧めます。 この他にパッチを作る方法についてのよくできた記述は- "The Perfect Patch" - http://userweb.kernel.org/~akpm/stuff/tpp.txt + http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt "Linux kernel patch submission format" http://linux.yyz.us/patch-format.html @@ -664,7 +664,7 @@ Linux カーネルコミュニティは、一度に大量のコードの塊を これについて全てがどのようにあるべきかについての詳細は、以下のドキュメ ントの ChangeLog セクションを見てください- "The Perfect Patch" - http://userweb.kernel.org/~akpm/stuff/tpp.txt + http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt これらのどれもが、時にはとても困難です。これらの慣例を完璧に実施するに は数年かかるかもしれません。これは継続的な改善のプロセスであり、そのた diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index e0f346d201ed..343e0f0f84b6 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -100,7 +100,7 @@ parameter is applicable: X86-32 X86-32, aka i386 architecture is enabled. X86-64 X86-64 architecture is enabled. More X86-64 boot options can be found in - Documentation/x86/x86_64/boot-options.txt . + Documentation/x86_64/boot-options.txt . X86 Either 32bit or 64bit x86 (same as X86-32+X86-64) In addition, the following text indicates that the option: @@ -112,10 +112,10 @@ In addition, the following text indicates that the option: Parameters denoted with BOOT are actually interpreted by the boot loader, and have no meaning to the kernel directly. Do not modify the syntax of boot loader parameters without extreme -need or coordination with . +need or coordination with . There are also arch-specific kernel-parameters not documented here. -See for example . +See for example . Note that ALL kernel parameters listed below are CASE SENSITIVE, and that a trailing = on the name of any parameter states that that parameter will @@ -198,42 +198,59 @@ and is between 256 and 4096 characters. It is defined in the file that require a timer override, but don't have HPET - acpi_backlight= [HW,ACPI] - acpi_backlight=vendor - acpi_backlight=video - If set to vendor, prefer vendor specific driver - (e.g. thinkpad_acpi, sony_acpi, etc.) instead - of the ACPI video.ko driver. - - acpi_display_output= [HW,ACPI] - acpi_display_output=vendor - acpi_display_output=video - See above. - - acpi.debug_layer= [HW,ACPI,ACPI_DEBUG] - acpi.debug_level= [HW,ACPI,ACPI_DEBUG] + acpi.debug_layer= [HW,ACPI] + Format: + Each bit of the indicates an ACPI debug layer, + 1: enable, 0: disable. It is useful for boot time + debugging. After system has booted up, it can be set + via /sys/module/acpi/parameters/debug_layer. + CONFIG_ACPI_DEBUG must be enabled for this to produce any output. + Available bits (add the numbers together) to enable debug output + for specific parts of the ACPI subsystem: + 0x01 utilities 0x02 hardware 0x04 events 0x08 tables + 0x10 namespace 0x20 parser 0x40 dispatcher + 0x80 executer 0x100 resources 0x200 acpica debugger + 0x400 os services 0x800 acpica disassembler. + The number can be in decimal or prefixed with 0x in hex. + Warning: Many of these options can produce a lot of + output and make your system unusable. Be very careful. + + acpi.debug_level= [HW,ACPI] Format: - CONFIG_ACPI_DEBUG must be enabled to produce any ACPI - debug output. Bits in debug_layer correspond to a - _COMPONENT in an ACPI source file, e.g., - #define _COMPONENT ACPI_PCI_COMPONENT - Bits in debug_level correspond to a level in - ACPI_DEBUG_PRINT statements, e.g., - ACPI_DEBUG_PRINT((ACPI_DB_INFO, ... - See Documentation/acpi/debug.txt for more information - about debug layers and levels. - - Enable AML "Debug" output, i.e., stores to the Debug - object while interpreting AML: - acpi.debug_layer=0xffffffff acpi.debug_level=0x2 - Enable PCI/PCI interrupt routing info messages: - acpi.debug_layer=0x400000 acpi.debug_level=0x4 - Enable all messages related to ACPI hardware: - acpi.debug_layer=0x2 acpi.debug_level=0xffffffff - - Some values produce so much output that the system is - unusable. The "log_buf_len" parameter may be useful - if you need to capture more output. + Each bit of the indicates an ACPI debug level, + which corresponds to the level in an ACPI_DEBUG_PRINT + statement. After system has booted up, this mask + can be set via /sys/module/acpi/parameters/debug_level. + + CONFIG_ACPI_DEBUG must be enabled for this to produce + any output. The number can be in decimal or prefixed + with 0x in hex. Some of these options produce so much + output that the system is unusable. + + The following global components are defined by the + ACPI CA: + 0x01 error + 0x02 warn + 0x04 init + 0x08 debug object + 0x10 info + 0x20 init names + 0x40 parse + 0x80 load + 0x100 dispatch + 0x200 execute + 0x400 names + 0x800 operation region + 0x1000 bfield + 0x2000 tables + 0x4000 values + 0x8000 objects + 0x10000 resources + 0x20000 user requests + 0x40000 package + The number can be in decimal or prefixed with 0x in hex. + Warning: Many of these options can produce a lot of + output and make your system unusable. Be very careful. acpi.power_nocheck= [HW,ACPI] Format: 1/0 enable/disable the check of power state. @@ -294,9 +311,7 @@ and is between 256 and 4096 characters. It is defined in the file Possible values are: isolate - enable device isolation (each device, as far as possible, will get its own protection - domain) [default] - share - put every device behind one IOMMU into the - same protection domain + domain) fullflush - enable flushing of IO/TLB entries when they are unmapped. Otherwise they are flushed before they will be reused, which @@ -631,7 +646,7 @@ and is between 256 and 4096 characters. It is defined in the file digiepca= [HW,SERIAL] See drivers/char/README.epca and - Documentation/serial/digiepca.txt. + Documentation/digiepca.txt. disable_mtrr_cleanup [X86] enable_mtrr_cleanup [X86] @@ -742,7 +757,7 @@ and is between 256 and 4096 characters. It is defined in the file See header of drivers/scsi/fdomain.c. floppy= [HW] - See Documentation/blockdev/floppy.txt. + See Documentation/floppy.txt. force_pal_cache_flush [IA-64] Avoid check_sal_cache_flush which may hang on @@ -980,15 +995,13 @@ and is between 256 and 4096 characters. It is defined in the file Format: ,..., or - - - (must be a positive range in ascending order) + - (must be a positive range in ascending order) or a mixture ,...,- - This option can be used to specify one or more CPUs to isolate from the general SMP balancing and scheduling - algorithms. You can move a process onto or off an - "isolated" CPU via the CPU affinity syscalls or cpuset. + algorithms. The only way to move a process onto or off + an "isolated" CPU is via the CPU affinity syscalls. begins at 0 and the maximum value is "number of CPUs in system - 1". @@ -1103,7 +1116,7 @@ and is between 256 and 4096 characters. It is defined in the file the same attribute, the last one is used. load_ramdisk= [RAM] List of ramdisks to load from floppy - See Documentation/blockdev/ramdisk.txt. + See Documentation/ramdisk.txt. lockd.nlm_grace_period=P [NFS] Assign grace period. Format: @@ -1195,8 +1208,8 @@ and is between 256 and 4096 characters. It is defined in the file it is equivalent to "nosmp", which also disables the IO APIC. - max_addr=nn[KMG] [KNL,BOOT,ia64] All physical memory greater than - or equal to this physical address is ignored. + max_addr=[KMG] [KNL,BOOT,ia64] All physical memory greater than or + equal to this physical address is ignored. max_luns= [SCSI] Maximum number of LUNs to probe. Should be between 1 and 2^32-1. @@ -1209,7 +1222,7 @@ and is between 256 and 4096 characters. It is defined in the file mce [X86-32] Machine Check Exception - mce=option [X86-64] See Documentation/x86/x86_64/boot-options.txt + mce=option [X86-64] See Documentation/x86_64/boot-options.txt md= [HW] RAID subsystems devices and level See Documentation/md.txt. @@ -1296,9 +1309,6 @@ and is between 256 and 4096 characters. It is defined in the file mga= [HW,DRM] - min_addr=nn[KMG] [KNL,BOOT,ia64] All physical memory below this - physical address is ignored. - mminit_loglevel= [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this parameter allows control of the logging verbosity for @@ -1460,6 +1470,8 @@ and is between 256 and 4096 characters. It is defined in the file Valid arguments: on, off Default: on + noirqbalance [X86-32,SMP,KNL] Disable kernel irq balancing + noirqdebug [X86-32] Disables the code which attempts to detect and disable unhandled interrupt sources. @@ -1601,7 +1613,7 @@ and is between 256 and 4096 characters. It is defined in the file pcd. [PARIDE] See header of drivers/block/paride/pcd.c. - See also Documentation/blockdev/paride.txt. + See also Documentation/paride.txt. pci=option[,option...] [PCI] various PCI subsystem options: off [X86] don't probe for the PCI bus @@ -1702,7 +1714,7 @@ and is between 256 and 4096 characters. It is defined in the file pcmv= [HW,PCMCIA] BadgePAD 4 pd. [PARIDE] - See Documentation/blockdev/paride.txt. + See Documentation/paride.txt. pdcchassis= [PARISC,HW] Disable/Enable PDC Chassis Status codes at boot time. @@ -1710,13 +1722,13 @@ and is between 256 and 4096 characters. It is defined in the file See arch/parisc/kernel/pdc_chassis.c pf. [PARIDE] - See Documentation/blockdev/paride.txt. + See Documentation/paride.txt. pg. [PARIDE] - See Documentation/blockdev/paride.txt. + See Documentation/paride.txt. pirq= [SMP,APIC] Manual mp-table setup - See Documentation/x86/i386/IO-APIC.txt. + See Documentation/i386/IO-APIC.txt. plip= [PPT,NET] Parallel port network link Format: { parport | timid | 0 } @@ -1783,7 +1795,7 @@ and is between 256 and 4096 characters. It is defined in the file prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk before loading. - See Documentation/blockdev/ramdisk.txt. + See Documentation/ramdisk.txt. psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to probe for; one of (bare|imps|exps|lifebook|any). @@ -1803,7 +1815,7 @@ and is between 256 and 4096 characters. It is defined in the file ,,,,, pt. [PARIDE] - See Documentation/blockdev/paride.txt. + See Documentation/paride.txt. pty.legacy_count= [KNL] Number of legacy pty's. Overwrites compiled-in @@ -1817,10 +1829,10 @@ and is between 256 and 4096 characters. It is defined in the file See Documentation/md.txt. ramdisk_blocksize= [RAM] - See Documentation/blockdev/ramdisk.txt. + See Documentation/ramdisk.txt. ramdisk_size= [RAM] Sizes of RAM disks in kilobytes - See Documentation/blockdev/ramdisk.txt. + See Documentation/ramdisk.txt. rcupdate.blimit= [KNL,BOOT] Set maximum number of finished RCU callbacks to process @@ -2152,7 +2164,7 @@ and is between 256 and 4096 characters. It is defined in the file See Documentation/sonypi.txt specialix= [HW,SERIAL] Specialix multi-serial port adapter - See Documentation/serial/specialix.txt. + See Documentation/specialix.txt. spia_io_base= [HW,MTD] spia_fio_base= @@ -2331,7 +2343,7 @@ and is between 256 and 4096 characters. It is defined in the file See Documentation/fb/modedb.txt. vga= [BOOT,X86-32] Select a particular video mode - See Documentation/x86/i386/boot.txt and + See Documentation/i386/boot.txt and Documentation/svga.txt. Use vga=ask for menu. This is actually a boot loader parameter; the value is diff --git a/trunk/Documentation/lguest/Makefile b/trunk/Documentation/lguest/Makefile index 725eef81cd48..bac037eb1cda 100644 --- a/trunk/Documentation/lguest/Makefile +++ b/trunk/Documentation/lguest/Makefile @@ -1,5 +1,5 @@ # This creates the demonstration utility "lguest" which runs a Linux guest. -CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include +CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include LDLIBS:=-lz all: lguest diff --git a/trunk/Documentation/lguest/lguest.c b/trunk/Documentation/lguest/lguest.c index 804520633fcf..7228369d1014 100644 --- a/trunk/Documentation/lguest/lguest.c +++ b/trunk/Documentation/lguest/lguest.c @@ -44,7 +44,7 @@ #include "linux/virtio_console.h" #include "linux/virtio_rng.h" #include "linux/virtio_ring.h" -#include "asm/bootparam.h" +#include "asm-x86/bootparam.h" /*L:110 We can ignore the 39 include files we need for this program, but I do * want to draw attention to the use of kernel-style types. * @@ -402,7 +402,7 @@ static unsigned long load_bzimage(int fd) void *p = from_guest_phys(0x100000); /* Go back to the start of the file and read the header. It should be - * a Linux boot header (see Documentation/x86/i386/boot.txt) */ + * a Linux boot header (see Documentation/i386/boot.txt) */ lseek(fd, 0, SEEK_SET); read(fd, &boot, sizeof(boot)); diff --git a/trunk/Documentation/serial/moxa-smartio b/trunk/Documentation/moxa-smartio similarity index 100% rename from trunk/Documentation/serial/moxa-smartio rename to trunk/Documentation/moxa-smartio diff --git a/trunk/Documentation/blockdev/nbd.txt b/trunk/Documentation/nbd.txt similarity index 100% rename from trunk/Documentation/blockdev/nbd.txt rename to trunk/Documentation/nbd.txt diff --git a/trunk/Documentation/networking/.gitignore b/trunk/Documentation/networking/.gitignore deleted file mode 100644 index 286a5680f490..000000000000 --- a/trunk/Documentation/networking/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ifenslave diff --git a/trunk/Documentation/networking/dmfe.txt b/trunk/Documentation/networking/dmfe.txt index 8006c227fda2..b1b7499dd9d3 100644 --- a/trunk/Documentation/networking/dmfe.txt +++ b/trunk/Documentation/networking/dmfe.txt @@ -60,6 +60,6 @@ Tobias Ringstrom : Current Maintainer Contributors: Marcelo Tosatti -Alan Cox +Alan Cox Jeff Garzik Vojtech Pavlik diff --git a/trunk/Documentation/networking/phy.txt b/trunk/Documentation/networking/phy.txt index 88bb71b46da4..8df6a7b0e66c 100644 --- a/trunk/Documentation/networking/phy.txt +++ b/trunk/Documentation/networking/phy.txt @@ -96,7 +96,7 @@ Letting the PHY Abstraction Layer do Everything static void adjust_link(struct net_device *dev); Next, you need to know the device name of the PHY connected to this device. - The name will look something like, "0:00", where the first number is the + The name will look something like, "phy0:0", where the first number is the bus id, and the second is the PHY's address on that bus. Typically, the bus is responsible for making its ID unique. diff --git a/trunk/Documentation/blockdev/paride.txt b/trunk/Documentation/paride.txt similarity index 100% rename from trunk/Documentation/blockdev/paride.txt rename to trunk/Documentation/paride.txt diff --git a/trunk/Documentation/pcmcia/.gitignore b/trunk/Documentation/pcmcia/.gitignore deleted file mode 100644 index 53d081336757..000000000000 --- a/trunk/Documentation/pcmcia/.gitignore +++ /dev/null @@ -1 +0,0 @@ -crc32hash diff --git a/trunk/Documentation/powerpc/booting-without-of.txt b/trunk/Documentation/powerpc/booting-without-of.txt index 0ab0230cbcb0..02ea9a971b8e 100644 --- a/trunk/Documentation/powerpc/booting-without-of.txt +++ b/trunk/Documentation/powerpc/booting-without-of.txt @@ -41,14 +41,25 @@ Table of Contents VI - System-on-a-chip devices and nodes 1) Defining child nodes of an SOC 2) Representing devices without a current OF specification - a) PHY nodes - b) Interrupt controllers - c) CFI or JEDEC memory-mapped NOR flash - d) 4xx/Axon EMAC ethernet nodes - e) Xilinx IP cores - f) USB EHCI controllers - g) MDIO on GPIOs - h) SPI busses + a) MDIO IO device + b) Gianfar-compatible ethernet nodes + c) PHY nodes + d) Interrupt controllers + e) I2C + f) Freescale SOC USB controllers + g) Freescale SOC SEC Security Engines + h) Board Control and Status (BCSR) + i) Freescale QUICC Engine module (QE) + j) CFI or JEDEC memory-mapped NOR flash + k) Global Utilities Block + l) Freescale Communications Processor Module + m) Chipselect/Local Bus + n) 4xx/Axon EMAC ethernet nodes + o) Xilinx IP cores + p) Freescale Synchronous Serial Interface + q) USB EHCI controllers + r) MDIO on GPIOs + s) SPI busses VII - Marvell Discovery mv64[345]6x System Controller chips 1) The /system-controller node @@ -1819,7 +1830,41 @@ platforms are moved over to use the flattened-device-tree model. big-endian; }; - g) MDIO on GPIOs + r) Freescale Display Interface Unit + + The Freescale DIU is a LCD controller, with proper hardware, it can also + drive DVI monitors. + + Required properties: + - compatible : should be "fsl-diu". + - reg : should contain at least address and length of the DIU register + set. + - Interrupts : one DIU interrupt should be describe here. + + Example (MPC8610HPCD) + display@2c000 { + compatible = "fsl,diu"; + reg = <0x2c000 100>; + interrupts = <72 2>; + interrupt-parent = <&mpic>; + }; + + s) Freescale on board FPGA + + This is the memory-mapped registers for on board FPGA. + + Required properities: + - compatible : should be "fsl,fpga-pixis". + - reg : should contain the address and the lenght of the FPPGA register + set. + + Example (MPC8610HPCD) + board-control@e8000000 { + compatible = "fsl,fpga-pixis"; + reg = <0xe8000000 32>; + }; + + r) MDIO on GPIOs Currently defined compatibles: - virtual,gpio-mdio @@ -1839,7 +1884,7 @@ platforms are moved over to use the flattened-device-tree model. &qe_pio_c 6>; }; - h) SPI (Serial Peripheral Interface) busses + s) SPI (Serial Peripheral Interface) busses SPI busses can be described with a node for the SPI master device and a set of child nodes for each SPI slave on the bus. For this diff --git a/trunk/Documentation/printk-formats.txt b/trunk/Documentation/printk-formats.txt deleted file mode 100644 index 1b5a5ddbc3ef..000000000000 --- a/trunk/Documentation/printk-formats.txt +++ /dev/null @@ -1,35 +0,0 @@ -If variable is of Type, use printk format specifier: ---------------------------------------------------------- - int %d or %x - unsigned int %u or %x - long %ld or %lx - unsigned long %lu or %lx - long long %lld or %llx - unsigned long long %llu or %llx - size_t %zu or %zx - ssize_t %zd or %zx - -Raw pointer value SHOULD be printed with %p. - -u64 SHOULD be printed with %llu/%llx, (unsigned long long): - - printk("%llu", (unsigned long long)u64_var); - -s64 SHOULD be printed with %lld/%llx, (long long): - - printk("%lld", (long long)s64_var); - -If is dependent on a config option for its size (e.g., sector_t, -blkcnt_t, phys_addr_t, resource_size_t) or is architecture-dependent -for its size (e.g., tcflag_t), use a format specifier of its largest -possible type and explicitly cast to it. Example: - - printk("test: sector number/total blocks: %llu/%llu\n", - (unsigned long long)sector, (unsigned long long)blockcount); - -Reminder: sizeof() result is of type size_t. - -Thank you for your cooperation and attention. - - -By Randy Dunlap diff --git a/trunk/Documentation/blockdev/ramdisk.txt b/trunk/Documentation/ramdisk.txt similarity index 100% rename from trunk/Documentation/blockdev/ramdisk.txt rename to trunk/Documentation/ramdisk.txt diff --git a/trunk/Documentation/serial/riscom8.txt b/trunk/Documentation/riscom8.txt similarity index 100% rename from trunk/Documentation/serial/riscom8.txt rename to trunk/Documentation/riscom8.txt diff --git a/trunk/Documentation/serial/rocket.txt b/trunk/Documentation/rocket.txt similarity index 100% rename from trunk/Documentation/serial/rocket.txt rename to trunk/Documentation/rocket.txt diff --git a/trunk/Documentation/scheduler/00-INDEX b/trunk/Documentation/scheduler/00-INDEX index aabcc3a089ba..fc234d093fbf 100644 --- a/trunk/Documentation/scheduler/00-INDEX +++ b/trunk/Documentation/scheduler/00-INDEX @@ -4,6 +4,8 @@ sched-arch.txt - CPU Scheduler implementation hints for architecture specific code. sched-coding.txt - reference for various scheduler-related methods in the O(1) scheduler. +sched-design.txt + - goals, design and implementation of the Linux O(1) scheduler. sched-design-CFS.txt - goals, design and implementation of the Complete Fair Scheduler. sched-domains.txt diff --git a/trunk/Documentation/scheduler/sched-design-CFS.txt b/trunk/Documentation/scheduler/sched-design-CFS.txt index eb471c7a905e..9d8eb553884c 100644 --- a/trunk/Documentation/scheduler/sched-design-CFS.txt +++ b/trunk/Documentation/scheduler/sched-design-CFS.txt @@ -92,7 +92,7 @@ other HZ detail. Thus the CFS scheduler has no notion of "timeslices" in the way the previous scheduler had, and has no heuristics whatsoever. There is only one central tunable (you have to switch on CONFIG_SCHED_DEBUG): - /proc/sys/kernel/sched_min_granularity_ns + /proc/sys/kernel/sched_granularity_ns which can be used to tune the scheduler from "desktop" (i.e., low latencies) to "server" (i.e., good batching) workloads. It defaults to a setting suitable diff --git a/trunk/Documentation/scsi/aacraid.txt b/trunk/Documentation/scsi/aacraid.txt index ddace3afc83b..709ca991a451 100644 --- a/trunk/Documentation/scsi/aacraid.txt +++ b/trunk/Documentation/scsi/aacraid.txt @@ -128,7 +128,7 @@ Supported Cards/Chipsets People ------------------------- -Alan Cox +Alan Cox Christoph Hellwig (updates for new-style PCI probing and SCSI host registration, small cleanups/fixes) Matt Domsch (revision ioctl, adapter messages) diff --git a/trunk/Documentation/serial/00-INDEX b/trunk/Documentation/serial/00-INDEX deleted file mode 100644 index 07dcdb0d2a36..000000000000 --- a/trunk/Documentation/serial/00-INDEX +++ /dev/null @@ -1,24 +0,0 @@ -00-INDEX - - this file. -README.cycladesZ - - info on Cyclades-Z firmware loading. -computone.txt - - info on Computone Intelliport II/Plus Multiport Serial Driver. -digiepca.txt - - info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards. -hayes-esp.txt - - info on using the Hayes ESP serial driver. -moxa-smartio - - file with info on installing/using Moxa multiport serial driver. -riscom8.txt - - notes on using the RISCom/8 multi-port serial driver. -rocket.txt - - info on the Comtrol RocketPort multiport serial driver. -specialix.txt - - info on hardware/driver for specialix IO8+ multiport serial card. -stallion.txt - - info on using the Stallion multiport serial driver. -sx.txt - - info on the Specialix SX/SI multiport serial driver. -tty.txt - - guide to the locking policies of the tty layer. diff --git a/trunk/Documentation/sh/new-machine.txt b/trunk/Documentation/sh/new-machine.txt index f0354164cb0e..5482bf5d005b 100644 --- a/trunk/Documentation/sh/new-machine.txt +++ b/trunk/Documentation/sh/new-machine.txt @@ -47,7 +47,9 @@ Next, for companion chips: `-- sh `-- cchips `-- hd6446x - `-- hd64461 + |-- hd64461 + | `-- cchip-specific files + `-- hd64465 `-- cchip-specific files ... and so on. Headers for the companion chips are treated the same way as diff --git a/trunk/Documentation/serial/specialix.txt b/trunk/Documentation/specialix.txt similarity index 100% rename from trunk/Documentation/serial/specialix.txt rename to trunk/Documentation/specialix.txt diff --git a/trunk/Documentation/spi/.gitignore b/trunk/Documentation/spi/.gitignore deleted file mode 100644 index 4280576397e8..000000000000 --- a/trunk/Documentation/spi/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -spidev_fdx -spidev_test diff --git a/trunk/Documentation/stable_kernel_rules.txt b/trunk/Documentation/stable_kernel_rules.txt index a452227361b1..4cfc78835bc1 100644 --- a/trunk/Documentation/stable_kernel_rules.txt +++ b/trunk/Documentation/stable_kernel_rules.txt @@ -12,7 +12,6 @@ Rules on what kind of patches are accepted, and which ones are not, into the marked CONFIG_BROKEN), an oops, a hang, data corruption, a real security issue, or some "oh, that's not good" issue. In short, something critical. - - New device IDs and quirks are also accepted. - No "theoretical race condition" issues, unless an explanation of how the race can be exploited is also provided. - It cannot contain any "trivial" fixes in it (spelling changes, diff --git a/trunk/Documentation/serial/stallion.txt b/trunk/Documentation/stallion.txt similarity index 100% rename from trunk/Documentation/serial/stallion.txt rename to trunk/Documentation/stallion.txt diff --git a/trunk/Documentation/serial/sx.txt b/trunk/Documentation/sx.txt similarity index 100% rename from trunk/Documentation/serial/sx.txt rename to trunk/Documentation/sx.txt diff --git a/trunk/Documentation/sysctl/kernel.txt b/trunk/Documentation/sysctl/kernel.txt index a4ccdd1981cf..bde799e06598 100644 --- a/trunk/Documentation/sysctl/kernel.txt +++ b/trunk/Documentation/sysctl/kernel.txt @@ -363,21 +363,11 @@ tainted: Non-zero if the kernel has been tainted. Numeric values, which can be ORed together: - 1 - A module with a non-GPL license has been loaded, this - includes modules with no license. - Set by modutils >= 2.4.9 and module-init-tools. - 2 - A module was force loaded by insmod -f. - Set by modutils >= 2.4.9 and module-init-tools. - 4 - Unsafe SMP processors: SMP with CPUs not designed for SMP. - 8 - A module was forcibly unloaded from the system by rmmod -f. - 16 - A hardware machine check error occurred on the system. - 32 - A bad page was discovered on the system. - 64 - The user has asked that the system be marked "tainted". This - could be because they are running software that directly modifies - the hardware, or for other reasons. - 128 - The system has died. - 256 - The ACPI DSDT has been overridden with one supplied by the user - instead of using the one provided by the hardware. - 512 - A kernel warning has occurred. -1024 - A module from drivers/staging was loaded. + 1 - A module with a non-GPL license has been loaded, this + includes modules with no license. + Set by modutils >= 2.4.9 and module-init-tools. + 2 - A module was force loaded by insmod -f. + Set by modutils >= 2.4.9 and module-init-tools. + 4 - Unsafe SMP processors: SMP with CPUs not designed for SMP. + 64 - A module from drivers/staging was loaded. diff --git a/trunk/Documentation/serial/tty.txt b/trunk/Documentation/tty.txt similarity index 100% rename from trunk/Documentation/serial/tty.txt rename to trunk/Documentation/tty.txt diff --git a/trunk/Documentation/video4linux/.gitignore b/trunk/Documentation/video4linux/.gitignore deleted file mode 100644 index 952703943e8e..000000000000 --- a/trunk/Documentation/video4linux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -v4lgrab diff --git a/trunk/Documentation/video4linux/README.cx88 b/trunk/Documentation/video4linux/README.cx88 index 166d5960b1a9..06a33a4f52fd 100644 --- a/trunk/Documentation/video4linux/README.cx88 +++ b/trunk/Documentation/video4linux/README.cx88 @@ -27,8 +27,8 @@ audio sound card) should be possible, but there is no code yet ... vbi - - Code present. Works for NTSC closed caption. PAL and other - TV norms may or may not work. + - some code present. Doesn't crash any more, but also doesn't + work yet ... how to add support for new cards diff --git a/trunk/Documentation/video4linux/bttv/CONTRIBUTORS b/trunk/Documentation/video4linux/bttv/CONTRIBUTORS index eb41b2650860..8aad6dd93d6b 100644 --- a/trunk/Documentation/video4linux/bttv/CONTRIBUTORS +++ b/trunk/Documentation/video4linux/bttv/CONTRIBUTORS @@ -3,7 +3,7 @@ Contributors to bttv: Michael Chu AverMedia fix and more flexible card recognition -Alan Cox +Alan Cox Video4Linux interface and 2.1.x kernel adaptation Chris Kleitsch diff --git a/trunk/Documentation/video4linux/si470x.txt b/trunk/Documentation/video4linux/si470x.txt deleted file mode 100644 index 11c5fd22a332..000000000000 --- a/trunk/Documentation/video4linux/si470x.txt +++ /dev/null @@ -1,118 +0,0 @@ -Driver for USB radios for the Silicon Labs Si470x FM Radio Receivers - -Copyright (c) 2008 Tobias Lorenz - - -Information from Silicon Labs -============================= -Silicon Laboratories is the manufacturer of the radio ICs, that nowadays are the -most often used radio receivers in cell phones. Usually they are connected with -I2C. But SiLabs also provides a reference design, which integrates this IC, -together with a small microcontroller C8051F321, to form a USB radio. -Part of this reference design is also a radio application in binary and source -code. The software also contains an automatic firmware upgrade to the most -current version. Information on these can be downloaded here: -http://www.silabs.com/usbradio - - -Supported ICs -============= -The following ICs have a very similar register set, so that they are or will be -supported somewhen by the driver: -- Si4700: FM radio receiver -- Si4701: FM radio receiver, RDS Support -- Si4702: FM radio receiver -- Si4703: FM radio receiver, RDS Support -- Si4704: FM radio receiver, no external antenna required -- Si4705: FM radio receiver, no external antenna required, RDS support, Dig I/O -- Si4706: Enhanced FM RDS/TMC radio receiver, no external antenna required, RDS - Support -- Si4707: Dedicated weather band radio receiver with SAME decoder, RDS Support -- Si4708: Smallest FM receivers -- Si4709: Smallest FM receivers, RDS Support -More information on these can be downloaded here: -http://www.silabs.com/products/mcu/Pages/USBFMRadioRD.aspx - - -Supported USB devices -===================== -Currently the following USB radios (vendor:product) with the Silicon Labs si470x -chips are known to work: -- 10c4:818a: Silicon Labs USB FM Radio Reference Design -- 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF) -- 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700) - - -Software -======== -Testing is usually done with most application under Debian/testing: -- fmtools - Utility for managing FM tuner cards -- gnomeradio - FM-radio tuner for the GNOME desktop -- gradio - GTK FM radio tuner -- kradio - Comfortable Radio Application for KDE -- radio - ncurses-based radio application - -There is also a library libv4l, which can be used. It's going to have a function -for frequency seeking, either by using hardware functionality as in radio-si470x -or by implementing a function as we currently have in every of the mentioned -programs. Somewhen the radio programs should make use of libv4l. - -For processing RDS information, there is a project ongoing at: -http://rdsd.berlios.de/ - -There is currently no project for making TMC sentences human readable. - - -Audio Listing -============= -USB Audio is provided by the ALSA snd_usb_audio module. It is recommended to -also select SND_USB_AUDIO, as this is required to get sound from the radio. For -listing you have to redirect the sound, for example using one of the following -commands. - -If you just want to test audio (very poor quality): -cat /dev/dsp1 > /dev/dsp - -If you use OSS try: -sox -2 --endian little -r 96000 -t oss /dev/dsp1 -t oss /dev/dsp - -If you use arts try: -arecord -D hw:1,0 -r96000 -c2 -f S16_LE | artsdsp aplay -B - - - -Module Parameters -================= -After loading the module, you still have access to some of them in the sysfs -mount under /sys/module/radio_si470x/parameters. The contents of read-only files -(0444) are not updated, even if space, band and de are changed using private -video controls. The others are runtime changeable. - - -Errors -====== -Increase tune_timeout, if you often get -EIO errors. - -When timed out or band limit is reached, hw_freq_seek returns -EAGAIN. - -If you get any errors from snd_usb_audio, please report them to the ALSA people. - - -Open Issues -=========== -V4L minor device allocation and parameter setting is not perfect. A solution is -currently under discussion. - -There is an USB interface for downloading/uploading new firmware images. Support -for it can be implemented using the request_firmware interface. - -There is a RDS interrupt mode. The driver is already using the same interface -for polling RDS information, but is currently not using the interrupt mode. - -There is a LED interface, which can be used to override the LED control -programmed in the firmware. This can be made available using the LED support -functions in the kernel. - - -Other useful information and links -================================== -http://www.silabs.com/usbradio diff --git a/trunk/Documentation/vm/.gitignore b/trunk/Documentation/vm/.gitignore deleted file mode 100644 index 33e8a023df02..000000000000 --- a/trunk/Documentation/vm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -slabinfo diff --git a/trunk/Documentation/w1/masters/omap-hdq b/trunk/Documentation/w1/masters/omap-hdq deleted file mode 100644 index ca722e09b6a1..000000000000 --- a/trunk/Documentation/w1/masters/omap-hdq +++ /dev/null @@ -1,46 +0,0 @@ -Kernel driver for omap HDQ/1-wire module. -======================================== - -Supported chips: -================ - HDQ/1-wire controller on the TI OMAP 2430/3430 platforms. - -A useful link about HDQ basics: -=============================== -http://focus.ti.com/lit/an/slua408/slua408.pdf - -Description: -============ -The HDQ/1-Wire module of TI OMAP2430/3430 platforms implement the hardware -protocol of the master functions of the Benchmark HDQ and the Dallas -Semiconductor 1-Wire protocols. These protocols use a single wire for -communication between the master (HDQ/1-Wire controller) and the slave -(HDQ/1-Wire external compliant device). - -A typical application of the HDQ/1-Wire module is the communication with battery -monitor (gas gauge) integrated circuits. - -The controller supports operation in both HDQ and 1-wire mode. The essential -difference between the HDQ and 1-wire mode is how the slave device responds to -initialization pulse.In HDQ mode, the firmware does not require the host to -create an initialization pulse to the slave.However, the slave can be reset by -using an initialization pulse (also referred to as a break pulse).The slave -does not respond with a presence pulse as it does in the 1-Wire protocol. - -Remarks: -======== -The driver (drivers/w1/masters/omap_hdq.c) supports the HDQ mode of the -controller. In this mode, as we can not read the ID which obeys the W1 -spec(family:id:crc), a module parameter can be passed to the driver which will -be used to calculate the CRC and pass back an appropriate slave ID to the W1 -core. - -By default the master driver and the BQ slave i/f -driver(drivers/w1/slaves/w1_bq27000.c) sets the ID to 1. -Please note to load both the modules with a different ID if required, but note -that the ID used should be same for both master and slave driver loading. - -e.g: -insmod omap_hdq.ko W1_ID=2 -inamod w1_bq27000.ko F_ID=2 - diff --git a/trunk/Documentation/watchdog/src/.gitignore b/trunk/Documentation/watchdog/src/.gitignore deleted file mode 100644 index ac90997dba93..000000000000 --- a/trunk/Documentation/watchdog/src/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -watchdog-simple -watchdog-test diff --git a/trunk/Documentation/x86/x86_64/boot-options.txt b/trunk/Documentation/x86/x86_64/boot-options.txt index f6d561a1a9b2..72ffb5373ec7 100644 --- a/trunk/Documentation/x86/x86_64/boot-options.txt +++ b/trunk/Documentation/x86/x86_64/boot-options.txt @@ -35,7 +35,7 @@ APICs nolapic Don't use the local APIC (alias for i386 compatibility) - pirq=... See Documentation/x86/i386/IO-APIC.txt + pirq=... See Documentation/i386/IO-APIC.txt noapictimer Don't set up the APIC timer @@ -139,7 +139,7 @@ Non Executable Mappings SMP additional_cpus=NUM Allow NUM more CPUs for hotplug - (defaults are specified by the BIOS, see Documentation/x86/x86_64/cpu-hotplug-spec) + (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec) NUMA diff --git a/trunk/Documentation/x86/x86_64/fake-numa-for-cpusets b/trunk/Documentation/x86/x86_64/fake-numa-for-cpusets index 33bb56655991..d1a985c5b00a 100644 --- a/trunk/Documentation/x86/x86_64/fake-numa-for-cpusets +++ b/trunk/Documentation/x86/x86_64/fake-numa-for-cpusets @@ -10,7 +10,7 @@ amount of system memory that are available to a certain class of tasks. For more information on the features of cpusets, see Documentation/cpusets.txt. There are a number of different configurations you can use for your needs. For more information on the numa=fake command line option and its various ways of -configuring fake nodes, see Documentation/x86/x86_64/boot-options.txt. +configuring fake nodes, see Documentation/x86_64/boot-options.txt. For the purposes of this introduction, we'll assume a very primitive NUMA emulation setup of "numa=fake=4*512,". This will split our system memory into diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 618c1ef4a397..16202c8ac68f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -347,7 +347,7 @@ S: Maintained ALI1563 I2C DRIVER P: Rudolf Marek M: r.marek@assembler.cz -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org S: Maintained ALPHA PORT @@ -610,11 +610,6 @@ P: Philipp Zabel M: philipp.zabel@gmail.com S: Maintained -ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT -P: Michael Petchkovsky -M: mkpetch@internode.on.net -S: Maintained - ARM/TOSA MACHINE SUPPORT P: Dmitry Baryshkov M: dbaryshkov@gmail.com @@ -721,7 +716,7 @@ W: http://sourceforge.net/projects/acpi4asus W: http://xf.iksaif.net/acpi4asus S: Maintained -ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API +ASYNCHRONOUS TRANSFERS/TRANSFORMS API P: Dan Williams M: dan.j.williams@intel.com P: Maciej Sosnowski @@ -743,8 +738,6 @@ P: Nick Kossifidis M: mickflemm@gmail.com P: Luis R. Rodriguez M: mcgrof@gmail.com -P: Bob Copeland -M: me@bobcopeland.com L: linux-wireless@vger.kernel.org L: ath5k-devel@lists.ath5k.org S: Maintained @@ -1756,7 +1749,7 @@ FREESCALE I2C CPM DRIVER P: Jochen Friedrich M: jochen@scram.de L: linuxppc-dev@ozlabs.org -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org S: Maintained FREESCALE SOC FS_ENET DRIVER @@ -1809,7 +1802,7 @@ S: Maintained FTRACE P: Steven Rostedt -M: rostedt@goodmis.org +M: srostedt@redhat.com S: Maintained FUJITSU FR-V (FRV) PORT @@ -1879,37 +1872,6 @@ M: linux-kernel@vger.kernel.org W: http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/ S: Maintained -GSPCA FINEPIX SUBDRIVER -P: Frank Zago -M: frank@zago.net -L: video4linux-list@redhat.com -S: Maintained - -GSPCA M5602 SUBDRIVER -P: Erik Andren -M: erik.andren@gmail.com -L: video4linux-list@redhat.com -S: Maintained - -GSPCA PAC207 SONIXB SUBDRIVER -P: Hans de Goede -M: hdegoede@redhat.com -L: video4linux-list@redhat.com -S: Maintained - -GSPCA T613 SUBDRIVER -P: Leandro Costantino -M: lcostantino@gmail.com -L: video4linux-list@redhat.com -S: Maintained - -GSPCA USB WEBCAM DRIVER -P: Jean-Francois Moine -M: moinejf@free.fr -W: http://moinejf.free.fr -L: video4linux-list@redhat.com -S: Maintained - HARDWARE MONITORING L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.org/ @@ -2060,7 +2022,7 @@ S: Maintained I2C/SMBUS STUB DRIVER P: Mark M. Hoffman M: mhoffman@lightlink.com -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org S: Maintained I2C SUBSYSTEM @@ -2068,14 +2030,14 @@ P: Jean Delvare (PC drivers, core) M: khali@linux-fr.org P: Ben Dooks (embedded platforms) M: ben-linux@fluff.org -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ S: Maintained I2C-TINY-USB DRIVER P: Till Harbaum M: till@harbaum.org -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org T: http://www.harbaum.org/till/i2c_tiny_usb S: Maintained @@ -2216,13 +2178,6 @@ M: adaplas@gmail.com L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) S: Maintained -INTEL MENLOW THERMAL DRIVER -P: Sujith Thomas -M: sujith.thomas@intel.com -L: linux-acpi@vger.kernel.org -W: http://www.lesswatts.org/projects/acpi/ -S: Supported - INTEL IA32 MICROCODE UPDATE SUPPORT P: Tigran Aivazian M: tigran@aivazian.fsnet.co.uk @@ -2703,11 +2658,6 @@ P: Arnaldo Carvalho de Melo M: acme@ghostprotocols.net S: Maintained -LIS3LV02D ACCELEROMETER DRIVER -P: Eric Piel -M: eric.piel@tremplin-utc.net -S: Maintained - LM83 HARDWARE MONITOR DRIVER P: Jean Delvare M: khali@linux-fr.org @@ -2751,16 +2701,6 @@ M: matthew@wil.cx L: linux-scsi@vger.kernel.org S: Maintained -LTP (Linux Test Project) -P: Subrata Modak -M: subrata@linux.vnet.ibm.com -P: Mike Frysinger -M: vapier@gentoo.org -L: ltp-list@lists.sourceforge.net (subscribers-only) -W: http://ltp.sourceforge.net/ -T: git kernel.org/pub/scm/linux/kernel/git/galak/ltp.git -S: Maintained - M32R ARCHITECTURE P: Hirokazu Takata M: takata@linux-m32r.org @@ -3203,7 +3143,7 @@ S: Maintained OPENCORES I2C BUS DRIVER P: Peter Korsgaard M: jacmet@sunsite.dk -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org S: Maintained OPROFILE @@ -3250,7 +3190,7 @@ S: Maintained PA SEMI SMBUS DRIVER P: Olof Johansson M: olof@lixom.net -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org S: Maintained PANASONIC LAPTOP ACPI EXTRAS DRIVER @@ -3389,15 +3329,13 @@ S: Maintained PNP SUPPORT P: Adam Belay -M: abelay@mit.edu -P: Bjorn Helgaas -M: bjorn.helgaas@hp.com +M: ambx1@neo.rr.com S: Maintained PNXxxxx I2C DRIVER P: Vitaly Wool M: vitalywool@gmail.com -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org S: Maintained PPP PROTOCOL DRIVERS AND COMPRESSORS @@ -3861,7 +3799,7 @@ S: Maintained SIS 96X I2C/SMBUS DRIVER P: Mark M. Hoffman M: mhoffman@lightlink.com -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org S: Maintained SIS FRAMEBUFFER DRIVER @@ -3928,6 +3866,8 @@ M: bootc@bootc.net S: Maintained SOFTWARE RAID (Multiple Disks) SUPPORT +P: Ingo Molnar +M: mingo@redhat.com P: Neil Brown M: neilb@suse.de L: linux-raid@vger.kernel.org @@ -4606,7 +4546,7 @@ S: Maintained VIAPRO SMBUS DRIVER P: Jean Delvare M: khali@linux-fr.org -L: linux-i2c@vger.kernel.org +L: i2c@lm-sensors.org S: Maintained VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER diff --git a/trunk/Makefile b/trunk/Makefile index 7b1f2384094f..e9c5d47f31cd 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 28 -EXTRAVERSION = -rc6 +EXTRAVERSION = -rc2 NAME = Killer Bat of Doom # *DOCUMENTATION* @@ -536,7 +536,7 @@ KBUILD_CFLAGS += -g KBUILD_AFLAGS += -gdwarf-2 endif -ifdef CONFIG_FUNCTION_TRACER +ifdef CONFIG_FTRACE KBUILD_CFLAGS += -pg endif @@ -961,7 +961,6 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH) # The asm symlink changes when $(ARCH) changes. # Detect this and ask user to run make mrproper -# If asm is a stale symlink (point to dir that does not exist) remove it define check-symlink set -e; \ if [ -L include/asm ]; then \ @@ -971,10 +970,6 @@ define check-symlink echo " set ARCH or save .config and run 'make mrproper' to fix it"; \ exit 1; \ fi; \ - test -e $$asmlink || rm include/asm; \ - elif [ -d include/asm ]; then \ - echo "ERROR: $@ is a directory but a symlink was expected";\ - exit 1; \ fi endef @@ -1436,8 +1431,7 @@ ALLSOURCE_ARCHS := $(SRCARCH) define find-sources ( for arch in $(ALLSOURCE_ARCHS) ; do \ find $(__srctree)arch/$${arch} $(RCS_FIND_IGNORE) \ - -wholename $(__srctree)arch/$${arch}/include/asm -type d -prune \ - -o -name $1 -print; \ + -name $1 -print; \ done ; \ find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \ -name $1 -print; \ diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index 8977d99987cb..e6ab550bceb3 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -21,7 +21,7 @@ config OPROFILE_IBS Instruction-Based Sampling (IBS) is a new profiling technique that provides rich, precise program performance information. IBS is introduced by AMD Family10h processors - (AMD Opteron Quad-Core processor "Barcelona") to overcome + (AMD Opteron Quad-Core processor “Barcelona”) to overcome the limitations of conventional performance counter sampling. diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 131b7120995e..5021db2217ed 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -16,7 +16,8 @@ config ARM select HAVE_ARCH_KGDB select HAVE_KPROBES if (!XIP_KERNEL) select HAVE_KRETPROBES if (HAVE_KPROBES) - select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) + select HAVE_FTRACE if (!XIP_KERNEL) + select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE) select HAVE_GENERIC_DMA_COHERENT help The ARM series is a line of low-power-consumption RISC chip designs @@ -201,7 +202,6 @@ choice config ARCH_AAEC2000 bool "Agilent AAEC-2000 based" - select CPU_ARM920T select ARM_AMBA select HAVE_CLK help @@ -211,7 +211,6 @@ config ARCH_INTEGRATOR bool "ARM Ltd. Integrator family" select ARM_AMBA select HAVE_CLK - select COMMON_CLKDEV select ICST525 help Support for ARM's Integrator platform. @@ -220,7 +219,6 @@ config ARCH_REALVIEW bool "ARM Ltd. RealView family" select ARM_AMBA select HAVE_CLK - select COMMON_CLKDEV select ICST307 select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -232,7 +230,6 @@ config ARCH_VERSATILE select ARM_AMBA select ARM_VIC select HAVE_CLK - select COMMON_CLKDEV select ICST307 select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -247,15 +244,22 @@ config ARCH_AT91 This enables support for systems based on the Atmel AT91RM9200, AT91SAM9 and AT91CAP9 processors. +config ARCH_CLPS7500 + bool "Cirrus CL-PS7500FE" + select TIMER_ACORN + select ISA + select NO_IOPORT + select ARCH_SPARSEMEM_ENABLE + help + Support for the Cirrus Logic PS7500FE system-on-a-chip. + config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x-based" - select CPU_ARM720T help Support for Cirrus Logic 711x/721x based boards. config ARCH_EBSA110 bool "EBSA-110" - select CPU_SA110 select ISA select NO_IOPORT help @@ -266,19 +270,16 @@ config ARCH_EBSA110 config ARCH_EP93XX bool "EP93xx-based" - select CPU_ARM920T select ARM_AMBA select ARM_VIC select GENERIC_GPIO select HAVE_CLK - select COMMON_CLKDEV select ARCH_REQUIRE_GPIOLIB help This enables support for the Cirrus EP93xx series of CPUs. config ARCH_FOOTBRIDGE bool "FootBridge" - select CPU_SA110 select FOOTBRIDGE help Support for systems based on the DC21285 companion chip @@ -286,21 +287,18 @@ config ARCH_FOOTBRIDGE config ARCH_NETX bool "Hilscher NetX based" - select CPU_ARM926T select ARM_VIC help This enables support for systems based on the Hilscher NetX Soc config ARCH_H720X bool "Hynix HMS720x-based" - select CPU_ARM720T select ISA_DMA_API help This enables support for systems based on the Hynix HMS720x config ARCH_IMX bool "IMX" - select CPU_ARM920T select GENERIC_GPIO select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -310,7 +308,6 @@ config ARCH_IMX config ARCH_IOP13XX bool "IOP13xx-based" depends on MMU - select CPU_XSC3 select PLAT_IOP select PCI select ARCH_SUPPORTS_MSI @@ -321,7 +318,6 @@ config ARCH_IOP13XX config ARCH_IOP32X bool "IOP32x-based" depends on MMU - select CPU_XSCALE select PLAT_IOP select PCI select GENERIC_GPIO @@ -333,7 +329,6 @@ config ARCH_IOP32X config ARCH_IOP33X bool "IOP33x-based" depends on MMU - select CPU_XSCALE select PLAT_IOP select PCI select GENERIC_GPIO @@ -344,7 +339,6 @@ config ARCH_IOP33X config ARCH_IXP23XX bool "IXP23XX-based" depends on MMU - select CPU_XSC3 select PCI help Support for Intel's IXP23xx (XScale) family of processors. @@ -352,7 +346,6 @@ config ARCH_IXP23XX config ARCH_IXP2000 bool "IXP2400/2800-based" depends on MMU - select CPU_XSCALE select PCI help Support for Intel's IXP2400/2800 (XScale) family of processors. @@ -360,7 +353,6 @@ config ARCH_IXP2000 config ARCH_IXP4XX bool "IXP4xx-based" depends on MMU - select CPU_XSCALE select GENERIC_GPIO select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -370,7 +362,6 @@ config ARCH_IXP4XX config ARCH_L7200 bool "LinkUp-L7200" - select CPU_ARM720T select FIQ help Say Y here if you intend to run this kernel on a LinkUp Systems @@ -384,7 +375,6 @@ config ARCH_L7200 config ARCH_KIRKWOOD bool "Marvell Kirkwood" - select CPU_FEROCEON select PCI select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -395,7 +385,6 @@ config ARCH_KIRKWOOD config ARCH_KS8695 bool "Micrel/Kendin KS8695" - select CPU_ARM922T select GENERIC_GPIO help Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based @@ -403,7 +392,6 @@ config ARCH_KS8695 config ARCH_NS9XXX bool "NetSilicon NS9xxx" - select CPU_ARM926T select GENERIC_GPIO select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -416,7 +404,6 @@ config ARCH_NS9XXX config ARCH_LOKI bool "Marvell Loki (88RC8480)" - select CPU_FEROCEON select GENERIC_TIME select GENERIC_CLOCKEVENTS select PLAT_ORION @@ -425,7 +412,6 @@ config ARCH_LOKI config ARCH_MV78XX0 bool "Marvell MV78xx0" - select CPU_FEROCEON select PCI select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -447,7 +433,6 @@ config ARCH_MXC config ARCH_ORION5X bool "Marvell Orion" depends on MMU - select CPU_FEROCEON select PCI select GENERIC_GPIO select GENERIC_TIME @@ -460,7 +445,6 @@ config ARCH_ORION5X config ARCH_PNX4008 bool "Philips Nexperia PNX4008 Mobile" - select CPU_ARM926T select HAVE_CLK help This enables support for Philips PNX4008 mobile platform. @@ -471,7 +455,6 @@ config ARCH_PXA select ARCH_MTD_XIP select GENERIC_GPIO select HAVE_CLK - select COMMON_CLKDEV select ARCH_REQUIRE_GPIOLIB select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -495,7 +478,6 @@ config ARCH_RPC config ARCH_SA1100 bool "SA1100-based" - select CPU_SA1100 select ISA select ARCH_SPARSEMEM_ENABLE select ARCH_MTD_XIP @@ -519,7 +501,6 @@ config ARCH_S3C2410 config ARCH_SHARK bool "Shark" - select CPU_SA110 select ISA select ISA_DMA select ZONE_DMA @@ -530,7 +511,6 @@ config ARCH_SHARK config ARCH_LH7A40X bool "Sharp LH7A40X" - select CPU_ARM922T select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM help @@ -541,7 +521,6 @@ config ARCH_LH7A40X config ARCH_DAVINCI bool "TI DaVinci" - select CPU_ARM926T select GENERIC_TIME select GENERIC_CLOCKEVENTS select GENERIC_GPIO @@ -563,7 +542,6 @@ config ARCH_OMAP config ARCH_MSM bool "Qualcomm MSM" - select CPU_V6 select GENERIC_TIME select GENERIC_CLOCKEVENTS help diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 2eca2998f93e..bd6e28115ebb 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -96,6 +96,7 @@ textofs-y := 0x00008000 machine-$(CONFIG_ARCH_RPC) := rpc machine-$(CONFIG_ARCH_EBSA110) := ebsa110 + machine-$(CONFIG_ARCH_CLPS7500) := clps7500 machine-$(CONFIG_FOOTBRIDGE) := footbridge machine-$(CONFIG_ARCH_SHARK) := shark machine-$(CONFIG_ARCH_SA1100) := sa1100 diff --git a/trunk/arch/arm/boot/compressed/Makefile b/trunk/arch/arm/boot/compressed/Makefile index fbe5eef1f6c9..7a03f2007882 100644 --- a/trunk/arch/arm/boot/compressed/Makefile +++ b/trunk/arch/arm/boot/compressed/Makefile @@ -23,6 +23,10 @@ ifeq ($(CONFIG_ARCH_L7200),y) OBJS += head-l7200.o endif +ifeq ($(CONFIG_ARCH_CLPS7500),y) +HEAD = head-clps7500.o +endif + ifeq ($(CONFIG_ARCH_P720T),y) # Borrow this code from SA1100 OBJS += head-sa1100.o @@ -66,7 +70,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \ head.o misc.o $(OBJS) -ifeq ($(CONFIG_FUNCTION_TRACER),y) +ifeq ($(CONFIG_FTRACE),y) ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) endif diff --git a/trunk/arch/arm/boot/compressed/head-clps7500.S b/trunk/arch/arm/boot/compressed/head-clps7500.S new file mode 100644 index 000000000000..4f3c78ac30a0 --- /dev/null +++ b/trunk/arch/arm/boot/compressed/head-clps7500.S @@ -0,0 +1,86 @@ +/* + * linux/arch/arm/boot/compressed/head-clps7500.S + * + * Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd + */ + + + /* There are three different ways the kernel can be + booted on a 7500 system: from Angel (loaded in RAM), from + 16-bit ROM or from 32-bit Flash. Luckily, a single kernel + image does for them all. */ + /* This branch is taken if the CPU memory width matches the + actual device in use. The default at power on is 16 bits + so we must be prepared for a mismatch. */ + .section ".start", "ax" +2: + b 1f + .word 0xffff + .word 0xb632 @ mov r11, #0x03200000 + .word 0xe3a0 + .word 0x0000 @ mov r0, #0 + .word 0xe3a0 + .word 0x0080 @ strb r0, [r11, #0x80] + .word 0xe5cb + .word 0xf000 @ mov pc, #0 + .word 0xe3a0 +1: + adr r1, 2b + teq r1, #0 + bne .Langel + /* This is a direct-from-ROM boot. Copy the kernel into + RAM and run it there. */ + mov r0, #0x30 + mcr p15, 0, r0, c1, c0, 0 + mov r0, #0x13 + msr cpsr_cxsf, r0 + mov r12, #0x03000000 @ point to LEDs + orr r12, r12, #0x00020000 + orr r12, r12, #0xba00 + mov r0, #0x5500 + str r0, [r12] + mov r0, #0x10000000 + orr r0, r0, #0x8000 + mov r4, r0 + ldr r2, =_end +2: + ldr r3, [r1], #4 + str r3, [r0], #4 + teq r0, r2 + bne 2b + mov r0, #0xff00 + str r0, [r12] +1: + mov r12, #0x03000000 @ point to LEDs + orr r12, r12, #0x00020000 + orr r12, r12, #0xba00 + mov r0, #0xfe00 + str r0, [r12] + + adr lr, 1f + mov r0, #0 + mov r1, #14 /* MACH_TYPE_CLPS7500 */ + mov pc, lr +.Langel: +#ifdef CONFIG_ANGELBOOT + /* Call Angel to switch into SVC mode. */ + mov r0, #0x17 + swi 0x123456 +#endif + /* Ensure all interrupts are off and MMU disabled */ + mrs r0, cpsr + orr r0, r0, #0xc0 + msr cpsr_cxsf, r0 + + adr lr, 1b + orr lr, lr, #0x10000000 + mov r0, #0x30 @ MMU off + mcr p15, 0, r0, c1, c0, 0 + mov r0, r0 + mov pc, lr + + .ltorg + +1: +/* And the rest */ +#include "head.S" diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index 7b1f31295a0a..84a1e0496a3c 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -717,9 +717,6 @@ __armv7_mmu_cache_off: bl __armv7_mmu_cache_flush mov r0, #0 mcr p15, 0, r0, c8, c7, 0 @ invalidate whole TLB - mcr p15, 0, r0, c7, c5, 6 @ invalidate BTC - mcr p15, 0, r0, c7, c10, 4 @ DSB - mcr p15, 0, r0, c7, c5, 4 @ ISB mov pc, r12 __arm6_mmu_cache_off: @@ -781,13 +778,12 @@ __armv6_mmu_cache_flush: __armv7_mmu_cache_flush: mrc p15, 0, r10, c0, c1, 5 @ read ID_MMFR1 tst r10, #0xf << 16 @ hierarchical cache (ARMv7) - mov r10, #0 beq hierarchical + mov r10, #0 mcr p15, 0, r10, c7, c14, 0 @ clean+invalidate D b iflush hierarchical: - mcr p15, 0, r10, c7, c10, 5 @ DMB - stmfd sp!, {r0-r5, r7, r9, r11} + stmfd sp!, {r0-r5, r7, r9-r11} mrc p15, 1, r0, c0, c0, 1 @ read clidr ands r3, r0, #0x7000000 @ extract loc from clidr mov r3, r3, lsr #23 @ left align loc bit field @@ -824,14 +820,12 @@ skip: cmp r3, r10 bgt loop1 finished: - ldmfd sp!, {r0-r5, r7, r9, r11} mov r10, #0 @ swith back to cache level 0 mcr p15, 2, r10, c0, c0, 0 @ select current cache level in cssr + ldmfd sp!, {r0-r5, r7, r9-r11} iflush: - mcr p15, 0, r10, c7, c10, 4 @ DSB mcr p15, 0, r10, c7, c5, 0 @ invalidate I+BTB - mcr p15, 0, r10, c7, c10, 4 @ DSB - mcr p15, 0, r10, c7, c5, 4 @ ISB + mcr p15, 0, r10, c7, c10, 4 @ drain WB mov pc, lr __armv5tej_mmu_cache_flush: diff --git a/trunk/arch/arm/boot/compressed/misc.c b/trunk/arch/arm/boot/compressed/misc.c index 3fc08413fff0..65ce8fff29db 100644 --- a/trunk/arch/arm/boot/compressed/misc.c +++ b/trunk/arch/arm/boot/compressed/misc.c @@ -86,8 +86,6 @@ static void putstr(const char *ptr) #define __ptr_t void * -#define memzero(s,n) __memzero(s,n) - /* * Optimised C version of memzero for the ARM. */ diff --git a/trunk/arch/arm/common/Kconfig b/trunk/arch/arm/common/Kconfig index a2cd9beaf37d..86b5e6982660 100644 --- a/trunk/arch/arm/common/Kconfig +++ b/trunk/arch/arm/common/Kconfig @@ -33,6 +33,3 @@ config SHARPSL_PM config SHARP_SCOOP bool - -config COMMON_CLKDEV - bool diff --git a/trunk/arch/arm/common/Makefile b/trunk/arch/arm/common/Makefile index 7cb7961d81cb..325e4b6a6afb 100644 --- a/trunk/arch/arm/common/Makefile +++ b/trunk/arch/arm/common/Makefile @@ -17,4 +17,3 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o obj-$(CONFIG_ARCH_IXP2000) += uengine.o obj-$(CONFIG_ARCH_IXP23XX) += uengine.o obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o -obj-$(CONFIG_COMMON_CLKDEV) += clkdev.o diff --git a/trunk/arch/arm/common/clkdev.c b/trunk/arch/arm/common/clkdev.c deleted file mode 100644 index 17a17b49a45b..000000000000 --- a/trunk/arch/arm/common/clkdev.c +++ /dev/null @@ -1,128 +0,0 @@ -/* - * arch/arm/common/clkdev.c - * - * Copyright (C) 2008 Russell King. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Helper for the clk API to assist looking up a struct clk. - */ -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -static LIST_HEAD(clocks); -static DEFINE_MUTEX(clocks_mutex); - -static struct clk *clk_find(const char *dev_id, const char *con_id) -{ - struct clk_lookup *p; - struct clk *clk = NULL; - int match, best = 0; - - list_for_each_entry(p, &clocks, node) { - if ((p->dev_id && !dev_id) || (p->con_id && !con_id)) - continue; - match = 0; - if (p->dev_id) - match += 2 * (strcmp(p->dev_id, dev_id) == 0); - if (p->con_id) - match += 1 * (strcmp(p->con_id, con_id) == 0); - if (match == 0) - continue; - - if (match > best) { - clk = p->clk; - best = match; - } - } - return clk; -} - -struct clk *clk_get(struct device *dev, const char *con_id) -{ - const char *dev_id = dev ? dev_name(dev) : NULL; - struct clk *clk; - - mutex_lock(&clocks_mutex); - clk = clk_find(dev_id, con_id); - if (clk && !__clk_get(clk)) - clk = NULL; - mutex_unlock(&clocks_mutex); - - return clk ? clk : ERR_PTR(-ENOENT); -} -EXPORT_SYMBOL(clk_get); - -void clk_put(struct clk *clk) -{ - __clk_put(clk); -} -EXPORT_SYMBOL(clk_put); - -void clkdev_add(struct clk_lookup *cl) -{ - mutex_lock(&clocks_mutex); - list_add_tail(&cl->node, &clocks); - mutex_unlock(&clocks_mutex); -} -EXPORT_SYMBOL(clkdev_add); - -#define MAX_DEV_ID 20 -#define MAX_CON_ID 16 - -struct clk_lookup_alloc { - struct clk_lookup cl; - char dev_id[MAX_DEV_ID]; - char con_id[MAX_CON_ID]; -}; - -struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, - const char *dev_fmt, ...) -{ - struct clk_lookup_alloc *cla; - - cla = kzalloc(sizeof(*cla), GFP_KERNEL); - if (!cla) - return NULL; - - cla->cl.clk = clk; - if (con_id) { - strlcpy(cla->con_id, con_id, sizeof(cla->con_id)); - cla->cl.con_id = cla->con_id; - } - - if (dev_fmt) { - va_list ap; - - va_start(ap, dev_fmt); - vscnprintf(cla->dev_id, sizeof(cla->dev_id), dev_fmt, ap); - cla->cl.dev_id = cla->dev_id; - va_end(ap); - } - - return &cla->cl; -} -EXPORT_SYMBOL(clkdev_alloc); - -/* - * clkdev_drop - remove a clock dynamically allocated - */ -void clkdev_drop(struct clk_lookup *cl) -{ - mutex_lock(&clocks_mutex); - list_del(&cl->node); - mutex_unlock(&clocks_mutex); - kfree(cl); -} -EXPORT_SYMBOL(clkdev_drop); diff --git a/trunk/arch/arm/common/sharpsl_pm.c b/trunk/arch/arm/common/sharpsl_pm.c index 780bbf7cb26f..db8309161408 100644 --- a/trunk/arch/arm/common/sharpsl_pm.c +++ b/trunk/arch/arm/common/sharpsl_pm.c @@ -54,13 +54,11 @@ /* * Prototypes */ -#ifdef CONFIG_PM static int sharpsl_off_charge_battery(void); -static int sharpsl_check_battery_voltage(void); -static int sharpsl_fatal_check(void); -#endif static int sharpsl_check_battery_temp(void); +static int sharpsl_check_battery_voltage(void); static int sharpsl_ac_check(void); +static int sharpsl_fatal_check(void); static int sharpsl_average_value(int ad); static void sharpsl_average_clear(void); static void sharpsl_charge_toggle(struct work_struct *private_); @@ -426,7 +424,6 @@ static int sharpsl_check_battery_temp(void) return 0; } -#ifdef CONFIG_PM static int sharpsl_check_battery_voltage(void) { int val, i, buff[5]; @@ -458,7 +455,6 @@ static int sharpsl_check_battery_voltage(void) return 0; } -#endif static int sharpsl_ac_check(void) { @@ -590,6 +586,8 @@ static int corgi_pxa_pm_enter(suspend_state_t state) return 0; } +#endif + /* * Check for fatal battery errors @@ -740,10 +738,7 @@ static int sharpsl_off_charge_battery(void) } } } -#else -#define sharpsl_pm_suspend NULL -#define sharpsl_pm_resume NULL -#endif + static ssize_t battery_percentage_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -773,12 +768,10 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info) info->battery_life = sharpsl_pm.battstat.mainbat_percent; } -#ifdef CONFIG_PM static struct platform_suspend_ops sharpsl_pm_ops = { .enter = corgi_pxa_pm_enter, .valid = suspend_valid_only_mem, }; -#endif static int __init sharpsl_pm_probe(struct platform_device *pdev) { @@ -809,9 +802,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) apm_get_power_status = sharpsl_apm_get_power_status; -#ifdef CONFIG_PM suspend_set_ops(&sharpsl_pm_ops); -#endif mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250)); diff --git a/trunk/arch/arm/configs/neocore926_defconfig b/trunk/arch/arm/configs/neocore926_defconfig deleted file mode 100644 index 325f1e105f69..000000000000 --- a/trunk/arch/arm/configs/neocore926_defconfig +++ /dev/null @@ -1,1302 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.27-rc1 -# Tue Jul 29 10:46:54 2008 -# -CONFIG_ARM=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_GENERIC_GPIO=y -CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_MMU=y -# CONFIG_NO_IOPORT is not set -CONFIG_GENERIC_HARDIRQS=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_SUPPORTS_AOUT=y -CONFIG_ZONE_DMA=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - -# -# General setup -# -CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set -# CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=17 -# CONFIG_CGROUPS is not set -# CONFIG_GROUP_SCHED is not set -# CONFIG_SYSFS_DEPRECATED_V2 is not set -# CONFIG_RELAY is not set -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -# CONFIG_EMBEDDED is not set -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -# CONFIG_COMPAT_BRK is not set -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_ANON_INODES=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -# CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set -CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set -# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set -# CONFIG_HAVE_IOREMAP_PROT is not set -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -# CONFIG_HAVE_ARCH_TRACEHOOK is not set -# CONFIG_HAVE_DMA_ATTRS is not set -# CONFIG_USE_GENERIC_SMP_HELPERS is not set -CONFIG_HAVE_CLK=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y -CONFIG_RT_MUTEXES=y -# CONFIG_TINY_SHMEM is not set -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y -CONFIG_BLOCK=y -# CONFIG_LBD is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_LSF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_BLK_DEV_INTEGRITY is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set -CONFIG_DEFAULT_NOOP=y -CONFIG_DEFAULT_IOSCHED="noop" -CONFIG_CLASSIC_RCU=y - -# -# System Type -# -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_VERSATILE is not set -CONFIG_ARCH_AT91=y -# CONFIG_ARCH_CLPS7500 is not set -# CONFIG_ARCH_CLPS711X is not set -# CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_IOP13XX is not set -# CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IOP33X is not set -# CONFIG_ARCH_IXP23XX is not set -# CONFIG_ARCH_IXP2000 is not set -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_L7200 is not set -# CONFIG_ARCH_KIRKWOOD is not set -# CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_NS9XXX is not set -# CONFIG_ARCH_LOKI is not set -# CONFIG_ARCH_MV78XX0 is not set -# CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_ORION5X is not set -# CONFIG_ARCH_PNX4008 is not set -# CONFIG_ARCH_PXA is not set -# CONFIG_ARCH_RPC is not set -# CONFIG_ARCH_SA1100 is not set -# CONFIG_ARCH_S3C2410 is not set -# CONFIG_ARCH_SHARK is not set -# CONFIG_ARCH_LH7A40X is not set -# CONFIG_ARCH_DAVINCI is not set -# CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_MSM7X00A is not set - -# -# Boot options -# - -# -# Power management -# - -# -# Atmel AT91 System-on-Chip -# -# CONFIG_ARCH_AT91RM9200 is not set -# CONFIG_ARCH_AT91SAM9260 is not set -# CONFIG_ARCH_AT91SAM9261 is not set -CONFIG_ARCH_AT91SAM9263=y -# CONFIG_ARCH_AT91SAM9RL is not set -# CONFIG_ARCH_AT91SAM9G20 is not set -# CONFIG_ARCH_AT91CAP9 is not set -# CONFIG_ARCH_AT91X40 is not set -CONFIG_AT91_PMC_UNIT=y - -# -# AT91SAM9263 Board Type -# -# CONFIG_MACH_AT91SAM9263EK is not set -# CONFIG_MACH_USB_A9263 is not set -CONFIG_MACH_NEOCORE926=y - -# -# AT91 Board Options -# -CONFIG_MTD_AT91_DATAFLASH_CARD=y - -# -# AT91 Feature Selections -# -# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set -CONFIG_AT91_TIMER_HZ=100 -CONFIG_AT91_EARLY_DBGU=y -# CONFIG_AT91_EARLY_USART0 is not set -# CONFIG_AT91_EARLY_USART1 is not set -# CONFIG_AT91_EARLY_USART2 is not set -# CONFIG_AT91_EARLY_USART3 is not set -# CONFIG_AT91_EARLY_USART4 is not set -# CONFIG_AT91_EARLY_USART5 is not set - -# -# Processor Type -# -CONFIG_CPU_32=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y -CONFIG_CPU_ABRT_EV5TJ=y -CONFIG_CPU_PABRT_NOIFAR=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_V4WB=y -CONFIG_CPU_TLB_V4WBI=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y - -# -# Processor Features -# -CONFIG_ARM_THUMB=y -# CONFIG_CPU_ICACHE_DISABLE is not set -# CONFIG_CPU_DCACHE_DISABLE is not set -# CONFIG_CPU_DCACHE_WRITETHROUGH is not set -# CONFIG_CPU_CACHE_ROUND_ROBIN is not set -# CONFIG_OUTER_CACHE is not set - -# -# Bus support -# -# CONFIG_PCI_SYSCALL is not set -# CONFIG_ARCH_SUPPORTS_MSI is not set -# CONFIG_PCCARD is not set - -# -# Kernel Features -# -# CONFIG_TICK_ONESHOT is not set -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -# CONFIG_PREEMPT is not set -CONFIG_HZ=100 -# CONFIG_AEABI is not set -# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -# CONFIG_SPARSEMEM_STATIC is not set -# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4096 -# CONFIG_RESOURCES_64BIT is not set -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_VIRT_TO_BUS=y -# CONFIG_LEDS is not set -CONFIG_ALIGNMENT_TRAP=y - -# -# Boot options -# -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="" -# CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set - -# -# Floating point emulation -# - -# -# At least one emulation must be selected -# -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set -# CONFIG_FPE_FASTFPE is not set -# CONFIG_VFP is not set - -# -# Userspace binary formats -# -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_AOUT is not set -# CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set - -# -# Power management options -# -# CONFIG_PM is not set -CONFIG_ARCH_SUSPEND_POSSIBLE=y - -# -# Networking -# -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=y -# CONFIG_PACKET_MMAP is not set -CONFIG_UNIX=y -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set -CONFIG_NET_KEY=y -# CONFIG_NET_KEY_MIGRATE is not set -CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_FIB_HASH=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -# CONFIG_NET_IPGRE is not set -# CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=y -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y -# CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -CONFIG_INET6_XFRM_MODE_TRANSPORT=y -CONFIG_INET6_XFRM_MODE_TUNNEL=y -CONFIG_INET6_XFRM_MODE_BEET=y -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=y -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_NET_SCHED is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -# CONFIG_AF_RXRPC is not set - -# -# Wireless -# -# CONFIG_CFG80211 is not set -# CONFIG_WIRELESS_EXT is not set -# CONFIG_MAC80211 is not set -# CONFIG_IEEE80211 is not set -# CONFIG_RFKILL is not set -# CONFIG_NET_9P is not set - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_STANDALONE=y -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_FW_LOADER=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_SYS_HYPERVISOR is not set -# CONFIG_CONNECTOR is not set -CONFIG_MTD=y -# CONFIG_MTD_DEBUG is not set -# CONFIG_MTD_CONCAT is not set -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_CMDLINE_PARTS is not set -# CONFIG_MTD_AFS_PARTS is not set -# CONFIG_MTD_AR7_PARTS is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLKDEVS=y -CONFIG_MTD_BLOCK=y -# CONFIG_FTL is not set -CONFIG_NFTL=y -CONFIG_NFTL_RW=y -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_MTD_OOPS is not set - -# -# RAM/ROM/Flash chip drivers -# -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_PLATRAM is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -CONFIG_MTD_BLOCK2MTD=y - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -CONFIG_MTD_NAND_ECC_SMC=y -# CONFIG_MTD_NAND_MUSEUM_IDS is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_MTD_NAND_DISKONCHIP is not set -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_ATMEL_ECC_HW=y -# CONFIG_MTD_NAND_ATMEL_ECC_SOFT is not set -# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set -# CONFIG_MTD_NAND_NANDSIM is not set -CONFIG_MTD_NAND_PLATFORM=y -# CONFIG_MTD_ALAUDA is not set -# CONFIG_MTD_ONENAND is not set - -# -# UBI - Unsorted block images -# -# CONFIG_MTD_UBI is not set -# CONFIG_PARPORT is not set -CONFIG_BLK_DEV=y -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_NBD=y -# CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set -CONFIG_MISC_DEVICES=y -CONFIG_ATMEL_PWM=y -CONFIG_ATMEL_TCLIB=y -CONFIG_ATMEL_TCB_CLKSRC=y -CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 -# CONFIG_EEPROM_93CX6 is not set -# CONFIG_ATMEL_SSC is not set -# CONFIG_ENCLOSURE_SERVICES is not set -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -# CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -# CONFIG_SCSI_TGT is not set -# CONFIG_SCSI_NETLINK is not set -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -# CONFIG_BLK_DEV_SD is not set -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set -CONFIG_CHR_DEV_SG=y -# CONFIG_CHR_DEV_SCH is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set -CONFIG_SCSI_WAIT_SCAN=m - -# -# SCSI Transports -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_DH is not set -# CONFIG_ATA is not set -# CONFIG_MD is not set -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_MACVLAN is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set -# CONFIG_VETH is not set -CONFIG_PHYLIB=y - -# -# MII PHY device drivers -# -# CONFIG_MARVELL_PHY is not set -# CONFIG_DAVICOM_PHY is not set -# CONFIG_QSEMI_PHY is not set -# CONFIG_LXT_PHY is not set -# CONFIG_CICADA_PHY is not set -# CONFIG_VITESSE_PHY is not set -CONFIG_SMSC_PHY=y -# CONFIG_BROADCOM_PHY is not set -# CONFIG_ICPLUS_PHY is not set -# CONFIG_REALTEK_PHY is not set -# CONFIG_FIXED_PHY is not set -# CONFIG_MDIO_BITBANG is not set -CONFIG_NET_ETHERNET=y -# CONFIG_MII is not set -CONFIG_MACB=y -# CONFIG_AX88796 is not set -# CONFIG_SMC91X is not set -# CONFIG_DM9000 is not set -# CONFIG_ENC28J60 is not set -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_B44 is not set -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set - -# -# Wireless LAN -# -# CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set -# CONFIG_IWLWIFI_LEDS is not set - -# -# USB Network Adapters -# -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set -# CONFIG_WAN is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set -# CONFIG_ISDN is not set - -# -# Input device support -# -CONFIG_INPUT=y -# CONFIG_INPUT_FF_MEMLESS is not set -# CONFIG_INPUT_POLLDEV is not set - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_GPIO is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_APPLETOUCH is not set -# CONFIG_MOUSE_VSXXXAA is not set -# CONFIG_MOUSE_GPIO is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TABLET is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -# CONFIG_TOUCHSCREEN_FUJITSU is not set -# CONFIG_TOUCHSCREEN_GUNZE is not set -# CONFIG_TOUCHSCREEN_ELO is not set -# CONFIG_TOUCHSCREEN_MTOUCH is not set -# CONFIG_TOUCHSCREEN_INEXIO is not set -# CONFIG_TOUCHSCREEN_MK712 is not set -# CONFIG_TOUCHSCREEN_PENMOUNT is not set -# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set -# CONFIG_TOUCHSCREEN_TOUCHWIN is not set -# CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set -# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set -# CONFIG_INPUT_MISC is not set - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_N_HDLC is not set -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set -# CONFIG_RIO is not set -# CONFIG_STALDRV is not set - -# -# Serial drivers -# -# CONFIG_SERIAL_8250 is not set - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -# CONFIG_SERIAL_ATMEL_PDC is not set -# CONFIG_SERIAL_ATMEL_TTYAT is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 -# CONFIG_IPMI_HANDLER is not set -# CONFIG_HW_RANDOM is not set -# CONFIG_NVRAM is not set -# CONFIG_R3964 is not set -# CONFIG_RAW_DRIVER is not set -# CONFIG_TCG_TPM is not set -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y - -# -# I2C Hardware Bus support -# - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -# CONFIG_I2C_GPIO is not set -# CONFIG_I2C_OCORES is not set -# CONFIG_I2C_SIMTEC is not set - -# -# External I2C/SMBus adapter drivers -# -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_TINY_USB is not set - -# -# Other I2C/SMBus bus drivers -# -# CONFIG_I2C_PCA_PLATFORM is not set -# CONFIG_I2C_STUB is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_DS1682 is not set -# CONFIG_AT24 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_PCF8575 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_MAX6875 is not set -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_SPI=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_ATMEL=y -# CONFIG_SPI_BITBANG is not set - -# -# SPI Protocol Masters -# -# CONFIG_SPI_AT25 is not set -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set -# CONFIG_W1 is not set -# CONFIG_POWER_SUPPLY is not set -# CONFIG_HWMON is not set -# CONFIG_WATCHDOG is not set - -# -# Sonics Silicon Backplane -# -CONFIG_SSB_POSSIBLE=y -# CONFIG_SSB is not set - -# -# Multifunction device drivers -# -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_HTC_PASIC3 is not set - -# -# Multimedia devices -# - -# -# Multimedia core support -# -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# -# CONFIG_DAB is not set - -# -# Graphics support -# -# CONFIG_VGASTATE is not set -CONFIG_VIDEO_OUTPUT_CONTROL=y -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set -# CONFIG_FB_DDC is not set -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -# CONFIG_FB_SYS_FILLRECT is not set -# CONFIG_FB_SYS_COPYAREA is not set -# CONFIG_FB_SYS_IMAGEBLIT is not set -# CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_SYS_FOPS is not set -# CONFIG_FB_SVGALIB is not set -# CONFIG_FB_MACMODES is not set -# CONFIG_FB_BACKLIGHT is not set -# CONFIG_FB_MODE_HELPERS is not set -# CONFIG_FB_TILEBLITTING is not set - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_S1D13XXX is not set -CONFIG_FB_ATMEL=y -# CONFIG_FB_VIRTUAL is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -# CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_ILI9320 is not set -# CONFIG_LCD_VGG2432A4 is not set -# CONFIG_LCD_PLATFORM is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_ATMEL_LCDC=y -# CONFIG_BACKLIGHT_ATMEL_PWM is not set -# CONFIG_BACKLIGHT_CORGI is not set - -# -# Display device support -# -# CONFIG_DISPLAY_SUPPORT is not set - -# -# Console display driver support -# -# CONFIG_VGA_CONSOLE is not set -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y -# CONFIG_SOUND is not set -CONFIG_HID_SUPPORT=y -CONFIG_HID=y -CONFIG_HID_DEBUG=y -# CONFIG_HIDRAW is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -# CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set -CONFIG_USB_SUPPORT=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -# CONFIG_USB_ARCH_HAS_EHCI is not set -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -CONFIG_USB_DEVICE_CLASS=y -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_ISP1760_HCD is not set -CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set - -# -# USB Device Class drivers -# -# CONFIG_USB_ACM is not set -# CONFIG_USB_PRINTER is not set -# CONFIG_USB_WDM is not set - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -# - -# -# may also be needed; see USB_STORAGE Help for more information -# -CONFIG_USB_STORAGE=y -# CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_DPCM is not set -# CONFIG_USB_STORAGE_USBAT is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_STORAGE_ONETOUCH is not set -# CONFIG_USB_STORAGE_KARMA is not set -# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set -CONFIG_USB_MON=y - -# -# USB port drivers -# -# CONFIG_USB_SERIAL is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_ADUTUX is not set -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_BERRY_CHARGE is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYPRESS_CY7C63 is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGET is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TRANCEVIBRATOR is not set -# CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_TEST is not set -# CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_GADGET is not set -CONFIG_MMC=y -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set - -# -# MMC/SD Card Drivers -# -CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_SDIO_UART=y -# CONFIG_MMC_TEST is not set - -# -# MMC/SD Host Controller Drivers -# -# CONFIG_MMC_SDHCI is not set -CONFIG_MMC_AT91=y -# CONFIG_MMC_SPI is not set -# CONFIG_NEW_LEDS is not set -CONFIG_RTC_LIB=y -# CONFIG_RTC_CLASS is not set -# CONFIG_DMADEVICES is not set -# CONFIG_UIO is not set - -# -# File systems -# -CONFIG_EXT2_FS=y -# CONFIG_EXT2_FS_XATTR is not set -# CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set -# CONFIG_EXT4DEV_FS is not set -# CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set -# CONFIG_XFS_FS is not set -# CONFIG_OCFS2_FS is not set -# CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY is not set -# CONFIG_QUOTA is not set -CONFIG_AUTOFS_FS=y -# CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set - -# -# CD-ROM/DVD Filesystems -# -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=y -# CONFIG_MSDOS_FS is not set -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_SYSCTL=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_HUGETLB_PAGE is not set -# CONFIG_CONFIGFS_FS is not set - -# -# Miscellaneous filesystems -# -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -CONFIG_JFFS2_FS_WBUF_VERIFY=y -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -# CONFIG_JFFS2_LZO is not set -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_CRAMFS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_OMFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=y -# CONFIG_NFS_V3 is not set -# CONFIG_NFS_V4 is not set -CONFIG_ROOT_NFS=y -# CONFIG_NFSD is not set -CONFIG_LOCKD=y -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y -# CONFIG_RPCSEC_GSS_KRB5 is not set -# CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set - -# -# Partition Types -# -# CONFIG_PARTITION_ADVANCED is not set -CONFIG_MSDOS_PARTITION=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" -# CONFIG_NLS_CODEPAGE_437 is not set -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ASCII is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set -# CONFIG_DLM is not set - -# -# Kernel hacking -# -# CONFIG_PRINTK_TIME is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=1024 -# CONFIG_MAGIC_SYSRQ is not set -# CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_FRAME_POINTER=y -# CONFIG_LATENCYTOP is not set -CONFIG_HAVE_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -# CONFIG_FTRACE is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_CONTEXT_SWITCH_TRACER is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_DEBUG_USER is not set - -# -# Security options -# -# CONFIG_KEYS is not set -# CONFIG_SECURITY is not set -# CONFIG_SECURITY_FILE_CAPABILITIES is not set -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -# CONFIG_CRYPTO_MANAGER is not set -# CONFIG_CRYPTO_GF128MUL is not set -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_TEST is not set - -# -# Authenticated Encryption with Associated Data -# -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set - -# -# Block modes -# -# CONFIG_CRYPTO_CBC is not set -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set -# CONFIG_CRYPTO_ECB is not set -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_PCBC is not set -# CONFIG_CRYPTO_XTS is not set - -# -# Hash modes -# -# CONFIG_CRYPTO_HMAC is not set -# CONFIG_CRYPTO_XCBC is not set - -# -# Digest -# -# CONFIG_CRYPTO_CRC32C is not set -# CONFIG_CRYPTO_MD4 is not set -# CONFIG_CRYPTO_MD5 is not set -# CONFIG_CRYPTO_MICHAEL_MIC is not set -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set -# CONFIG_CRYPTO_SHA1 is not set -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -# CONFIG_CRYPTO_AES is not set -# CONFIG_CRYPTO_ANUBIS is not set -# CONFIG_CRYPTO_ARC4 is not set -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_DES is not set -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set - -# -# Compression -# -# CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_LZO is not set -# CONFIG_CRYPTO_HW is not set - -# -# Library routines -# -CONFIG_BITREVERSE=y -# CONFIG_GENERIC_FIND_FIRST_BIT is not set -# CONFIG_GENERIC_FIND_NEXT_BIT is not set -# CONFIG_CRC_CCITT is not set -# CONFIG_CRC16 is not set -# CONFIG_CRC_T10DIF is not set -# CONFIG_CRC_ITU_T is not set -CONFIG_CRC32=y -# CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_PLIST=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y diff --git a/trunk/arch/arm/include/asm/cacheflush.h b/trunk/arch/arm/include/asm/cacheflush.h index 6cbd8fdc9f1f..de6c59f814a1 100644 --- a/trunk/arch/arm/include/asm/cacheflush.h +++ b/trunk/arch/arm/include/asm/cacheflush.h @@ -10,11 +10,11 @@ #ifndef _ASMARM_CACHEFLUSH_H #define _ASMARM_CACHEFLUSH_H +#include #include #include #include -#include #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) @@ -295,6 +295,16 @@ static inline void outer_flush_range(unsigned long start, unsigned long end) #endif +/* + * flush_cache_vmap() is used when creating mappings (eg, via vmap, + * vmalloc, ioremap etc) in kernel space for pages. Since the + * direct-mappings of these pages may contain cached data, we need + * to do a full cache flush to ensure that writebacks don't corrupt + * data placed into these pages via the new mappings. + */ +#define flush_cache_vmap(start, end) flush_cache_all() +#define flush_cache_vunmap(start, end) flush_cache_all() + /* * Copy user data from/to a page which is mapped into a different * processes address space. Really, we want to allow our "user @@ -434,29 +444,4 @@ static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt, dmac_inv_range(start, start + size); } -/* - * flush_cache_vmap() is used when creating mappings (eg, via vmap, - * vmalloc, ioremap etc) in kernel space for pages. On non-VIPT - * caches, since the direct-mappings of these pages may contain cached - * data, we need to do a full cache flush to ensure that writebacks - * don't corrupt data placed into these pages via the new mappings. - */ -static inline void flush_cache_vmap(unsigned long start, unsigned long end) -{ - if (!cache_is_vipt_nonaliasing()) - flush_cache_all(); - else - /* - * set_pte_at() called from vmap_pte_range() does not - * have a DSB after cleaning the cache line. - */ - dsb(); -} - -static inline void flush_cache_vunmap(unsigned long start, unsigned long end) -{ - if (!cache_is_vipt_nonaliasing()) - flush_cache_all(); -} - #endif diff --git a/trunk/arch/arm/include/asm/clkdev.h b/trunk/arch/arm/include/asm/clkdev.h deleted file mode 100644 index b6ec7c627b39..000000000000 --- a/trunk/arch/arm/include/asm/clkdev.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * arch/arm/include/asm/clkdev.h - * - * Copyright (C) 2008 Russell King. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Helper for the clk API to assist looking up a struct clk. - */ -#ifndef __ASM_CLKDEV_H -#define __ASM_CLKDEV_H - -struct clk; - -struct clk_lookup { - struct list_head node; - const char *dev_id; - const char *con_id; - struct clk *clk; -}; - -struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, - const char *dev_fmt, ...); - -void clkdev_add(struct clk_lookup *cl); -void clkdev_drop(struct clk_lookup *cl); - -#endif diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h index 4ed149cbb32a..1cb8602dd9d5 100644 --- a/trunk/arch/arm/include/asm/dma-mapping.h +++ b/trunk/arch/arm/include/asm/dma-mapping.h @@ -256,17 +256,8 @@ int dmabounce_sync_for_cpu(struct device *, dma_addr_t, unsigned long, int dmabounce_sync_for_device(struct device *, dma_addr_t, unsigned long, size_t, enum dma_data_direction); #else -static inline int dmabounce_sync_for_cpu(struct device *d, dma_addr_t addr, - unsigned long offset, size_t size, enum dma_data_direction dir) -{ - return 1; -} - -static inline int dmabounce_sync_for_device(struct device *d, dma_addr_t addr, - unsigned long offset, size_t size, enum dma_data_direction dir) -{ - return 1; -} +#define dmabounce_sync_for_cpu(dev,dma,off,sz,dir) (1) +#define dmabounce_sync_for_device(dev,dma,off,sz,dir) (1) /** diff --git a/trunk/arch/arm/include/asm/dma.h b/trunk/arch/arm/include/asm/dma.h index df5638f3643a..75154b193117 100644 --- a/trunk/arch/arm/include/asm/dma.h +++ b/trunk/arch/arm/include/asm/dma.h @@ -1,7 +1,12 @@ #ifndef __ASM_ARM_DMA_H #define __ASM_ARM_DMA_H -#include +typedef unsigned int dmach_t; + +#include +#include +#include +#include /* * This is the maximum virtual address which can be DMA'd from. @@ -10,19 +15,6 @@ #define MAX_DMA_ADDRESS 0xffffffff #endif -#ifdef CONFIG_ISA_DMA_API -/* - * This is used to support drivers written for the x86 ISA DMA API. - * It should not be re-used except for that purpose. - */ -#include -#include -#include - -typedef unsigned int dmach_t; - -#include - /* * DMA modes */ @@ -148,6 +140,4 @@ extern int isa_dma_bridge_buggy; #define isa_dma_bridge_buggy (0) #endif -#endif /* CONFIG_ISA_DMA_API */ - -#endif /* __ASM_ARM_DMA_H */ +#endif /* _ARM_DMA_H */ diff --git a/trunk/arch/arm/include/asm/ftrace.h b/trunk/arch/arm/include/asm/ftrace.h index 39c8bc1a006a..584ef9a8e5a5 100644 --- a/trunk/arch/arm/include/asm/ftrace.h +++ b/trunk/arch/arm/include/asm/ftrace.h @@ -1,7 +1,7 @@ #ifndef _ASM_ARM_FTRACE #define _ASM_ARM_FTRACE -#ifdef CONFIG_FUNCTION_TRACER +#ifdef CONFIG_FTRACE #define MCOUNT_ADDR ((long)(mcount)) #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ diff --git a/trunk/arch/arm/include/asm/hardware/iomd.h b/trunk/arch/arm/include/asm/hardware/iomd.h index f9ee69e4f53e..9c5afbd71a69 100644 --- a/trunk/arch/arm/include/asm/hardware/iomd.h +++ b/trunk/arch/arm/include/asm/hardware/iomd.h @@ -32,11 +32,19 @@ #define IOMD_KARTRX (0x004) #define IOMD_KCTRL (0x008) +#ifdef CONFIG_ARCH_CLPS7500 +#define IOMD_IOLINES (0x00C) +#endif + #define IOMD_IRQSTATA (0x010) #define IOMD_IRQREQA (0x014) #define IOMD_IRQCLRA (0x014) #define IOMD_IRQMASKA (0x018) +#ifdef CONFIG_ARCH_CLPS7500 +#define IOMD_SUSMODE (0x01C) +#endif + #define IOMD_IRQSTATB (0x020) #define IOMD_IRQREQB (0x024) #define IOMD_IRQMASKB (0x028) @@ -45,6 +53,10 @@ #define IOMD_FIQREQ (0x034) #define IOMD_FIQMASK (0x038) +#ifdef CONFIG_ARCH_CLPS7500 +#define IOMD_CLKCTL (0x03C) +#endif + #define IOMD_T0CNTL (0x040) #define IOMD_T0LTCHL (0x040) #define IOMD_T0CNTH (0x044) @@ -59,6 +71,18 @@ #define IOMD_T1GO (0x058) #define IOMD_T1LATCH (0x05c) +#ifdef CONFIG_ARCH_CLPS7500 +#define IOMD_IRQSTATC (0x060) +#define IOMD_IRQREQC (0x064) +#define IOMD_IRQMASKC (0x068) + +#define IOMD_VIDMUX (0x06c) + +#define IOMD_IRQSTATD (0x070) +#define IOMD_IRQREQD (0x074) +#define IOMD_IRQMASKD (0x078) +#endif + #define IOMD_ROMCR0 (0x080) #define IOMD_ROMCR1 (0x084) #ifdef CONFIG_ARCH_RPC @@ -76,6 +100,11 @@ #define IOMD_MOUSEY (0x0A4) #endif +#ifdef CONFIG_ARCH_CLPS7500 +#define IOMD_MSEDAT (0x0A8) +#define IOMD_MSECTL (0x0Ac) +#endif + #ifdef CONFIG_ARCH_RPC #define IOMD_DMATCR (0x0C0) #endif @@ -84,6 +113,18 @@ #ifdef CONFIG_ARCH_RPC #define IOMD_DMAEXT (0x0CC) #endif +#ifdef CONFIG_ARCH_CLPS7500 +#define IOMD_ASTCR (0x0CC) +#define IOMD_DRAMCR (0x0D0) +#define IOMD_SELFREF (0x0D4) +#define IOMD_ATODICR (0x0E0) +#define IOMD_ATODSR (0x0E4) +#define IOMD_ATODCC (0x0E8) +#define IOMD_ATODCNT1 (0x0EC) +#define IOMD_ATODCNT2 (0x0F0) +#define IOMD_ATODCNT3 (0x0F4) +#define IOMD_ATODCNT4 (0x0F8) +#endif #ifdef CONFIG_ARCH_RPC #define DMA_EXT_IO0 1 diff --git a/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h b/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h index 83e6ba338e2c..87bff09633aa 100644 --- a/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h +++ b/trunk/arch/arm/include/asm/hardware/iop3xx-adma.h @@ -730,8 +730,7 @@ static inline void iop_desc_set_next_desc(struct iop_adma_desc_slot *desc, { /* hw_desc->next_desc is the same location for all channels */ union iop3xx_desc hw_desc = { .ptr = desc->hw_desc, }; - - iop_paranoia(hw_desc.dma->next_desc); + BUG_ON(hw_desc.dma->next_desc); hw_desc.dma->next_desc = next_desc_addr; } @@ -761,7 +760,7 @@ static inline int iop_desc_get_zero_result(struct iop_adma_desc_slot *desc) struct iop3xx_desc_aau *hw_desc = desc->hw_desc; struct iop3xx_aau_desc_ctrl desc_ctrl = hw_desc->desc_ctrl_field; - iop_paranoia(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en)); + BUG_ON(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en)); return desc_ctrl.zero_result_err; } diff --git a/trunk/arch/arm/include/asm/hardware/iop_adma.h b/trunk/arch/arm/include/asm/hardware/iop_adma.h index 385c6e8cbbd2..cb7e3611bcba 100644 --- a/trunk/arch/arm/include/asm/hardware/iop_adma.h +++ b/trunk/arch/arm/include/asm/hardware/iop_adma.h @@ -23,12 +23,6 @@ #define IOP_ADMA_SLOT_SIZE 32 #define IOP_ADMA_THRESHOLD 4 -#ifdef DEBUG -#define IOP_PARANOIA 1 -#else -#define IOP_PARANOIA 0 -#endif -#define iop_paranoia(x) BUG_ON(IOP_PARANOIA && (x)) /** * struct iop_adma_device - internal representation of an ADMA device diff --git a/trunk/arch/arm/include/asm/hwcap.h b/trunk/arch/arm/include/asm/hwcap.h index bda489f9f017..81f4c899a555 100644 --- a/trunk/arch/arm/include/asm/hwcap.h +++ b/trunk/arch/arm/include/asm/hwcap.h @@ -16,7 +16,6 @@ #define HWCAP_IWMMXT 512 #define HWCAP_CRUNCH 1024 #define HWCAP_THUMBEE 2048 -#define HWCAP_NEON 4096 #if defined(__KERNEL__) && !defined(__ASSEMBLY__) /* diff --git a/trunk/arch/arm/include/asm/io.h b/trunk/arch/arm/include/asm/io.h index d2a59cfc30ce..a8094451be57 100644 --- a/trunk/arch/arm/include/asm/io.h +++ b/trunk/arch/arm/include/asm/io.h @@ -79,14 +79,6 @@ extern void __iounmap(volatile void __iomem *addr); */ extern void __readwrite_bug(const char *fn); -/* - * A typesafe __io() helper - */ -static inline void __iomem *__typesafe_io(unsigned long addr) -{ - return (void __iomem *)addr; -} - /* * Now, pick up the machine-defined IO definitions */ diff --git a/trunk/arch/arm/include/asm/irq.h b/trunk/arch/arm/include/asm/irq.h index 328f14a8b790..a0009aa5d157 100644 --- a/trunk/arch/arm/include/asm/irq.h +++ b/trunk/arch/arm/include/asm/irq.h @@ -7,6 +7,10 @@ #define irq_canonicalize(i) (i) #endif +#ifndef NR_IRQS +#define NR_IRQS 128 +#endif + /* * Use this value to indicate lack of interrupt * capability diff --git a/trunk/arch/arm/include/asm/mach/map.h b/trunk/arch/arm/include/asm/mach/map.h index 39d949b63e80..cb1139ac1943 100644 --- a/trunk/arch/arm/include/asm/mach/map.h +++ b/trunk/arch/arm/include/asm/mach/map.h @@ -19,13 +19,12 @@ struct map_desc { }; /* types 0-3 are defined in asm/io.h */ -#define MT_UNCACHED 4 -#define MT_CACHECLEAN 5 -#define MT_MINICLEAN 6 -#define MT_LOW_VECTORS 7 -#define MT_HIGH_VECTORS 8 -#define MT_MEMORY 9 -#define MT_ROM 10 +#define MT_CACHECLEAN 4 +#define MT_MINICLEAN 5 +#define MT_LOW_VECTORS 6 +#define MT_HIGH_VECTORS 7 +#define MT_MEMORY 8 +#define MT_ROM 9 #ifdef CONFIG_MMU extern void iotable_init(struct map_desc *, int); diff --git a/trunk/arch/arm/include/asm/memory.h b/trunk/arch/arm/include/asm/memory.h index 0202a7c20e62..809ff9ab853a 100644 --- a/trunk/arch/arm/include/asm/memory.h +++ b/trunk/arch/arm/include/asm/memory.h @@ -44,10 +44,10 @@ * The module space lives between the addresses given by TASK_SIZE * and PAGE_OFFSET - it must be within 32MB of the kernel text. */ -#define MODULES_END (PAGE_OFFSET) -#define MODULES_VADDR (MODULES_END - 16*1048576) +#define MODULE_END (PAGE_OFFSET) +#define MODULE_START (MODULE_END - 16*1048576) -#if TASK_SIZE > MODULES_VADDR +#if TASK_SIZE > MODULE_START #error Top of user space clashes with start of module space #endif @@ -56,7 +56,7 @@ * Since we use sections to map it, this macro replaces the physical address * with its virtual address while keeping offset from the base section. */ -#define XIP_VIRT_ADDR(physaddr) (MODULES_VADDR + ((physaddr) & 0x000fffff)) +#define XIP_VIRT_ADDR(physaddr) (MODULE_START + ((physaddr) & 0x000fffff)) /* * Allow 16MB-aligned ioremap pages @@ -94,8 +94,8 @@ /* * The module can be at any place in ram in nommu mode. */ -#define MODULES_END (END_MEM) -#define MODULES_VADDR (PHYS_OFFSET) +#define MODULE_END (END_MEM) +#define MODULE_START (PHYS_OFFSET) #endif /* !CONFIG_MMU */ @@ -112,8 +112,10 @@ * private definitions which should NOT be used outside memory.h * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. */ +#ifndef __virt_to_phys #define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET) #define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET) +#endif /* * Convert a physical address to a Page Frame Number and back @@ -178,11 +180,6 @@ static inline void *phys_to_virt(unsigned long x) * memory. Use of these is *deprecated* (and that doesn't mean * use the __ prefixed forms instead.) See dma-mapping.h. */ -#ifndef __virt_to_bus -#define __virt_to_bus __virt_to_phys -#define __bus_to_virt __phys_to_virt -#endif - static inline __deprecated unsigned long virt_to_bus(void *x) { return __virt_to_bus((unsigned long)x); diff --git a/trunk/arch/arm/include/asm/mmu_context.h b/trunk/arch/arm/include/asm/mmu_context.h index 263fed05ea33..0559f37c2a27 100644 --- a/trunk/arch/arm/include/asm/mmu_context.h +++ b/trunk/arch/arm/include/asm/mmu_context.h @@ -14,7 +14,6 @@ #define __ASM_ARM_MMU_CONTEXT_H #include -#include #include #include #include diff --git a/trunk/arch/arm/include/asm/page.h b/trunk/arch/arm/include/asm/page.h index f341c9dbd662..bed1c0a00368 100644 --- a/trunk/arch/arm/include/asm/page.h +++ b/trunk/arch/arm/include/asm/page.h @@ -108,38 +108,32 @@ #error Unknown user operations model #endif -struct page; - struct cpu_user_fns { - void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr); - void (*cpu_copy_user_highpage)(struct page *to, struct page *from, - unsigned long vaddr); + void (*cpu_clear_user_page)(void *p, unsigned long user); + void (*cpu_copy_user_page)(void *to, const void *from, + unsigned long user); }; #ifdef MULTI_USER extern struct cpu_user_fns cpu_user; -#define __cpu_clear_user_highpage cpu_user.cpu_clear_user_highpage -#define __cpu_copy_user_highpage cpu_user.cpu_copy_user_highpage +#define __cpu_clear_user_page cpu_user.cpu_clear_user_page +#define __cpu_copy_user_page cpu_user.cpu_copy_user_page #else -#define __cpu_clear_user_highpage __glue(_USER,_clear_user_highpage) -#define __cpu_copy_user_highpage __glue(_USER,_copy_user_highpage) +#define __cpu_clear_user_page __glue(_USER,_clear_user_page) +#define __cpu_copy_user_page __glue(_USER,_copy_user_page) -extern void __cpu_clear_user_highpage(struct page *page, unsigned long vaddr); -extern void __cpu_copy_user_highpage(struct page *to, struct page *from, - unsigned long vaddr); +extern void __cpu_clear_user_page(void *p, unsigned long user); +extern void __cpu_copy_user_page(void *to, const void *from, + unsigned long user); #endif -#define clear_user_highpage(page,vaddr) \ - __cpu_clear_user_highpage(page, vaddr) - -#define __HAVE_ARCH_COPY_USER_HIGHPAGE -#define copy_user_highpage(to,from,vaddr,vma) \ - __cpu_copy_user_highpage(to, from, vaddr) +#define clear_user_page(addr,vaddr,pg) __cpu_clear_user_page(addr, vaddr) +#define copy_user_page(to,from,vaddr,pg) __cpu_copy_user_page(to, from, vaddr) -#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) +#define clear_page(page) memzero((void *)(page), PAGE_SIZE) extern void copy_page(void *to, const void *from); #undef STRICT_MM_TYPECHECKS diff --git a/trunk/arch/arm/include/asm/processor.h b/trunk/arch/arm/include/asm/processor.h index 2320508443a5..517a4d6ffc74 100644 --- a/trunk/arch/arm/include/asm/processor.h +++ b/trunk/arch/arm/include/asm/processor.h @@ -64,7 +64,7 @@ struct thread_struct { ({ \ unsigned long *stack = (unsigned long *)sp; \ set_fs(USER_DS); \ - memset(regs->uregs, 0, sizeof(regs->uregs)); \ + memzero(regs->uregs, sizeof(regs->uregs)); \ if (current->personality & ADDR_LIMIT_32BIT) \ regs->ARM_cpsr = USR_MODE; \ else \ diff --git a/trunk/arch/arm/include/asm/setup.h b/trunk/arch/arm/include/asm/setup.h index f2cd18a0932b..a65413ba121d 100644 --- a/trunk/arch/arm/include/asm/setup.h +++ b/trunk/arch/arm/include/asm/setup.h @@ -209,11 +209,9 @@ struct meminfo { struct membank bank[NR_BANKS]; }; -extern struct meminfo meminfo; - #define for_each_nodebank(iter,mi,no) \ - for (iter = 0; iter < (mi)->nr_banks; iter++) \ - if ((mi)->bank[iter].node == no) + for (iter = 0; iter < mi->nr_banks; iter++) \ + if (mi->bank[iter].node == no) #define bank_pfn_start(bank) __phys_to_pfn((bank)->start) #define bank_pfn_end(bank) __phys_to_pfn((bank)->start + (bank)->size) diff --git a/trunk/arch/arm/include/asm/string.h b/trunk/arch/arm/include/asm/string.h index cf4f3aad0fc1..e50c4a39b699 100644 --- a/trunk/arch/arm/include/asm/string.h +++ b/trunk/arch/arm/include/asm/string.h @@ -21,6 +21,7 @@ extern void * memmove(void *, const void *, __kernel_size_t); #define __HAVE_ARCH_MEMCHR extern void * memchr(const void *, int, __kernel_size_t); +#define __HAVE_ARCH_MEMZERO #define __HAVE_ARCH_MEMSET extern void * memset(void *, int, __kernel_size_t); @@ -38,4 +39,12 @@ extern void __memzero(void *ptr, __kernel_size_t n); (__p); \ }) +#define memzero(p,n) \ + ({ \ + void *__p = (p); size_t __n = n; \ + if ((__n) != 0) \ + __memzero((__p),(__n)); \ + (__p); \ + }) + #endif diff --git a/trunk/arch/arm/include/asm/system.h b/trunk/arch/arm/include/asm/system.h index 811be55f338e..7aad78420f18 100644 --- a/trunk/arch/arm/include/asm/system.h +++ b/trunk/arch/arm/include/asm/system.h @@ -3,6 +3,8 @@ #ifdef __KERNEL__ +#include + #define CPU_ARCH_UNKNOWN 0 #define CPU_ARCH_ARMv3 1 #define CPU_ARCH_ARMv4 2 @@ -40,10 +42,6 @@ #define CR_U (1 << 22) /* Unaligned access operation */ #define CR_XP (1 << 23) /* Extended page tables */ #define CR_VE (1 << 24) /* Vectored interrupts */ -#define CR_EE (1 << 25) /* Exception (Big) Endian */ -#define CR_TRE (1 << 28) /* TEX remap enable */ -#define CR_AFE (1 << 29) /* Access flag enable */ -#define CR_TE (1 << 30) /* Thumb exception enable */ /* * This is used to ensure the compiler did actually allocate the register we diff --git a/trunk/arch/arm/include/asm/uaccess.h b/trunk/arch/arm/include/asm/uaccess.h index 7897464e0c24..e98ec60b3400 100644 --- a/trunk/arch/arm/include/asm/uaccess.h +++ b/trunk/arch/arm/include/asm/uaccess.h @@ -11,8 +11,7 @@ /* * User space memory access functions */ -#include -#include +#include #include #include #include @@ -401,7 +400,7 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else /* security hole - plug it */ - memset(to, 0, n); + memzero(to, n); return n; } diff --git a/trunk/arch/arm/kernel/armksyms.c b/trunk/arch/arm/kernel/armksyms.c index 53d0037a1e9d..2357b1cf1cf9 100644 --- a/trunk/arch/arm/kernel/armksyms.c +++ b/trunk/arch/arm/kernel/armksyms.c @@ -8,7 +8,6 @@ * published by the Free Software Foundation. */ #include -#include #include #include #include @@ -184,6 +183,6 @@ EXPORT_SYMBOL(_find_next_bit_be); EXPORT_SYMBOL(copy_page); -#ifdef CONFIG_FUNCTION_TRACER +#ifdef CONFIG_FTRACE EXPORT_SYMBOL(mcount); #endif diff --git a/trunk/arch/arm/kernel/elf.c b/trunk/arch/arm/kernel/elf.c index 84849098c8e8..513f332f040d 100644 --- a/trunk/arch/arm/kernel/elf.c +++ b/trunk/arch/arm/kernel/elf.c @@ -21,16 +21,12 @@ int elf_check_arch(const struct elf32_hdr *x) eflags = x->e_flags; if ((eflags & EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN) { - unsigned int flt_fmt; - /* APCS26 is only allowed if the CPU supports it */ if ((eflags & EF_ARM_APCS_26) && !(elf_hwcap & HWCAP_26BIT)) return 0; - flt_fmt = eflags & (EF_ARM_VFP_FLOAT | EF_ARM_SOFT_FLOAT); - /* VFP requires the supporting code */ - if (flt_fmt == EF_ARM_VFP_FLOAT && !(elf_hwcap & HWCAP_VFP)) + if ((eflags & EF_ARM_VFP_FLOAT) && !(elf_hwcap & HWCAP_VFP)) return 0; } return 1; diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S index 06269ea375c5..3aa14dcc5bab 100644 --- a/trunk/arch/arm/kernel/entry-common.S +++ b/trunk/arch/arm/kernel/entry-common.S @@ -101,7 +101,7 @@ ENDPROC(ret_from_fork) #undef CALL #define CALL(x) .long x -#ifdef CONFIG_FUNCTION_TRACER +#ifdef CONFIG_FTRACE #ifdef CONFIG_DYNAMIC_FTRACE ENTRY(mcount) stmdb sp!, {r0-r3, lr} @@ -149,7 +149,7 @@ trace: ftrace_stub: mov pc, lr -#endif /* CONFIG_FUNCTION_TRACER */ +#endif /* CONFIG_FTRACE */ /*============================================================================= * SWI handler diff --git a/trunk/arch/arm/kernel/ftrace.c b/trunk/arch/arm/kernel/ftrace.c index 6c90479e8974..76d50e6091bc 100644 --- a/trunk/arch/arm/kernel/ftrace.c +++ b/trunk/arch/arm/kernel/ftrace.c @@ -95,6 +95,19 @@ int ftrace_update_ftrace_func(ftrace_func_t func) return ret; } +int ftrace_mcount_set(unsigned long *data) +{ + unsigned long pc, old; + unsigned long *addr = data; + unsigned char *new; + + pc = (unsigned long)&mcount_call; + memcpy(&old, &mcount_call, MCOUNT_INSN_SIZE); + new = ftrace_call_replace(pc, *addr); + *addr = ftrace_modify_code(pc, (unsigned char *)&old, new); + return 0; +} + /* run from kstop_machine */ int __init ftrace_dyn_arch_init(void *data) { diff --git a/trunk/arch/arm/kernel/head-common.S b/trunk/arch/arm/kernel/head-common.S index 991952c644d1..bde52df1c668 100644 --- a/trunk/arch/arm/kernel/head-common.S +++ b/trunk/arch/arm/kernel/head-common.S @@ -18,7 +18,7 @@ __switch_data: .long __mmap_switched .long __data_loc @ r4 - .long _data @ r5 + .long __data_start @ r5 .long __bss_start @ r6 .long _end @ r7 .long processor_id @ r4 diff --git a/trunk/arch/arm/kernel/module.c b/trunk/arch/arm/kernel/module.c index dab48f27263f..9203ba7d58ee 100644 --- a/trunk/arch/arm/kernel/module.c +++ b/trunk/arch/arm/kernel/module.c @@ -21,17 +21,17 @@ #include #include -#include #ifdef CONFIG_XIP_KERNEL /* * The XIP kernel text is mapped in the module area for modules and * some other stuff to work without any indirect relocations. - * MODULES_VADDR is redefined here and not in asm/memory.h to avoid + * MODULE_START is redefined here and not in asm/memory.h to avoid * recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off. */ -#undef MODULES_VADDR -#define MODULES_VADDR (((unsigned long)_etext + ~PGDIR_MASK) & PGDIR_MASK) +extern void _etext; +#undef MODULE_START +#define MODULE_START (((unsigned long)&_etext + ~PGDIR_MASK) & PGDIR_MASK) #endif #ifdef CONFIG_MMU @@ -43,7 +43,7 @@ void *module_alloc(unsigned long size) if (!size) return NULL; - area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END); + area = __get_vm_area(size, VM_ALLOC, MODULE_START, MODULE_END); if (!area) return NULL; diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c index 7049815d66d5..1f1eecca7f55 100644 --- a/trunk/arch/arm/kernel/setup.c +++ b/trunk/arch/arm/kernel/setup.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -60,8 +59,9 @@ static int __init fpe_setup(char *line) __setup("fpe=", fpe_setup); #endif -extern void paging_init(struct machine_desc *desc); +extern void paging_init(struct meminfo *, struct machine_desc *desc); extern void reboot_setup(char *str); +extern void _text, _etext, __data_start, _edata, _end; unsigned int processor_id; EXPORT_SYMBOL(processor_id); @@ -112,6 +112,7 @@ static struct stack stacks[NR_CPUS]; char elf_platform[ELF_PLATFORM_SIZE]; EXPORT_SYMBOL(elf_platform); +static struct meminfo meminfo __initdata = { 0, }; static const char *cpu_name; static const char *machine_name; static char __initdata command_line[COMMAND_LINE_SIZE]; @@ -366,34 +367,21 @@ static struct machine_desc * __init setup_machine(unsigned int nr) return list; } -static int __init arm_add_memory(unsigned long start, unsigned long size) +static void __init arm_add_memory(unsigned long start, unsigned long size) { - struct membank *bank = &meminfo.bank[meminfo.nr_banks]; - - if (meminfo.nr_banks >= NR_BANKS) { - printk(KERN_CRIT "NR_BANKS too low, " - "ignoring memory at %#lx\n", start); - return -EINVAL; - } + struct membank *bank; /* * Ensure that start/size are aligned to a page boundary. * Size is appropriately rounded down, start is rounded up. */ size -= start & ~PAGE_MASK; + + bank = &meminfo.bank[meminfo.nr_banks++]; + bank->start = PAGE_ALIGN(start); bank->size = size & PAGE_MASK; bank->node = PHYS_TO_NID(start); - - /* - * Check whether this memory region has non-zero size or - * invalid node number. - */ - if (bank->size == 0 || bank->node >= MAX_NUMNODES) - return -EINVAL; - - meminfo.nr_banks++; - return 0; } /* @@ -484,10 +472,10 @@ request_standard_resources(struct meminfo *mi, struct machine_desc *mdesc) struct resource *res; int i; - kernel_code.start = virt_to_phys(_text); - kernel_code.end = virt_to_phys(_etext - 1); - kernel_data.start = virt_to_phys(_data); - kernel_data.end = virt_to_phys(_end - 1); + kernel_code.start = virt_to_phys(&_text); + kernel_code.end = virt_to_phys(&_etext - 1); + kernel_data.start = virt_to_phys(&__data_start); + kernel_data.end = virt_to_phys(&_end - 1); for (i = 0; i < mi->nr_banks; i++) { if (mi->bank[i].size == 0) @@ -551,7 +539,14 @@ __tagtable(ATAG_CORE, parse_tag_core); static int __init parse_tag_mem32(const struct tag *tag) { - return arm_add_memory(tag->u.mem.start, tag->u.mem.size); + if (meminfo.nr_banks >= NR_BANKS) { + printk(KERN_WARNING + "Ignoring memory bank 0x%08x size %dKB\n", + tag->u.mem.start, tag->u.mem.size / 1024); + return -EINVAL; + } + arm_add_memory(tag->u.mem.start, tag->u.mem.size); + return 0; } __tagtable(ATAG_MEM, parse_tag_mem32); @@ -715,15 +710,15 @@ void __init setup_arch(char **cmdline_p) parse_tags(tags); } - init_mm.start_code = (unsigned long) _text; - init_mm.end_code = (unsigned long) _etext; - init_mm.end_data = (unsigned long) _edata; - init_mm.brk = (unsigned long) _end; + init_mm.start_code = (unsigned long) &_text; + init_mm.end_code = (unsigned long) &_etext; + init_mm.end_data = (unsigned long) &_edata; + init_mm.brk = (unsigned long) &_end; memcpy(boot_command_line, from, COMMAND_LINE_SIZE); boot_command_line[COMMAND_LINE_SIZE-1] = '\0'; parse_cmdline(cmdline_p, from); - paging_init(mdesc); + paging_init(&meminfo, mdesc); request_standard_resources(&meminfo, mdesc); #ifdef CONFIG_SMP @@ -777,8 +772,6 @@ static const char *hwcap_str[] = { "java", "iwmmxt", "crunch", - "thumbee", - "neon", NULL }; diff --git a/trunk/arch/arm/kernel/thumbee.c b/trunk/arch/arm/kernel/thumbee.c index 9cb7aaca159f..df3f6b7ebcea 100644 --- a/trunk/arch/arm/kernel/thumbee.c +++ b/trunk/arch/arm/kernel/thumbee.c @@ -25,7 +25,7 @@ /* * Access to the ThumbEE Handler Base register */ -static inline unsigned long teehbr_read(void) +static inline unsigned long teehbr_read() { unsigned long v; asm("mrc p14, 6, %0, c1, c0, 0\n" : "=r" (v)); diff --git a/trunk/arch/arm/kernel/vmlinux.lds.S b/trunk/arch/arm/kernel/vmlinux.lds.S index 00216071eaf7..4898bdcfe7dd 100644 --- a/trunk/arch/arm/kernel/vmlinux.lds.S +++ b/trunk/arch/arm/kernel/vmlinux.lds.S @@ -119,7 +119,7 @@ SECTIONS #endif .data : AT(__data_loc) { - _data = .; /* address in memory */ + __data_start = .; /* address in memory */ /* * first, the init task union, aligned diff --git a/trunk/arch/arm/lib/Makefile b/trunk/arch/arm/lib/Makefile index 866f84a586ff..30351cd4560d 100644 --- a/trunk/arch/arm/lib/Makefile +++ b/trunk/arch/arm/lib/Makefile @@ -38,6 +38,7 @@ else endif lib-$(CONFIG_ARCH_RPC) += ecard.o io-acorn.o floppydma.o +lib-$(CONFIG_ARCH_CLPS7500) += io-acorn.o lib-$(CONFIG_ARCH_L7200) += io-acorn.o lib-$(CONFIG_ARCH_SHARK) += io-shark.o diff --git a/trunk/arch/arm/lib/memset.S b/trunk/arch/arm/lib/memset.S index 650d5923ab83..761eefa76243 100644 --- a/trunk/arch/arm/lib/memset.S +++ b/trunk/arch/arm/lib/memset.S @@ -25,7 +25,7 @@ add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) /* * The pointer is now aligned and the length is adjusted. Try doing the - * memset again. + * memzero again. */ ENTRY(memset) diff --git a/trunk/arch/arm/mach-aaec2000/Makefile b/trunk/arch/arm/mach-aaec2000/Makefile index 20ec83896c37..a8e462f58bc9 100644 --- a/trunk/arch/arm/mach-aaec2000/Makefile +++ b/trunk/arch/arm/mach-aaec2000/Makefile @@ -3,7 +3,7 @@ # # Common support (must be linked before board specific support) -obj-y += core.o +obj-y += core.o clock.o # Specific board support obj-$(CONFIG_MACH_AAED2000) += aaed2000.o diff --git a/trunk/arch/arm/mach-aaec2000/clock.c b/trunk/arch/arm/mach-aaec2000/clock.c new file mode 100644 index 000000000000..e10ee158d720 --- /dev/null +++ b/trunk/arch/arm/mach-aaec2000/clock.c @@ -0,0 +1,99 @@ +/* + * linux/arch/arm/mach-aaec2000/clock.c + * + * Copyright (C) 2005 Nicolas Bellido Y Ortega + * + * Based on linux/arch/arm/mach-integrator/clock.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "clock.h" + +static LIST_HEAD(clocks); +static DEFINE_MUTEX(clocks_mutex); + +struct clk *clk_get(struct device *dev, const char *id) +{ + struct clk *p, *clk = ERR_PTR(-ENOENT); + + mutex_lock(&clocks_mutex); + list_for_each_entry(p, &clocks, node) { + if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) { + clk = p; + break; + } + } + mutex_unlock(&clocks_mutex); + + return clk; +} +EXPORT_SYMBOL(clk_get); + +void clk_put(struct clk *clk) +{ + module_put(clk->owner); +} +EXPORT_SYMBOL(clk_put); + +int clk_enable(struct clk *clk) +{ + return 0; +} +EXPORT_SYMBOL(clk_enable); + +void clk_disable(struct clk *clk) +{ +} +EXPORT_SYMBOL(clk_disable); + +unsigned long clk_get_rate(struct clk *clk) +{ + return clk->rate; +} +EXPORT_SYMBOL(clk_get_rate); + +long clk_round_rate(struct clk *clk, unsigned long rate) +{ + return rate; +} +EXPORT_SYMBOL(clk_round_rate); + +int clk_set_rate(struct clk *clk, unsigned long rate) +{ + return 0; +} +EXPORT_SYMBOL(clk_set_rate); + +int clk_register(struct clk *clk) +{ + mutex_lock(&clocks_mutex); + list_add(&clk->node, &clocks); + mutex_unlock(&clocks_mutex); + return 0; +} +EXPORT_SYMBOL(clk_register); + +void clk_unregister(struct clk *clk) +{ + mutex_lock(&clocks_mutex); + list_del(&clk->node); + mutex_unlock(&clocks_mutex); +} +EXPORT_SYMBOL(clk_unregister); + +static int __init clk_init(void) +{ + return 0; +} +arch_initcall(clk_init); diff --git a/trunk/arch/arm/mach-aaec2000/clock.h b/trunk/arch/arm/mach-aaec2000/clock.h new file mode 100644 index 000000000000..d4bb74ff613f --- /dev/null +++ b/trunk/arch/arm/mach-aaec2000/clock.h @@ -0,0 +1,23 @@ +/* + * linux/arch/arm/mach-aaec2000/clock.h + * + * Copyright (C) 2005 Nicolas Bellido Y Ortega + * + * Based on linux/arch/arm/mach-integrator/clock.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +struct module; + +struct clk { + struct list_head node; + unsigned long rate; + struct module *owner; + const char *name; + void *data; +}; + +int clk_register(struct clk *clk); +void clk_unregister(struct clk *clk); diff --git a/trunk/arch/arm/mach-aaec2000/core.c b/trunk/arch/arm/mach-aaec2000/core.c index 50e13965dfed..dfb26bc23d1a 100644 --- a/trunk/arch/arm/mach-aaec2000/core.c +++ b/trunk/arch/arm/mach-aaec2000/core.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -31,6 +30,7 @@ #include #include "core.h" +#include "clock.h" /* * Common I/O mapping: @@ -229,28 +229,9 @@ static struct amba_device *amba_devs[] __initdata = { &clcd_device, }; -void clk_disable(struct clk *clk) -{ -} - -int clk_set_rate(struct clk *clk, unsigned long rate) -{ - return 0; -} - -int clk_enable(struct clk *clk) -{ - return 0; -} - -struct clk *clk_get(struct device *dev, const char *id) -{ - return dev && strcmp(dev_name(dev), "mb:16") == 0 ? NULL : ERR_PTR(-ENOENT); -} - -void clk_put(struct clk *clk) -{ -} +static struct clk aaec2000_clcd_clk = { + .name = "CLCDCLK", +}; void __init aaec2000_set_clcd_plat_data(struct aaec2000_clcd_info *clcd) { @@ -284,6 +265,8 @@ static int __init aaec2000_init(void) { int i; + clk_register(&aaec2000_clcd_clk); + for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { struct amba_device *d = amba_devs[i]; amba_device_register(d, &iomem_resource); diff --git a/trunk/arch/arm/mach-aaec2000/include/mach/dma.h b/trunk/arch/arm/mach-aaec2000/include/mach/dma.h new file mode 100644 index 000000000000..2da846c72fe7 --- /dev/null +++ b/trunk/arch/arm/mach-aaec2000/include/mach/dma.h @@ -0,0 +1,9 @@ +/* + * arch/arm/mach-aaec2000/include/mach/dma.h + * + * Copyright (c) 2005 Nicolas Bellido Y Ortega + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ diff --git a/trunk/arch/arm/mach-aaec2000/include/mach/io.h b/trunk/arch/arm/mach-aaec2000/include/mach/io.h index ab4fe5d20eaf..c87c24de1110 100644 --- a/trunk/arch/arm/mach-aaec2000/include/mach/io.h +++ b/trunk/arch/arm/mach-aaec2000/include/mach/io.h @@ -6,13 +6,15 @@ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H +#include + #define IO_SPACE_LIMIT 0xffffffff /* * We don't actually have real ISA nor PCI buses, but there is so many * drivers out there that might just work if we fake them... */ -#define __io(a) __typesafe_io(a) -#define __mem_pci(a) (a) +#define __io(a) ((void __iomem *)(a)) +#define __mem_pci(a) (a) #endif diff --git a/trunk/arch/arm/mach-aaec2000/include/mach/memory.h b/trunk/arch/arm/mach-aaec2000/include/mach/memory.h index c00822543d9f..56ae900a482e 100644 --- a/trunk/arch/arm/mach-aaec2000/include/mach/memory.h +++ b/trunk/arch/arm/mach-aaec2000/include/mach/memory.h @@ -14,6 +14,9 @@ #define PHYS_OFFSET UL(0xf0000000) +#define __virt_to_bus(x) __virt_to_phys(x) +#define __bus_to_virt(x) __phys_to_virt(x) + /* * The nodes are the followings: * diff --git a/trunk/arch/arm/mach-at91/Kconfig b/trunk/arch/arm/mach-at91/Kconfig index 323b47f2b52f..5aafb2e2ca7a 100644 --- a/trunk/arch/arm/mach-at91/Kconfig +++ b/trunk/arch/arm/mach-at91/Kconfig @@ -7,43 +7,36 @@ choice config ARCH_AT91RM9200 bool "AT91RM9200" - select CPU_ARM920T select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9260 bool "AT91SAM9260 or AT91SAM9XE" - select CPU_ARM926T select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9261 bool "AT91SAM9261" - select CPU_ARM926T select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9263 bool "AT91SAM9263" - select CPU_ARM926T select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9RL bool "AT91SAM9RL" - select CPU_ARM926T select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9G20 bool "AT91SAM9G20" - select CPU_ARM926T select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91CAP9 bool "AT91CAP9" - select CPU_ARM926T select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -242,12 +235,6 @@ config MACH_USB_A9263 Select this if you are using a Calao Systems USB-A9263. -config MACH_NEOCORE926 - bool "Adeneo NEOCORE926" - depends on ARCH_AT91SAM9263 - help - Select this if you are using the Adeneo Neocore 926 board. - endif # ---------------------------------------------------------- @@ -315,7 +302,7 @@ comment "AT91 Board Options" config MTD_AT91_DATAFLASH_CARD bool "Enable DataFlash Card support" - depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK || MACH_NEOCORE926) + depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK) help Enable support for the DataFlash card. diff --git a/trunk/arch/arm/mach-at91/Makefile b/trunk/arch/arm/mach-at91/Makefile index c69ff237fd14..cca612d97ca2 100644 --- a/trunk/arch/arm/mach-at91/Makefile +++ b/trunk/arch/arm/mach-at91/Makefile @@ -11,12 +11,12 @@ obj-$(CONFIG_AT91_PMC_UNIT) += clock.o # CPU-specific support obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o -obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o -obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o -obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o -obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o -obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o -obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o +obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o +obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o +obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o +obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o +obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o +obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o # AT91RM9200 board-specific support @@ -47,7 +47,6 @@ obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o # AT91SAM9263 board-specific support obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o -obj-$(CONFIG_MACH_NEOCORE926) += board-neocore926.o # AT91SAM9RL board-specific support obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o diff --git a/trunk/arch/arm/mach-at91/at91cap9.c b/trunk/arch/arm/mach-at91/at91cap9.c index 0a38c69fdbc4..0fc0adaebd58 100644 --- a/trunk/arch/arm/mach-at91/at91cap9.c +++ b/trunk/arch/arm/mach-at91/at91cap9.c @@ -17,8 +17,6 @@ #include #include - -#include #include #include #include @@ -319,12 +317,6 @@ void __init at91cap9_initialize(unsigned long main_clock) /* Register GPIO subsystem */ at91_gpio_init(at91cap9_gpio, 4); - - /* Remember the silicon revision */ - if (cpu_is_at91cap9_revB()) - system_rev = 0xB; - else if (cpu_is_at91cap9_revC()) - system_rev = 0xC; } /* -------------------------------------------------------------------- diff --git a/trunk/arch/arm/mach-at91/at91cap9_devices.c b/trunk/arch/arm/mach-at91/at91cap9_devices.c index 9eca2209cde6..5ebd4273d353 100644 --- a/trunk/arch/arm/mach-at91/at91cap9_devices.c +++ b/trunk/arch/arm/mach-at91/at91cap9_devices.c @@ -13,7 +13,6 @@ */ #include #include -#include #include #include @@ -22,7 +21,6 @@ #include