development kernel tree: Changes to 'master'
git at git.openmoko.org
git at git.openmoko.org
Wed May 7 19:25:39 CEST 2008
.gitignore | 2 +
.mailmap | 1 +
CREDITS | 8 +
Documentation/00-INDEX | 18 +-
Documentation/ABI/obsolete/o2cb | 11 +
Documentation/ABI/stable/o2cb | 10 +
Documentation/ABI/stable/sysfs-class-ubi | 212 +
Documentation/ABI/testing/sysfs-bus-pci | 11 +
Documentation/ABI/testing/sysfs-class-bdi | 46 +
Documentation/ABI/testing/sysfs-ibft | 23 +
Documentation/ABI/testing/sysfs-ocfs2 | 89 +
Documentation/DMA-API.txt | 69 +-
Documentation/DMA-attributes.txt | 24 +
Documentation/DMA-mapping.txt | 38 +-
Documentation/DocBook/Makefile | 10 +-
Documentation/DocBook/debugobjects.tmpl | 391 +
Documentation/DocBook/kernel-api.tmpl | 61 +-
Documentation/DocBook/kernel-locking.tmpl | 10 +-
Documentation/DocBook/kgdb.tmpl | 449 +
Documentation/DocBook/mac80211.tmpl | 335 +
Documentation/DocBook/rapidio.tmpl | 1 -
Documentation/DocBook/writing_usb_driver.tmpl | 14 +-
Documentation/HOWTO | 30 +-
Documentation/PCI/00-INDEX | 12 +
Documentation/PCI/PCIEBUS-HOWTO.txt | 217 +
Documentation/PCI/pci-error-recovery.txt | 396 +
Documentation/PCI/pci.txt | 646 ++
Documentation/PCI/pcieaer-howto.txt | 253 +
Documentation/PCIEBUS-HOWTO.txt | 217 -
Documentation/SubmittingPatches | 4 +-
Documentation/arm/Samsung-S3C24XX/NAND.txt | 30 +
Documentation/arm/Samsung-S3C24XX/Overview.txt | 2 +
Documentation/block/biodoc.txt | 2 +-
Documentation/braille-console.txt | 34 +
Documentation/cdrom/cdrom-standard.tex | 2 +-
Documentation/cgroups.txt | 3 +-
Documentation/cli-sti-removal.txt | 2 +-
Documentation/controllers/devices.txt | 48 +
Documentation/controllers/resource_counter.txt | 181 +
Documentation/cpu-freq/user-guide.txt | 14 +
Documentation/cpusets.txt | 98 +-
Documentation/debugging-via-ohci1394.txt | 16 +-
Documentation/device-mapper/dm-crypt.txt | 52 +
Documentation/dontdiff | 3 +-
Documentation/early-userspace/README | 4 +-
Documentation/fb/gxfb.txt | 52 +
Documentation/fb/intelfb.txt | 2 +
Documentation/fb/lxfb.txt | 52 +
Documentation/fb/metronomefb.txt | 16 +-
Documentation/fb/modedb.txt | 4 +
Documentation/feature-removal-schedule.txt | 102 +-
Documentation/filesystems/Locking | 5 -
Documentation/filesystems/nfs-rdma.txt | 256 +
Documentation/filesystems/proc.txt | 59 +-
Documentation/filesystems/seq_file.txt | 19 +-
Documentation/filesystems/sysfs.txt | 9 +-
Documentation/filesystems/tmpfs.txt | 12 +
Documentation/filesystems/vfat.txt | 15 +
Documentation/filesystems/vfs.txt | 4 -
Documentation/filesystems/xfs.txt | 15 +-
.../firmware_class/firmware_sample_driver.c | 115 -
.../firmware_sample_firmware_class.c | 207 -
Documentation/gpio.txt | 10 +
Documentation/highuid.txt | 2 -
Documentation/hrtimer/timer_stats.txt | 73 -
Documentation/hrtimers/highres.txt | 249 -
Documentation/hrtimers/hrtimers.txt | 178 -
Documentation/hwmon/w83l785ts | 3 +-
Documentation/i2c/writing-clients | 3 +-
Documentation/i386/boot.txt | 64 +-
Documentation/ia64/kvm.txt | 82 +
Documentation/ide/ide-tape.txt | 211 +-
Documentation/ide/ide.txt | 146 +-
Documentation/ide/warm-plug-howto.txt | 13 +
Documentation/ioctl-number.txt | 2 +
Documentation/kbuild/kconfig-language.txt | 41 +-
Documentation/kbuild/modules.txt | 9 +-
Documentation/kdump/kdump.txt | 5 +-
Documentation/kernel-parameters.txt | 81 +-
Documentation/keys-request-key.txt | 11 +-
Documentation/keys.txt | 59 +-
Documentation/kprobes.txt | 51 +-
Documentation/laptops/acer-wmi.txt | 2 +-
Documentation/laptops/thinkpad-acpi.txt | 139 +-
Documentation/leds-class.txt | 12 +-
Documentation/lguest/lguest.c | 62 +-
Documentation/magic-number.txt | 1 -
Documentation/md.txt | 6 +
Documentation/memory-barriers.txt | 4 +-
Documentation/mips/AU1xxx_IDE.README | 46 -
Documentation/networking/00-INDEX | 2 -
Documentation/networking/bcm43xx.txt | 89 -
Documentation/networking/phy.txt | 38 +-
Documentation/networking/wan-router.txt | 621 -
Documentation/oops-tracing.txt | 4 +
Documentation/pci-error-recovery.txt | 396 -
Documentation/pci.txt | 646 --
Documentation/pcieaer-howto.txt | 253 -
Documentation/power/devices.txt | 5 +
Documentation/powerpc/booting-without-of.txt | 666 ++-
Documentation/powerpc/kvm_440.txt | 41 +
.../powerpc/mpc52xx-device-tree-bindings.txt | 23 +
Documentation/powerpc/phyp-assisted-dump.txt | 127 +
.../prctl/disable-tsc-ctxt-sw-stress-test.c | 96 +
.../prctl/disable-tsc-on-off-stress-test.c | 95 +
Documentation/prctl/disable-tsc-test.c | 94 +
Documentation/s390/kvm.txt | 125 +
Documentation/s390/s390dbf.txt | 21 +
Documentation/scheduler/sched-design.txt | 165 -
Documentation/scheduler/sched-rt-group.txt | 188 +-
Documentation/scsi/ChangeLog.megaraid_sas | 22 +
Documentation/scsi/st.txt | 12 +-
Documentation/smart-config.txt | 98 -
Documentation/sound/alsa/ALSA-Configuration.txt | 48 +-
Documentation/spi/spidev | 168 +-
Documentation/spi/spidev_fdx.c | 158 +
Documentation/sysrq.txt | 2 +
Documentation/thermal/sysfs-api.txt | 33 +-
Documentation/timers/highres.txt | 249 +
Documentation/timers/hrtimers.txt | 178 +
Documentation/timers/timer_stats.txt | 73 +
Documentation/usb/anchors.txt | 50 +
Documentation/usb/callbacks.txt | 132 +
Documentation/usb/persist.txt | 43 +-
Documentation/usb/usb-serial.txt | 7 +-
Documentation/video4linux/CARDLIST.au0828 | 4 +
Documentation/video4linux/CARDLIST.bttv | 2 +
Documentation/video4linux/CARDLIST.cx23885 | 3 +
Documentation/video4linux/CARDLIST.cx88 | 9 +
Documentation/video4linux/CARDLIST.saa7134 | 16 +-
Documentation/video4linux/cx18.txt | 34 +
Documentation/video4linux/extract_xc3028.pl | 46 +-
Documentation/vm/numa_memory_policy.txt | 281 +-
Documentation/vm/slabinfo.c | 37 +-
Documentation/x86/pat.txt | 100 +
Documentation/x86_64/boot-options.txt | 5 +
Kbuild | 62 +-
MAINTAINERS | 272 +-
Makefile | 48 +-
arch/Kconfig | 3 +
arch/alpha/kernel/Makefile | 2 +-
arch/alpha/kernel/alpha_ksyms.c | 9 -
arch/alpha/kernel/asm-offsets.c | 6 +-
arch/alpha/kernel/core_marvel.c | 6 +-
arch/alpha/kernel/core_t2.c | 24 +-
arch/alpha/kernel/core_titan.c | 34 +-
arch/alpha/kernel/core_tsunami.c | 28 +-
arch/alpha/kernel/module.c | 6 +
arch/alpha/kernel/osf_sys.c | 70 +-
arch/alpha/kernel/pci.c | 51 +-
arch/alpha/kernel/pci_iommu.c | 34 +-
arch/alpha/kernel/semaphore.c | 224 -
arch/alpha/kernel/smp.c | 4 +-
arch/alpha/kernel/srm_env.c | 2 +-
arch/alpha/kernel/sys_alcor.c | 2 +-
arch/alpha/kernel/sys_marvel.c | 12 +-
arch/alpha/kernel/sys_nautilus.c | 2 +
arch/alpha/kernel/sys_sable.c | 6 +-
arch/alpha/kernel/sys_sio.c | 2 +-
arch/alpha/kernel/traps.c | 5 +-
arch/arm/Kconfig | 45 +-
arch/arm/Makefile | 4 +-
arch/arm/boot/Makefile | 8 +-
arch/arm/common/rtctime.c | 1 -
arch/arm/common/scoop.c | 183 +-
arch/arm/configs/am200epdkit_defconfig | 1149 ++
arch/arm/configs/at91rm9200dk_defconfig | 4 +-
arch/arm/configs/at91rm9200ek_defconfig | 4 +-
arch/arm/configs/at91sam9260ek_defconfig | 520 +-
arch/arm/configs/at91sam9261ek_defconfig | 573 +-
arch/arm/configs/at91sam9263ek_defconfig | 557 +-
arch/arm/configs/at91sam9rlek_defconfig | 430 +-
arch/arm/configs/ateb9200_defconfig | 2 +-
arch/arm/configs/cam60_defconfig | 1228 ++
arch/arm/configs/csb337_defconfig | 732 +-
arch/arm/configs/csb637_defconfig | 728 +-
arch/arm/configs/ecbat91_defconfig | 1315 +++
arch/arm/configs/kafa_defconfig | 4 +-
arch/arm/configs/magician_defconfig | 1182 ++
arch/arm/configs/ns9xxx_defconfig | 652 +-
arch/arm/configs/orion5x_defconfig | 1383 +++
arch/arm/configs/orion_defconfig | 1383 ---
arch/arm/configs/picotux200_defconfig | 4 +-
arch/arm/configs/sam9_l9260_defconfig | 1098 ++
arch/arm/configs/tct_hammer_defconfig | 886 ++
arch/arm/configs/yl9200_defconfig | 1216 ++
arch/arm/kernel/Makefile | 3 +-
arch/arm/kernel/asm-offsets.c | 18 +-
arch/arm/kernel/atags.c | 2 +-
arch/arm/kernel/calls.S | 4 +-
arch/arm/kernel/ecard.c | 56 +-
arch/arm/kernel/entry-armv.S | 111 +-
arch/arm/kernel/entry-common.S | 5 +
arch/arm/kernel/head-common.S | 7 +-
arch/arm/kernel/kprobes-decode.c | 2 +-
arch/arm/kernel/kprobes.c | 2 +-
arch/arm/kernel/semaphore.c | 221 -
arch/arm/kernel/sys_arm.c | 17 -
arch/arm/kernel/thumbee.c | 81 +
arch/arm/mach-aaec2000/clock.c | 2 -
arch/arm/mach-at91/Kconfig | 33 +-
arch/arm/mach-at91/Makefile | 3 +
arch/arm/mach-at91/at91cap9.c | 9 +
arch/arm/mach-at91/at91cap9_devices.c | 72 +-
arch/arm/mach-at91/at91rm9200_devices.c | 92 +-
arch/arm/mach-at91/at91sam9260.c | 8 +
arch/arm/mach-at91/at91sam9260_devices.c | 159 +-
arch/arm/mach-at91/at91sam9261.c | 8 +
arch/arm/mach-at91/at91sam9261_devices.c | 113 +-
arch/arm/mach-at91/at91sam9263.c | 8 +
arch/arm/mach-at91/at91sam9263_devices.c | 100 +-
arch/arm/mach-at91/at91sam926x_time.c | 171 +-
arch/arm/mach-at91/at91sam9rl.c | 8 +
arch/arm/mach-at91/at91sam9rl_devices.c | 131 +-
arch/arm/mach-at91/board-cam60.c | 180 +
arch/arm/mach-at91/board-cap9adk.c | 2 +-
arch/arm/mach-at91/board-csb337.c | 21 +-
arch/arm/mach-at91/board-csb637.c | 30 +-
arch/arm/mach-at91/board-dk.c | 3 +-
arch/arm/mach-at91/board-eb9200.c | 3 +-
arch/arm/mach-at91/board-ecbat91.c | 178 +
arch/arm/mach-at91/board-sam9-l9260.c | 199 +
arch/arm/mach-at91/board-sam9260ek.c | 83 +-
arch/arm/mach-at91/board-sam9261ek.c | 83 +-
arch/arm/mach-at91/board-sam9263ek.c | 25 +-
arch/arm/mach-at91/board-sam9rlek.c | 23 +-
arch/arm/mach-at91/board-yl-9200.c | 683 ++
arch/arm/mach-at91/clock.c | 1 -
arch/arm/mach-at91/pm.c | 169 +-
arch/arm/mach-clps711x/Kconfig | 2 +
arch/arm/mach-davinci/clock.c | 6 +-
arch/arm/mach-ep93xx/Makefile | 2 +-
arch/arm/mach-ep93xx/core.c | 109 +-
arch/arm/mach-ep93xx/gpio.c | 158 +
arch/arm/mach-integrator/clock.c | 1 -
arch/arm/mach-integrator/time.c | 3 +
arch/arm/mach-iop32x/Kconfig | 8 -
arch/arm/mach-iop32x/em7210.c | 3 +-
arch/arm/mach-iop32x/glantank.c | 4 +-
arch/arm/mach-iop32x/iq31244.c | 11 +-
arch/arm/mach-iop32x/iq80321.c | 2 +-
arch/arm/mach-iop32x/n2100.c | 4 +-
arch/arm/mach-iop33x/Kconfig | 8 -
arch/arm/mach-iop33x/iq80331.c | 2 +-
arch/arm/mach-iop33x/iq80332.c | 2 +-
arch/arm/mach-ixp4xx/dsmg600-setup.c | 2 +-
arch/arm/mach-ixp4xx/ixp4xx_npe.c | 4 +
arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 2 +
arch/arm/mach-ixp4xx/nas100d-setup.c | 2 +-
arch/arm/mach-ixp4xx/nslu2-setup.c | 2 +-
arch/arm/mach-ks8695/Makefile | 3 +
arch/arm/mach-ks8695/devices.c | 21 +
arch/arm/mach-ks8695/leds.c | 94 +
arch/arm/mach-lh7a40x/arch-kev7a400.c | 5 +-
arch/arm/mach-ns9xxx/Kconfig | 30 +-
arch/arm/mach-ns9xxx/Makefile | 7 +-
arch/arm/mach-ns9xxx/Makefile.boot | 2 +-
arch/arm/mach-ns9xxx/board-a9m9750dev.c | 69 +-
arch/arm/mach-ns9xxx/clock.c | 215 +
arch/arm/mach-ns9xxx/clock.h | 35 +
arch/arm/mach-ns9xxx/generic.c | 27 +-
arch/arm/mach-ns9xxx/generic.h | 5 +-
arch/arm/mach-ns9xxx/gpio-ns9360.c | 118 +
arch/arm/mach-ns9xxx/gpio-ns9360.h | 13 +
arch/arm/mach-ns9xxx/gpio.c | 141 +-
arch/arm/mach-ns9xxx/irq.c | 74 +-
arch/arm/mach-ns9xxx/mach-cc9p9360dev.c | 8 +-
arch/arm/mach-ns9xxx/mach-cc9p9360js.c | 8 +-
arch/arm/mach-ns9xxx/plat-serial8250.c | 69 +
arch/arm/mach-ns9xxx/processor-ns9360.c | 54 +
arch/arm/mach-ns9xxx/time-ns9360.c | 185 +
arch/arm/mach-ns9xxx/time.c | 184 -
arch/arm/mach-omap1/Makefile | 3 +-
arch/arm/mach-omap1/board-h2.c | 2 -
arch/arm/mach-omap1/board-h3.c | 3 +-
arch/arm/mach-omap1/board-osk.c | 139 +-
arch/arm/mach-omap1/leds-osk.c | 80 +-
arch/arm/mach-omap1/mux.c | 146 +-
arch/arm/mach-omap1/time.c | 49 -
arch/arm/mach-omap1/timer32k.c | 209 +
arch/arm/mach-omap2/Makefile | 12 +-
arch/arm/mach-omap2/board-2430sdp.c | 23 +-
arch/arm/mach-omap2/board-apollon.c | 60 +-
arch/arm/mach-omap2/board-h4.c | 111 +-
arch/arm/mach-omap2/clock.c | 1362 +--
arch/arm/mach-omap2/clock.h | 2129 +----
arch/arm/mach-omap2/clock24xx.c | 539 +
arch/arm/mach-omap2/clock24xx.h | 2643 +++++
arch/arm/mach-omap2/clock34xx.c | 235 +
arch/arm/mach-omap2/clock34xx.h | 3009 +++++
arch/arm/mach-omap2/cm-regbits-24xx.h | 401 +
arch/arm/mach-omap2/cm-regbits-34xx.h | 673 ++
arch/arm/mach-omap2/cm.h | 124 +
arch/arm/mach-omap2/control.c | 74 +
arch/arm/mach-omap2/gpmc.c | 12 +-
arch/arm/mach-omap2/memory.c | 74 +-
arch/arm/mach-omap2/memory.h | 2 +
arch/arm/mach-omap2/mux.c | 121 +-
arch/arm/mach-omap2/pm-domain.c | 299 -
arch/arm/mach-omap2/pm.c | 270 +-
arch/arm/mach-omap2/prcm-common.h | 317 +
arch/arm/mach-omap2/prcm-regs.h | 483 -
arch/arm/mach-omap2/prcm.c | 14 +-
arch/arm/mach-omap2/prm-regbits-24xx.h | 279 +
arch/arm/mach-omap2/prm-regbits-34xx.h | 582 +
arch/arm/mach-omap2/prm.h | 316 +
arch/arm/mach-omap2/sdrc.h | 58 +
arch/arm/mach-omap2/sleep.S | 23 +-
arch/arm/mach-omap2/sram-fn.S | 42 +-
arch/arm/mach-omap2/timer-gp.c | 152 +-
arch/arm/mach-orion/Kconfig | 41 -
arch/arm/mach-orion/Makefile | 6 -
arch/arm/mach-orion/Makefile.boot | 3 -
arch/arm/mach-orion/addr-map.c | 490 -
arch/arm/mach-orion/common.c | 369 -
arch/arm/mach-orion/common.h | 92 -
arch/arm/mach-orion/db88f5281-setup.c | 364 -
arch/arm/mach-orion/dns323-setup.c | 323 -
arch/arm/mach-orion/gpio.c | 225 -
arch/arm/mach-orion/irq.c | 241 -
arch/arm/mach-orion/kurobox_pro-setup.c | 244 -
arch/arm/mach-orion/pci.c | 557 -
arch/arm/mach-orion/rd88f5182-setup.c | 315 -
arch/arm/mach-orion/time.c | 181 -
arch/arm/mach-orion/ts209-setup.c | 361 -
arch/arm/mach-orion5x/Kconfig | 49 +
arch/arm/mach-orion5x/Makefile | 7 +
arch/arm/mach-orion5x/Makefile.boot | 3 +
arch/arm/mach-orion5x/addr-map.c | 240 +
arch/arm/mach-orion5x/common.c | 391 +
arch/arm/mach-orion5x/common.h | 71 +
arch/arm/mach-orion5x/db88f5281-setup.c | 362 +
arch/arm/mach-orion5x/dns323-setup.c | 322 +
arch/arm/mach-orion5x/gpio.c | 226 +
arch/arm/mach-orion5x/irq.c | 211 +
arch/arm/mach-orion5x/kurobox_pro-setup.c | 260 +
arch/arm/mach-orion5x/pci.c | 567 +
arch/arm/mach-orion5x/rd88f5182-setup.c | 313 +
arch/arm/mach-orion5x/ts209-setup.c | 444 +
arch/arm/mach-pnx4008/clock.c | 1 -
arch/arm/mach-pnx4008/gpio.c | 1 -
arch/arm/mach-pxa/Kconfig | 20 +
arch/arm/mach-pxa/Makefile | 7 +-
arch/arm/mach-pxa/clock.c | 1 +
arch/arm/mach-pxa/cm-x270-pci.c | 1 +
arch/arm/mach-pxa/cm-x270.c | 1 +
arch/arm/mach-pxa/colibri.c | 1 +
arch/arm/mach-pxa/corgi.c | 1 +
arch/arm/mach-pxa/corgi_pm.c | 1 +
arch/arm/mach-pxa/corgi_ssp.c | 1 +
arch/arm/mach-pxa/devices.c | 58 +
arch/arm/mach-pxa/devices.h | 1 +
arch/arm/mach-pxa/em-x270.c | 1 +
arch/arm/mach-pxa/generic.c | 67 -
arch/arm/mach-pxa/generic.h | 12 +-
arch/arm/mach-pxa/gpio.c | 325 +-
arch/arm/mach-pxa/gumstix.c | 148 +
arch/arm/mach-pxa/idp.c | 1 +
arch/arm/mach-pxa/irq.c | 336 +-
arch/arm/mach-pxa/leds-trizeps4.c | 1 +
arch/arm/mach-pxa/littleton.c | 70 +-
arch/arm/mach-pxa/lpd270.c | 1 +
arch/arm/mach-pxa/lubbock.c | 125 +-
arch/arm/mach-pxa/magician.c | 531 +-
arch/arm/mach-pxa/mainstone.c | 222 +-
arch/arm/mach-pxa/mfp-pxa2xx.c | 245 +
arch/arm/mach-pxa/mfp-pxa3xx.c | 255 +
arch/arm/mach-pxa/mfp.c | 255 -
arch/arm/mach-pxa/pcm027.c | 1 +
arch/arm/mach-pxa/pcm990-baseboard.c | 84 +
arch/arm/mach-pxa/pm.c | 4 +-
arch/arm/mach-pxa/poodle.c | 1 +
arch/arm/mach-pxa/pxa25x.c | 32 +-
arch/arm/mach-pxa/pxa27x.c | 48 +-
arch/arm/mach-pxa/pxa3xx.c | 79 +-
arch/arm/mach-pxa/sharpsl_pm.c | 1 +
arch/arm/mach-pxa/spitz.c | 1 +
arch/arm/mach-pxa/spitz_pm.c | 1 +
arch/arm/mach-pxa/tosa.c | 297 +-
arch/arm/mach-pxa/trizeps4.c | 1 +
arch/arm/mach-pxa/zylonite.c | 75 +-
arch/arm/mach-pxa/zylonite_pxa300.c | 8 +-
arch/arm/mach-pxa/zylonite_pxa320.c | 8 +-
arch/arm/mach-realview/Kconfig | 15 +-
arch/arm/mach-realview/Makefile | 2 +
arch/arm/mach-realview/clock.c | 1 -
arch/arm/mach-realview/core.c | 53 +-
arch/arm/mach-realview/core.h | 5 +
arch/arm/mach-realview/platsmp.c | 56 +-
arch/arm/mach-realview/realview_eb.c | 149 +-
arch/arm/mach-realview/realview_pb1176.c | 292 +
arch/arm/mach-realview/realview_pb11mp.c | 342 +
arch/arm/mach-s3c2410/Kconfig | 7 +
arch/arm/mach-s3c2410/Makefile | 1 +
arch/arm/mach-s3c2410/mach-bast.c | 38 +-
arch/arm/mach-s3c2410/mach-tct_hammer.c | 160 +
arch/arm/mach-s3c2410/mach-vr1000.c | 2 +-
arch/arm/mach-s3c2412/s3c2412.c | 2 +-
arch/arm/mach-s3c2440/mach-anubis.c | 4 +-
arch/arm/mach-s3c2440/mach-osiris.c | 5 +-
arch/arm/mach-sa1100/Makefile | 2 +-
arch/arm/mach-sa1100/generic.c | 31 -
arch/arm/mach-sa1100/generic.h | 1 +
arch/arm/mach-sa1100/gpio.c | 65 +
arch/arm/mach-sa1100/irq.c | 2 +
arch/arm/mach-sa1100/time.c | 159 +-
arch/arm/mach-versatile/clock.c | 1 -
arch/arm/mm/Kconfig | 55 +-
arch/arm/mm/Makefile | 1 +
arch/arm/mm/copypage-feroceon.S | 95 +
arch/arm/mm/init.c | 2 -
arch/arm/mm/iomap.c | 4 +-
arch/arm/mm/mmu.c | 1 +
arch/arm/mm/proc-arm1020.S | 1 +
arch/arm/mm/proc-arm1020e.S | 1 +
arch/arm/mm/proc-arm1022.S | 1 +
arch/arm/mm/proc-arm1026.S | 1 +
arch/arm/mm/proc-arm6_7.S | 2 +
arch/arm/mm/proc-arm720.S | 1 +
arch/arm/mm/proc-arm740.S | 1 +
arch/arm/mm/proc-arm7tdmi.S | 1 +
arch/arm/mm/proc-arm920.S | 1 +
arch/arm/mm/proc-arm922.S | 1 +
arch/arm/mm/proc-arm925.S | 1 +
arch/arm/mm/proc-arm926.S | 1 +
arch/arm/mm/proc-arm940.S | 1 +
arch/arm/mm/proc-arm946.S | 1 +
arch/arm/mm/proc-arm9tdmi.S | 1 +
arch/arm/mm/proc-feroceon.S | 61 +-
arch/arm/mm/proc-sa110.S | 1 +
arch/arm/mm/proc-sa1100.S | 1 +
arch/arm/mm/proc-v6.S | 15 +-
arch/arm/mm/proc-v7.S | 1 +
arch/arm/mm/proc-xsc3.S | 1 +
arch/arm/mm/proc-xscale.S | 1 +
arch/arm/oprofile/op_model_mpcore.c | 44 +-
arch/arm/plat-iop/pci.c | 79 +-
arch/arm/plat-mxc/Kconfig | 2 +-
arch/arm/plat-mxc/Makefile | 4 -
arch/arm/plat-mxc/irq.c | 14 +-
arch/arm/plat-omap/Makefile | 2 -
arch/arm/plat-omap/clock.c | 43 +-
arch/arm/plat-omap/common.c | 64 +-
arch/arm/plat-omap/gpio.c | 176 +-
arch/arm/plat-omap/mux.c | 174 +-
arch/arm/plat-omap/timer32k.c | 269 -
arch/arm/plat-omap/usb.c | 67 +-
arch/arm/plat-orion/Makefile | 8 +
arch/arm/plat-orion/irq.c | 64 +
arch/arm/plat-orion/pcie.c | 245 +
arch/arm/plat-orion/time.c | 203 +
arch/arm/plat-s3c24xx/clock.c | 56 +
arch/arm/plat-s3c24xx/cpu.c | 27 +
arch/arm/tools/mach-types | 117 +-
arch/avr32/Kconfig | 5 +
arch/avr32/kernel/Makefile | 2 +-
arch/avr32/kernel/asm-offsets.c | 9 +-
arch/avr32/kernel/entry-avr32b.S | 20 -
arch/avr32/kernel/process.c | 6 +-
arch/avr32/kernel/semaphore.c | 148 -
arch/avr32/kernel/setup.c | 2 +
arch/avr32/kernel/sys_avr32.c | 13 -
arch/avr32/kernel/time.c | 248 +-
arch/avr32/mach-at32ap/Makefile | 3 +-
arch/avr32/mach-at32ap/at32ap700x.c | 243 +-
arch/avr32/mach-at32ap/intc.c | 1 -
arch/avr32/mach-at32ap/pm-at32ap700x.S | 66 +
arch/avr32/mach-at32ap/time-tc.c | 218 -
arch/avr32/mm/init.c | 3 -
arch/avr32/mm/tlb.c | 6 +-
arch/avr32/oprofile/op_model_avr32.c | 1 -
arch/blackfin/Kconfig | 165 +-
arch/blackfin/Makefile | 5 +
arch/blackfin/boot/.gitignore | 1 +
arch/blackfin/configs/BF527-EZKIT_defconfig | 8 +-
arch/blackfin/configs/BF533-EZKIT_defconfig | 4 +-
arch/blackfin/configs/BF533-STAMP_defconfig | 4 +-
arch/blackfin/configs/BF537-STAMP_defconfig | 4 +-
arch/blackfin/configs/BF548-EZKIT_defconfig | 8 +-
arch/blackfin/configs/BF561-EZKIT_defconfig | 4 +-
arch/blackfin/configs/CM-BF533_defconfig | 912 ++
arch/blackfin/configs/CM-BF537E_defconfig | 940 ++
arch/blackfin/configs/CM-BF537U_defconfig | 940 ++
arch/blackfin/configs/CM-BF548_defconfig | 1373 +++
arch/blackfin/configs/CM-BF561_defconfig | 876 ++
arch/blackfin/configs/H8606_defconfig | 4 +-
arch/blackfin/configs/IP0X_defconfig | 1252 ++
arch/blackfin/configs/PNAV-10_defconfig | 4 +-
arch/blackfin/configs/SRV1_defconfig | 1290 +++
arch/blackfin/kernel/Makefile | 8 +-
arch/blackfin/kernel/asm-offsets.c | 3 +-
arch/blackfin/kernel/bfin_dma_5xx.c | 13 +-
arch/blackfin/kernel/bfin_gpio.c | 169 +-
arch/blackfin/kernel/bfin_ksyms.c | 5 -
arch/blackfin/kernel/cplb-mpu/cplbinfo.c | 8 -
arch/blackfin/kernel/cplb-mpu/cplbinit.c | 4 +-
arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 128 +-
arch/blackfin/kernel/cplb-nompu/cplbinfo.c | 15 +-
arch/blackfin/kernel/cplb-nompu/cplbinit.c | 31 +
arch/blackfin/kernel/dma-mapping.c | 4 +-
arch/blackfin/kernel/gptimers.c | 24 +-
arch/blackfin/kernel/process.c | 69 +-
arch/blackfin/kernel/ptrace.c | 7 +-
arch/blackfin/kernel/reboot.c | 69 +-
arch/blackfin/kernel/setup.c | 131 +-
arch/blackfin/kernel/signal.c | 26 +-
arch/blackfin/kernel/sys_bfin.c | 17 -
arch/blackfin/kernel/time-ts.c | 219 +
arch/blackfin/kernel/time.c | 24 +-
arch/blackfin/kernel/traps.c | 94 +-
arch/blackfin/kernel/vmlinux.lds.S | 54 +-
arch/blackfin/mach-bf527/Makefile | 2 -
arch/blackfin/mach-bf527/boards/ezkit.c | 36 +-
arch/blackfin/mach-bf527/cpu.c | 161 -
arch/blackfin/mach-bf527/dma.c | 5 +-
arch/blackfin/mach-bf527/head.S | 18 -
arch/blackfin/mach-bf533/Makefile | 2 -
arch/blackfin/mach-bf533/boards/H8606.c | 25 +-
arch/blackfin/mach-bf533/boards/Kconfig | 6 +
arch/blackfin/mach-bf533/boards/Makefile | 1 +
arch/blackfin/mach-bf533/boards/cm_bf533.c | 25 +-
arch/blackfin/mach-bf533/boards/ezkit.c | 25 +-
arch/blackfin/mach-bf533/boards/generic_board.c | 2 +-
arch/blackfin/mach-bf533/boards/ip0x.c | 303 +
arch/blackfin/mach-bf533/boards/stamp.c | 59 +-
arch/blackfin/mach-bf533/cpu.c | 158 -
arch/blackfin/mach-bf533/dma.c | 5 +-
arch/blackfin/mach-bf533/head.S | 34 +-
arch/blackfin/mach-bf537/Makefile | 2 -
arch/blackfin/mach-bf537/boards/cm_bf537.c | 58 +-
arch/blackfin/mach-bf537/boards/generic_board.c | 34 +-
arch/blackfin/mach-bf537/boards/minotaur.c | 36 +-
arch/blackfin/mach-bf537/boards/pnav10.c | 31 +-
arch/blackfin/mach-bf537/boards/stamp.c | 90 +-
arch/blackfin/mach-bf537/cpu.c | 159 -
arch/blackfin/mach-bf537/dma.c | 5 +-
arch/blackfin/mach-bf537/head.S | 46 +-
arch/blackfin/mach-bf548/Makefile | 2 -
arch/blackfin/mach-bf548/boards/Kconfig | 6 +
arch/blackfin/mach-bf548/boards/Makefile | 1 +
arch/blackfin/mach-bf548/boards/cm_bf548.c | 664 ++
arch/blackfin/mach-bf548/boards/ezkit.c | 103 +-
arch/blackfin/mach-bf548/cpu.c | 159 -
arch/blackfin/mach-bf548/dma.c | 4 +-
arch/blackfin/mach-bf548/head.S | 18 -
arch/blackfin/mach-bf561/boards/cm_bf561.c | 25 +-
arch/blackfin/mach-bf561/boards/ezkit.c | 32 +-
arch/blackfin/mach-bf561/boards/generic_board.c | 2 +-
arch/blackfin/mach-bf561/boards/tepla.c | 2 +-
arch/blackfin/mach-bf561/dma.c | 5 +-
arch/blackfin/mach-bf561/head.S | 34 +-
arch/blackfin/mach-common/Makefile | 3 +-
arch/blackfin/mach-common/arch_checks.c | 3 +-
arch/blackfin/mach-common/cpufreq.c | 194 +
arch/blackfin/mach-common/entry.S | 128 +-
arch/blackfin/mach-common/ints-priority.c | 56 +-
arch/blackfin/mach-common/lock.S | 2 +-
arch/blackfin/mm/blackfin_sram.c | 2 +-
arch/blackfin/oprofile/common.c | 2 +-
arch/blackfin/oprofile/op_model_bf533.c | 2 +-
arch/cris/kernel/Makefile | 3 +-
arch/cris/kernel/crisksyms.c | 7 -
arch/cris/kernel/profile.c | 4 +-
arch/cris/kernel/semaphore.c | 129 -
arch/cris/mm/init.c | 1 -
arch/frv/kernel/Makefile | 2 +-
arch/frv/kernel/asm-offsets.c | 9 +-
arch/frv/kernel/frv_ksyms.c | 1 -
arch/frv/kernel/pm.c | 8 -
arch/frv/kernel/semaphore.c | 155 -
arch/frv/kernel/signal.c | 4 +-
arch/frv/kernel/sys_frv.c | 17 -
arch/frv/kernel/traps.c | 38 +-
arch/frv/mb93090-mb00/pci-frv.h | 2 -
arch/frv/mb93090-mb00/pci-iomap.c | 4 +-
arch/frv/mb93090-mb00/pci-vdk.c | 53 -
arch/frv/mm/Makefile | 2 +-
arch/frv/mm/highmem.c | 3 -
arch/frv/mm/unaligned.c | 217 -
arch/h8300/kernel/Makefile | 2 +-
arch/h8300/kernel/asm-offsets.c | 6 +-
arch/h8300/kernel/h8300_ksyms.c | 1 -
arch/h8300/kernel/semaphore.c | 132 -
arch/h8300/kernel/sys_h8300.c | 17 -
arch/ia64/Kconfig | 32 +-
arch/ia64/Makefile | 1 +
arch/ia64/hp/common/hwsw_iommu.c | 61 +-
arch/ia64/hp/common/sba_iommu.c | 126 +-
arch/ia64/hp/sim/simeth.c | 2 +-
arch/ia64/hp/sim/simscsi.c | 23 +-
arch/ia64/hp/sim/simserial.c | 11 +-
arch/ia64/ia32/elfcore32.h | 14 +-
arch/ia64/ia32/ia32_signal.c | 2 +-
arch/ia64/ia32/sys_ia32.c | 649 +-
arch/ia64/kernel/Makefile | 2 +-
arch/ia64/kernel/acpi.c | 6 +-
arch/ia64/kernel/asm-offsets.c | 20 +-
arch/ia64/kernel/crash.c | 56 +-
arch/ia64/kernel/efi.c | 46 +
arch/ia64/kernel/entry.S | 66 +
arch/ia64/kernel/fsys.S | 88 +-
arch/ia64/kernel/head.S | 20 +
arch/ia64/kernel/ia64_ksyms.c | 6 -
arch/ia64/kernel/irq.c | 4 +-
arch/ia64/kernel/irq_ia64.c | 2 +-
arch/ia64/kernel/ivt.S | 69 +
arch/ia64/kernel/kprobes.c | 133 +-
arch/ia64/kernel/mca.c | 135 +-
arch/ia64/kernel/mca_asm.S | 5 +
arch/ia64/kernel/minstate.h | 14 +
arch/ia64/kernel/numa.c | 2 +-
arch/ia64/kernel/palinfo.c | 2 +-
arch/ia64/kernel/patch.c | 8 +-
arch/ia64/kernel/perfmon.c | 213 +-
arch/ia64/kernel/process.c | 32 +-
arch/ia64/kernel/ptrace.c | 1217 ++-
arch/ia64/kernel/salinfo.c | 12 +-
arch/ia64/kernel/semaphore.c | 165 -
arch/ia64/kernel/setup.c | 31 +-
arch/ia64/kernel/signal.c | 15 +-
arch/ia64/kernel/smp.c | 150 +-
arch/ia64/kernel/smpboot.c | 14 +-
arch/ia64/kernel/time.c | 83 +-
arch/ia64/kernel/topology.c | 25 +-
arch/ia64/kernel/unaligned.c | 3 +-
arch/ia64/kernel/uncached.c | 23 +-
arch/ia64/kvm/Kconfig | 49 +
arch/ia64/kvm/Makefile | 58 +
arch/ia64/kvm/asm-offsets.c | 251 +
arch/ia64/kvm/kvm-ia64.c | 1805 +++
arch/ia64/kvm/kvm_fw.c | 500 +
arch/ia64/kvm/kvm_minstate.h | 273 +
arch/ia64/kvm/lapic.h | 25 +
arch/ia64/kvm/misc.h | 93 +
arch/ia64/kvm/mmio.c | 341 +
arch/ia64/kvm/optvfault.S | 918 ++
arch/ia64/kvm/process.c | 970 ++
arch/ia64/kvm/trampoline.S | 1038 ++
arch/ia64/kvm/vcpu.c | 2163 ++++
arch/ia64/kvm/vcpu.h | 740 ++
arch/ia64/kvm/vmm.c | 66 +
arch/ia64/kvm/vmm_ivt.S | 1424 +++
arch/ia64/kvm/vti.h | 290 +
arch/ia64/kvm/vtlb.c | 636 ++
arch/ia64/mm/contig.c | 4 +-
arch/ia64/mm/discontig.c | 17 +-
arch/ia64/mm/init.c | 23 +-
arch/ia64/mm/numa.c | 4 +-
arch/ia64/mm/tlb.c | 360 +-
arch/ia64/pci/pci.c | 44 +-
arch/ia64/sn/kernel/Makefile | 7 +-
arch/ia64/sn/kernel/huberror.c | 4 +-
arch/ia64/sn/kernel/sn2/sn2_smp.c | 5 +-
arch/ia64/sn/kernel/sn2/sn_hwperf.c | 1 -
arch/ia64/sn/kernel/sn2/sn_proc_fs.c | 29 +-
arch/ia64/sn/kernel/xp_main.c | 290 -
arch/ia64/sn/kernel/xp_nofault.S | 36 -
arch/ia64/sn/kernel/xpc_channel.c | 2379 ----
arch/ia64/sn/kernel/xpc_main.c | 1431 ---
arch/ia64/sn/kernel/xpc_partition.c | 1239 --
arch/ia64/sn/kernel/xpnet.c | 718 --
arch/ia64/sn/pci/pci_dma.c | 81 +-
arch/ia64/sn/pci/tioce_provider.c | 6 +-
arch/m32r/Makefile | 2 +
arch/m32r/defconfig | 863 --
arch/m32r/kernel/Makefile | 2 +-
arch/m32r/kernel/m32r_ksyms.c | 5 -
arch/m32r/kernel/semaphore.c | 185 -
arch/m32r/kernel/vmlinux.lds.S | 3 -
arch/m68k/atari/stram.c | 1 -
arch/m68k/kernel/Makefile | 2 +-
arch/m68k/kernel/asm-offsets.c | 4 +-
arch/m68k/kernel/ints.c | 10 +-
arch/m68k/kernel/m68k_ksyms.c | 6 -
arch/m68k/kernel/semaphore.c | 132 -
arch/m68k/kernel/sys_m68k.c | 17 -
arch/m68k/kernel/traps.c | 17 +-
arch/m68k/lib/Makefile | 2 +-
arch/m68k/lib/semaphore.S | 53 -
arch/m68k/mac/config.c | 24 -
arch/m68k/mac/iop.c | 85 -
arch/m68k/mac/oss.c | 4 +-
arch/m68k/mm/init.c | 2 +-
arch/m68k/q40/q40ints.c | 2 +-
arch/m68k/sun3/intersil.c | 1 -
arch/m68knommu/kernel/Makefile | 2 +-
arch/m68knommu/kernel/asm-offsets.c | 7 +-
arch/m68knommu/kernel/entry.S | 9 +
arch/m68knommu/kernel/m68k_ksyms.c | 6 -
arch/m68knommu/kernel/semaphore.c | 133 -
arch/m68knommu/kernel/setup.c | 2 +-
arch/m68knommu/kernel/signal.c | 21 +-
arch/m68knommu/kernel/sys_m68k.c | 17 -
arch/m68knommu/kernel/traps.c | 88 +-
arch/m68knommu/kernel/vmlinux.lds.S | 3 +
arch/m68knommu/lib/Makefile | 2 +-
arch/m68knommu/lib/semaphore.S | 66 -
arch/m68knommu/platform/5206e/config.c | 2 +-
arch/m68knommu/platform/5272/config.c | 4 -
arch/m68knommu/platform/528x/config.c | 266 +-
arch/m68knommu/platform/5307/config.c | 3 +-
arch/m68knommu/platform/coldfire/entry.S | 18 +
arch/mips/Kconfig | 38 +-
arch/mips/Kconfig.debug | 10 -
arch/mips/Makefile | 12 +-
arch/mips/au1000/common/cputable.c | 5 +-
arch/mips/au1000/common/dbdma.c | 6 -
arch/mips/au1000/common/dbg_io.c | 6 +-
arch/mips/au1000/common/dma.c | 5 +-
arch/mips/au1000/common/gpio.c | 5 -
arch/mips/au1000/common/irq.c | 8 +-
arch/mips/au1000/common/pci.c | 2 +-
arch/mips/au1000/common/platform.c | 117 +-
arch/mips/au1000/common/power.c | 46 +-
arch/mips/au1000/common/prom.c | 2 +-
arch/mips/au1000/common/puts.c | 1 -
arch/mips/au1000/common/reset.c | 8 +-
arch/mips/au1000/common/setup.c | 11 +-
arch/mips/au1000/common/sleeper.S | 2 +-
arch/mips/au1000/common/time.c | 35 +-
arch/mips/au1000/db1x00/board_setup.c | 15 +-
arch/mips/au1000/db1x00/init.c | 5 -
arch/mips/au1000/db1x00/irqmap.c | 19 +-
arch/mips/au1000/mtx-1/board_setup.c | 12 +-
arch/mips/au1000/mtx-1/init.c | 6 +-
arch/mips/au1000/mtx-1/irqmap.c | 19 +-
arch/mips/au1000/mtx-1/platform.c | 1 -
arch/mips/au1000/pb1000/board_setup.c | 11 +-
arch/mips/au1000/pb1000/init.c | 6 +-
arch/mips/au1000/pb1000/irqmap.c | 18 +-
arch/mips/au1000/pb1100/board_setup.c | 11 +-
arch/mips/au1000/pb1100/init.c | 6 +-
arch/mips/au1000/pb1100/irqmap.c | 19 +-
arch/mips/au1000/pb1200/Makefile | 1 +
arch/mips/au1000/pb1200/board_setup.c | 20 +-
arch/mips/au1000/pb1200/init.c | 6 +-
arch/mips/au1000/pb1200/irqmap.c | 20 +-
arch/mips/au1000/pb1200/platform.c | 84 +
arch/mips/au1000/pb1500/board_setup.c | 11 +-
arch/mips/au1000/pb1500/init.c | 6 +-
arch/mips/au1000/pb1500/irqmap.c | 19 +-
arch/mips/au1000/pb1550/board_setup.c | 13 +-
arch/mips/au1000/pb1550/init.c | 6 +-
arch/mips/au1000/pb1550/irqmap.c | 19 +-
arch/mips/au1000/xxs1500/board_setup.c | 11 +-
arch/mips/au1000/xxs1500/init.c | 6 +-
arch/mips/au1000/xxs1500/irqmap.c | 19 +-
arch/mips/basler/excite/excite_procfs.c | 30 +-
arch/mips/configs/mipssim_defconfig | 1 -
arch/mips/configs/pnx8550-jbs_defconfig | 1 -
arch/mips/configs/pnx8550-stb810_defconfig | 1 -
arch/mips/dec/time.c | 71 +-
arch/mips/jmr3927/rbhma3100/setup.c | 11 +-
arch/mips/kernel/Makefile | 10 +-
arch/mips/kernel/asm-offsets.c | 478 +-
arch/mips/kernel/binfmt_elfn32.c | 5 +-
arch/mips/kernel/binfmt_elfo32.c | 5 +-
arch/mips/kernel/cevt-ds1287.c | 129 +
arch/mips/kernel/cevt-gt641xx.c | 2 -
arch/mips/kernel/cpu-probe.c | 21 +-
arch/mips/kernel/csrc-ioasic.c | 65 +
arch/mips/kernel/gpio_txx9.c | 87 +
arch/mips/kernel/irixioctl.c | 55 +-
arch/mips/kernel/irq-gic.c | 295 +
arch/mips/kernel/irq-msc01.c | 10 +-
arch/mips/kernel/kspd.c | 1 +
arch/mips/kernel/semaphore.c | 168 -
arch/mips/kernel/signal-common.h | 2 +-
arch/mips/kernel/smp-cmp.c | 265 +
arch/mips/kernel/smp-mt.c | 143 +-
arch/mips/kernel/smp.c | 4 +
arch/mips/kernel/smtc.c | 11 +-
arch/mips/kernel/spram.c | 221 +
arch/mips/kernel/sync-r4k.c | 159 +
arch/mips/kernel/time.c | 5 +-
arch/mips/kernel/traps.c | 213 +-
arch/mips/lib/iomap-pci.c | 4 +-
arch/mips/math-emu/ieee754dp.h | 2 +-
arch/mips/math-emu/ieee754sp.h | 2 +-
arch/mips/mips-boards/generic/Makefile | 1 +
arch/mips/mips-boards/generic/amon.c | 80 +
arch/mips/mips-boards/generic/init.c | 23 +-
arch/mips/mips-boards/generic/memory.c | 4 +-
arch/mips/mips-boards/generic/time.c | 31 +-
arch/mips/mips-boards/malta/Makefile | 1 +
arch/mips/mips-boards/malta/malta_int.c | 354 +-
arch/mips/mips-boards/malta/malta_setup.c | 10 +-
arch/mips/mipssim/sim_setup.c | 6 -
arch/mips/mm/Makefile | 37 +-
arch/mips/mm/c-r4k.c | 62 +-
arch/mips/mm/cache.c | 31 +-
arch/mips/mm/init.c | 11 +-
arch/mips/mm/page.c | 684 ++
arch/mips/mm/pg-r4k.c | 534 -
arch/mips/mm/pg-sb1.c | 302 -
arch/mips/mm/pgtable.c | 1 -
arch/mips/mm/tlb-r4k.c | 2 +-
arch/mips/mm/uasm.c | 26 +-
arch/mips/mm/uasm.h | 4 +
arch/mips/nxp/pnx8550/common/Makefile | 29 +
arch/mips/nxp/pnx8550/common/gdb_hook.c | 109 +
arch/mips/nxp/pnx8550/common/int.c | 238 +
arch/mips/nxp/pnx8550/common/pci.c | 133 +
arch/mips/nxp/pnx8550/common/platform.c | 132 +
arch/mips/nxp/pnx8550/common/proc.c | 112 +
arch/mips/nxp/pnx8550/common/prom.c | 129 +
arch/mips/nxp/pnx8550/common/reset.c | 49 +
arch/mips/nxp/pnx8550/common/setup.c | 157 +
arch/mips/nxp/pnx8550/common/time.c | 150 +
arch/mips/nxp/pnx8550/jbs/Makefile | 4 +
arch/mips/nxp/pnx8550/jbs/board_setup.c | 65 +
arch/mips/nxp/pnx8550/jbs/init.c | 53 +
arch/mips/nxp/pnx8550/jbs/irqmap.c | 35 +
arch/mips/nxp/pnx8550/stb810/Makefile | 4 +
arch/mips/nxp/pnx8550/stb810/board_setup.c | 49 +
arch/mips/nxp/pnx8550/stb810/irqmap.c | 22 +
arch/mips/nxp/pnx8550/stb810/prom_init.c | 46 +
arch/mips/oprofile/common.c | 1 +
arch/mips/oprofile/op_impl.h | 1 -
arch/mips/oprofile/op_model_mipsxx.c | 39 +-
arch/mips/pci/fixup-au1000.c | 5 +-
arch/mips/pci/ops-pnx8550.c | 4 +-
arch/mips/philips/pnx8550/common/Makefile | 29 -
arch/mips/philips/pnx8550/common/gdb_hook.c | 109 -
arch/mips/philips/pnx8550/common/int.c | 238 -
arch/mips/philips/pnx8550/common/pci.c | 133 -
arch/mips/philips/pnx8550/common/platform.c | 132 -
arch/mips/philips/pnx8550/common/proc.c | 112 -
arch/mips/philips/pnx8550/common/prom.c | 129 -
arch/mips/philips/pnx8550/common/reset.c | 49 -
arch/mips/philips/pnx8550/common/setup.c | 157 -
arch/mips/philips/pnx8550/common/time.c | 150 -
arch/mips/philips/pnx8550/jbs/Makefile | 4 -
arch/mips/philips/pnx8550/jbs/board_setup.c | 65 -
arch/mips/philips/pnx8550/jbs/init.c | 53 -
arch/mips/philips/pnx8550/jbs/irqmap.c | 36 -
arch/mips/philips/pnx8550/stb810/Makefile | 4 -
arch/mips/philips/pnx8550/stb810/board_setup.c | 49 -
arch/mips/philips/pnx8550/stb810/irqmap.c | 23 -
arch/mips/philips/pnx8550/stb810/prom_init.c | 46 -
arch/mips/pmc-sierra/yosemite/setup.c | 3 -
arch/mips/sgi-ip27/ip27-console.c | 1 -
arch/mips/sgi-ip32/ip32-reset.c | 2 +-
.../tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 2 +-
.../toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 2 +-
arch/mips/tx4938/common/dbgio.c | 4 +-
arch/mips/tx4938/common/prom.c | 11 +-
arch/mips/tx4938/toshiba_rbtx4938/irq.c | 46 +-
arch/mips/tx4938/toshiba_rbtx4938/setup.c | 199 +-
arch/mips/vr41xx/common/init.c | 4 +-
arch/mips/vr41xx/common/siu.c | 36 +-
arch/mn10300/kernel/Makefile | 2 +-
arch/mn10300/kernel/asm-offsets.c | 9 +-
arch/mn10300/kernel/semaphore.c | 149 -
arch/mn10300/kernel/sys_mn10300.c | 17 -
arch/mn10300/unit-asb2305/pci-asb2305.h | 2 -
arch/mn10300/unit-asb2305/pci-iomap.c | 4 +-
arch/parisc/kernel/Makefile | 2 +-
arch/parisc/kernel/asm-offsets.c | 6 +-
arch/parisc/kernel/parisc_ksyms.c | 5 -
arch/parisc/kernel/pci-dma.c | 7 +-
arch/parisc/kernel/pci.c | 30 +-
arch/parisc/kernel/semaphore.c | 102 -
arch/parisc/kernel/sys_parisc.c | 13 -
arch/parisc/kernel/sys_parisc32.c | 1 -
arch/parisc/lib/iomap.c | 4 +-
arch/parisc/mm/init.c | 11 +-
arch/powerpc/Kconfig | 179 +-
arch/powerpc/Kconfig.debug | 6 +-
arch/powerpc/Makefile | 13 +-
arch/powerpc/boot/.gitignore | 1 +
arch/powerpc/boot/Makefile | 40 +-
arch/powerpc/boot/bamboo.c | 3 +-
arch/powerpc/boot/cpm-serial.c | 117 +-
arch/powerpc/boot/cuboot-pq2.c | 27 +-
arch/powerpc/boot/cuboot-rainier.c | 3 +-
arch/powerpc/boot/cuboot-sequoia.c | 3 +-
arch/powerpc/boot/cuboot-taishan.c | 3 +-
arch/powerpc/boot/cuboot-warp.c | 2 +-
arch/powerpc/boot/cuboot-yosemite.c | 44 +
arch/powerpc/boot/devtree.c | 20 +
arch/powerpc/boot/dts/bamboo.dts | 2 -
arch/powerpc/boot/dts/canyonlands.dts | 439 +
arch/powerpc/boot/dts/cm5200.dts | 98 +-
arch/powerpc/boot/dts/ebony.dts | 2 -
arch/powerpc/boot/dts/ep8248e.dts | 5 +-
arch/powerpc/boot/dts/ep88xc.dts | 73 +-
arch/powerpc/boot/dts/glacier.dts | 504 +
arch/powerpc/boot/dts/haleakala.dts | 4 +-
arch/powerpc/boot/dts/katmai.dts | 2 +-
arch/powerpc/boot/dts/kilauea.dts | 4 +-
arch/powerpc/boot/dts/ksi8560.dts | 267 +
arch/powerpc/boot/dts/kuroboxHD.dts | 83 +-
arch/powerpc/boot/dts/kuroboxHG.dts | 83 +-
arch/powerpc/boot/dts/lite5200.dts | 132 +-
arch/powerpc/boot/dts/lite5200b.dts | 146 +-
arch/powerpc/boot/dts/makalu.dts | 4 +-
arch/powerpc/boot/dts/motionpro.dts | 118 +-
arch/powerpc/boot/dts/mpc7448hpc2.dts | 97 +-
arch/powerpc/boot/dts/mpc8272ads.dts | 132 +-
arch/powerpc/boot/dts/mpc832x_mds.dts | 7 +-
arch/powerpc/boot/dts/mpc832x_rdb.dts | 4 -
arch/powerpc/boot/dts/mpc836x_mds.dts | 4 -
arch/powerpc/boot/dts/mpc8540ads.dts | 173 +-
arch/powerpc/boot/dts/mpc8541cds.dts | 161 +-
arch/powerpc/boot/dts/mpc8544ds.dts | 299 +-
arch/powerpc/boot/dts/mpc8548cds.dts | 289 +-
arch/powerpc/boot/dts/mpc8555cds.dts | 161 +-
arch/powerpc/boot/dts/mpc8560ads.dts | 209 +-
arch/powerpc/boot/dts/mpc8568mds.dts | 291 +-
arch/powerpc/boot/dts/mpc8572ds.dts | 383 +-
arch/powerpc/boot/dts/mpc8610_hpcd.dts | 35 +-
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 14 +-
arch/powerpc/boot/dts/mpc866ads.dts | 58 +-
arch/powerpc/boot/dts/mpc885ads.dts | 77 +-
arch/powerpc/boot/dts/pcm030.dts | 363 +
arch/powerpc/boot/dts/pq2fads.dts | 126 +-
arch/powerpc/boot/dts/prpmc2800.dts | 336 +-
arch/powerpc/boot/dts/rainier.dts | 6 +-
arch/powerpc/boot/dts/sbc8641d.dts | 352 +
arch/powerpc/boot/dts/sequoia.dts | 6 +-
arch/powerpc/boot/dts/taishan.dts | 31 +-
arch/powerpc/boot/dts/tqm5200.dts | 80 +-
arch/powerpc/boot/dts/walnut.dts | 1 -
arch/powerpc/boot/dts/warp.dts | 1 -
arch/powerpc/boot/dts/yosemite.dts | 304 +
arch/powerpc/boot/ebony.c | 3 +-
arch/powerpc/boot/libfdt-wrapper.c | 2 +-
arch/powerpc/boot/mpc52xx-psc.c | 9 +-
arch/powerpc/boot/mpsc.c | 2 +-
arch/powerpc/boot/mv64x60.c | 4 +-
arch/powerpc/boot/mv64x60_i2c.c | 2 +-
arch/powerpc/boot/ns16550.c | 13 +-
arch/powerpc/boot/ops.h | 1 +
arch/powerpc/boot/prpmc2800.c | 23 +-
arch/powerpc/boot/ps3-head.S | 25 +-
arch/powerpc/boot/ps3.c | 23 +-
arch/powerpc/boot/serial.c | 2 +-
arch/powerpc/boot/simpleboot.c | 84 +
arch/powerpc/boot/treeboot-walnut.c | 2 +-
arch/powerpc/boot/virtex405-head.S | 30 +
arch/powerpc/boot/wrapper | 32 +-
arch/powerpc/configs/40x/ep405_defconfig | 968 ++
arch/powerpc/configs/40x/kilauea_defconfig | 839 ++
arch/powerpc/configs/40x/makalu_defconfig | 839 ++
arch/powerpc/configs/40x/walnut_defconfig | 887 ++
arch/powerpc/configs/44x/bamboo_defconfig | 815 ++
arch/powerpc/configs/44x/canyonlands_defconfig | 721 ++
arch/powerpc/configs/44x/ebony_defconfig | 898 ++
arch/powerpc/configs/44x/katmai_defconfig | 790 ++
arch/powerpc/configs/44x/rainier_defconfig | 899 ++
arch/powerpc/configs/44x/sequoia_defconfig | 916 ++
arch/powerpc/configs/44x/taishan_defconfig | 815 ++
arch/powerpc/configs/44x/warp_defconfig | 1110 ++
arch/powerpc/configs/52xx/cm5200_defconfig | 1099 ++
arch/powerpc/configs/52xx/lite5200b_defconfig | 1049 ++
arch/powerpc/configs/52xx/motionpro_defconfig | 1107 ++
arch/powerpc/configs/52xx/pcm030_defconfig | 1115 ++
arch/powerpc/configs/52xx/tqm5200_defconfig | 1214 ++
arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1395 +++
arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1451 +++
arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 1081 ++
arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 1233 ++
arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 1295 +++
arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 1222 ++
arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 1021 ++
arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 1079 ++
arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 899 ++
arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 930 ++
arch/powerpc/configs/83xx/sbc834x_defconfig | 828 ++
arch/powerpc/configs/85xx/ksi8560_defconfig | 899 ++
arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 796 ++
arch/powerpc/configs/85xx/mpc8544_ds_defconfig | 1564 +++
arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 885 ++
arch/powerpc/configs/85xx/mpc8568mds_defconfig | 1117 ++
arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 1549 +++
arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 935 ++
arch/powerpc/configs/85xx/sbc8548_defconfig | 812 ++
arch/powerpc/configs/85xx/sbc8560_defconfig | 830 ++
arch/powerpc/configs/85xx/stx_gp3_defconfig | 1253 ++
arch/powerpc/configs/85xx/tqm8540_defconfig | 1097 ++
arch/powerpc/configs/85xx/tqm8541_defconfig | 1109 ++
arch/powerpc/configs/85xx/tqm8555_defconfig | 1109 ++
arch/powerpc/configs/85xx/tqm8560_defconfig | 1109 ++
arch/powerpc/configs/bamboo_defconfig | 815 --
arch/powerpc/configs/chrp32_defconfig | 7 +-
arch/powerpc/configs/ebony_defconfig | 898 --
arch/powerpc/configs/ep405_defconfig | 968 --
arch/powerpc/configs/g5_defconfig | 8 +-
arch/powerpc/configs/iseries_defconfig | 7 +-
arch/powerpc/configs/katmai_defconfig | 790 --
arch/powerpc/configs/kilauea_defconfig | 839 --
arch/powerpc/configs/makalu_defconfig | 839 --
arch/powerpc/configs/maple_defconfig | 131 +-
arch/powerpc/configs/mpc8313_rdb_defconfig | 1393 ---
arch/powerpc/configs/mpc8315_rdb_defconfig | 1451 ---
arch/powerpc/configs/mpc832x_mds_defconfig | 1081 --
arch/powerpc/configs/mpc832x_rdb_defconfig | 1233 --
arch/powerpc/configs/mpc834x_itx_defconfig | 1295 ---
arch/powerpc/configs/mpc834x_itxgp_defconfig | 1222 --
arch/powerpc/configs/mpc834x_mds_defconfig | 1021 --
arch/powerpc/configs/mpc836x_mds_defconfig | 1079 --
arch/powerpc/configs/mpc837x_mds_defconfig | 899 --
arch/powerpc/configs/mpc837x_rdb_defconfig | 930 --
arch/powerpc/configs/mpc83xx_defconfig | 164 +-
arch/powerpc/configs/mpc8540_ads_defconfig | 796 --
arch/powerpc/configs/mpc8544_ds_defconfig | 1549 ---
arch/powerpc/configs/mpc8560_ads_defconfig | 885 --
arch/powerpc/configs/mpc8568mds_defconfig | 1117 --
arch/powerpc/configs/mpc8572_ds_defconfig | 1549 ---
arch/powerpc/configs/mpc85xx_cds_defconfig | 935 --
arch/powerpc/configs/pmac32_defconfig | 7 +-
arch/powerpc/configs/ppc40x_defconfig | 896 ++
arch/powerpc/configs/ppc44x_defconfig | 14 +-
arch/powerpc/configs/ppc64_defconfig | 8 +-
arch/powerpc/configs/ps3_defconfig | 132 +-
arch/powerpc/configs/pseries_defconfig | 8 +-
arch/powerpc/configs/rainier_defconfig | 899 --
arch/powerpc/configs/sbc834x_defconfig | 828 --
arch/powerpc/configs/sbc8548_defconfig | 812 --
arch/powerpc/configs/sbc8560_defconfig | 830 --
arch/powerpc/configs/sbc8641d_defconfig | 1342 +++
arch/powerpc/configs/sequoia_defconfig | 916 --
arch/powerpc/configs/stx_gp3_defconfig | 1253 --
arch/powerpc/configs/taishan_defconfig | 815 --
arch/powerpc/configs/tqm8540_defconfig | 1097 --
arch/powerpc/configs/tqm8541_defconfig | 1109 --
arch/powerpc/configs/tqm8555_defconfig | 1109 --
arch/powerpc/configs/tqm8560_defconfig | 1109 --
arch/powerpc/configs/walnut_defconfig | 887 --
arch/powerpc/configs/warp_defconfig | 1110 --
arch/powerpc/kernel/Makefile | 13 +-
arch/powerpc/kernel/asm-offsets.c | 56 +-
arch/powerpc/kernel/btext.c | 3 +-
arch/powerpc/kernel/cpu_setup_44x.S | 4 +-
arch/powerpc/kernel/cpu_setup_6xx.S | 8 +-
arch/powerpc/kernel/cputable.c | 26 +-
arch/powerpc/kernel/crash.c | 3 +-
arch/powerpc/kernel/crash_dump.c | 3 +-
arch/powerpc/kernel/entry_32.S | 35 +-
arch/powerpc/kernel/entry_64.S | 30 +-
arch/powerpc/kernel/head_32.S | 22 +-
arch/powerpc/kernel/head_44x.S | 4 +-
arch/powerpc/kernel/head_64.S | 80 +-
arch/powerpc/kernel/head_booke.h | 33 +-
arch/powerpc/kernel/head_fsl_booke.S | 55 +-
arch/powerpc/kernel/ibmebus.c | 12 +-
arch/powerpc/kernel/iommu.c | 4 +-
arch/powerpc/kernel/irq.c | 28 +-
arch/powerpc/kernel/isa-bridge.c | 6 +-
arch/powerpc/kernel/lparcfg.c | 18 +-
arch/powerpc/kernel/machine_kexec.c | 15 +-
arch/powerpc/kernel/misc_32.S | 31 +-
arch/powerpc/kernel/misc_64.S | 20 +-
arch/powerpc/kernel/of_platform.c | 2 +
arch/powerpc/kernel/paca.c | 105 +-
arch/powerpc/kernel/pci-common.c | 34 +-
arch/powerpc/kernel/ppc_ksyms.c | 11 +-
arch/powerpc/kernel/proc_ppc64.c | 5 +-
arch/powerpc/kernel/process.c | 66 +-
arch/powerpc/kernel/prom.c | 124 +-
arch/powerpc/kernel/prom_init.c | 8 +
arch/powerpc/kernel/prom_init_check.sh | 58 +
arch/powerpc/kernel/rio.c | 52 -
arch/powerpc/kernel/rtas-proc.c | 45 +-
arch/powerpc/kernel/rtas.c | 5 +-
arch/powerpc/kernel/rtas_flash.c | 15 +-
arch/powerpc/kernel/rtas_pci.c | 29 +-
arch/powerpc/kernel/semaphore.c | 135 -
arch/powerpc/kernel/setup-common.c | 11 +-
arch/powerpc/kernel/setup_32.c | 43 +-
arch/powerpc/kernel/setup_64.c | 22 +-
arch/powerpc/kernel/signal_32.c | 19 +-
arch/powerpc/kernel/smp.c | 2 +
arch/powerpc/kernel/stacktrace.c | 46 +
arch/powerpc/kernel/sys_ppc32.c | 6 -
arch/powerpc/kernel/syscalls.c | 18 -
arch/powerpc/kernel/time.c | 4 +-
arch/powerpc/kernel/udbg.c | 4 +-
arch/powerpc/kernel/vdso.c | 3 +-
arch/powerpc/kernel/vio.c | 10 +-
arch/powerpc/kernel/vmlinux.lds.S | 51 +-
arch/powerpc/kvm/44x_tlb.c | 224 +
arch/powerpc/kvm/44x_tlb.h | 91 +
arch/powerpc/kvm/Kconfig | 42 +
arch/powerpc/kvm/Makefile | 15 +
arch/powerpc/kvm/booke_guest.c | 621 +
arch/powerpc/kvm/booke_host.c | 83 +
arch/powerpc/kvm/booke_interrupts.S | 436 +
arch/powerpc/kvm/emulate.c | 760 ++
arch/powerpc/kvm/powerpc.c | 450 +
arch/powerpc/lib/Makefile | 1 +
arch/powerpc/lib/devres.c | 42 +
arch/powerpc/lib/rheap.c | 4 +-
arch/powerpc/lib/string.S | 14 +
arch/powerpc/math-emu/fabs.c | 2 +-
arch/powerpc/math-emu/fadd.c | 2 +-
arch/powerpc/math-emu/fadds.c | 2 +-
arch/powerpc/math-emu/fcmpo.c | 2 +-
arch/powerpc/math-emu/fcmpu.c | 2 +-
arch/powerpc/math-emu/fctiw.c | 2 +-
arch/powerpc/math-emu/fctiwz.c | 2 +-
arch/powerpc/math-emu/fdiv.c | 6 +-
arch/powerpc/math-emu/fdivs.c | 6 +-
arch/powerpc/math-emu/fmadd.c | 2 +-
arch/powerpc/math-emu/fmadds.c | 2 +-
arch/powerpc/math-emu/fmr.c | 2 +-
arch/powerpc/math-emu/fmsub.c | 2 +-
arch/powerpc/math-emu/fmsubs.c | 2 +-
arch/powerpc/math-emu/fmul.c | 2 +-
arch/powerpc/math-emu/fmuls.c | 2 +-
arch/powerpc/math-emu/fnabs.c | 2 +-
arch/powerpc/math-emu/fneg.c | 2 +-
arch/powerpc/math-emu/fnmadd.c | 2 +-
arch/powerpc/math-emu/fnmadds.c | 2 +-
arch/powerpc/math-emu/fnmsub.c | 2 +-
arch/powerpc/math-emu/fnmsubs.c | 2 +-
arch/powerpc/math-emu/fres.c | 2 +-
arch/powerpc/math-emu/frsp.c | 2 +-
arch/powerpc/math-emu/frsqrte.c | 2 +-
arch/powerpc/math-emu/fsel.c | 2 +-
arch/powerpc/math-emu/fsqrt.c | 2 +-
arch/powerpc/math-emu/fsqrts.c | 2 +-
arch/powerpc/math-emu/fsub.c | 2 +-
arch/powerpc/math-emu/fsubs.c | 2 +-
arch/powerpc/math-emu/lfd.c | 2 +-
arch/powerpc/math-emu/lfs.c | 2 +-
arch/powerpc/math-emu/mcrfs.c | 4 +-
arch/powerpc/math-emu/mffs.c | 2 +-
arch/powerpc/math-emu/mtfsb0.c | 2 +-
arch/powerpc/math-emu/mtfsb1.c | 2 +-
arch/powerpc/math-emu/mtfsf.c | 2 +-
arch/powerpc/math-emu/mtfsfi.c | 2 +-
arch/powerpc/math-emu/stfd.c | 2 +-
arch/powerpc/math-emu/stfiwx.c | 2 +-
arch/powerpc/math-emu/stfs.c | 2 +-
arch/powerpc/mm/40x_mmu.c | 2 +-
arch/powerpc/mm/44x_mmu.c | 2 +-
arch/powerpc/mm/Makefile | 2 +-
arch/powerpc/mm/fsl_booke_mmu.c | 48 +-
arch/powerpc/mm/hash_low_32.S | 4 +-
arch/powerpc/mm/hash_utils_64.c | 32 +-
arch/powerpc/mm/init_32.c | 38 +-
arch/powerpc/mm/init_64.c | 8 +-
arch/powerpc/mm/lmb.c | 357 -
arch/powerpc/mm/mem.c | 95 +-
arch/powerpc/mm/mmu_decl.h | 4 +-
arch/powerpc/mm/numa.c | 4 +-
arch/powerpc/mm/pgtable_32.c | 28 +-
arch/powerpc/mm/ppc_mmu_32.c | 15 +-
arch/powerpc/mm/slb.c | 27 +-
arch/powerpc/mm/stab.c | 4 +-
arch/powerpc/oprofile/cell/spu_task_sync.c | 12 +-
arch/powerpc/oprofile/cell/vma_map.c | 10 +-
arch/powerpc/oprofile/op_model_cell.c | 14 +-
arch/powerpc/platforms/40x/ep405.c | 2 +
arch/powerpc/platforms/40x/kilauea.c | 4 +-
arch/powerpc/platforms/40x/makalu.c | 2 +
arch/powerpc/platforms/40x/virtex.c | 2 +
arch/powerpc/platforms/40x/walnut.c | 4 +-
arch/powerpc/platforms/44x/44x.h | 1 -
arch/powerpc/platforms/44x/Kconfig | 27 +
arch/powerpc/platforms/44x/Makefile | 4 +-
arch/powerpc/platforms/44x/bamboo.c | 15 +-
arch/powerpc/platforms/44x/canyonlands.c | 63 +
arch/powerpc/platforms/44x/ebony.c | 5 +-
arch/powerpc/platforms/44x/idle.c | 67 +
arch/powerpc/platforms/44x/katmai.c | 5 +-
arch/powerpc/platforms/44x/misc_44x.S | 11 -
arch/powerpc/platforms/44x/rainier.c | 4 +-
arch/powerpc/platforms/44x/sequoia.c | 4 +-
arch/powerpc/platforms/44x/taishan.c | 5 +-
arch/powerpc/platforms/44x/warp-nand.c | 3 +-
arch/powerpc/platforms/44x/warp.c | 6 +-
arch/powerpc/platforms/52xx/Kconfig | 6 +
arch/powerpc/platforms/52xx/Makefile | 2 +
arch/powerpc/platforms/52xx/lite5200.c | 4 +-
arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 465 +
arch/powerpc/platforms/52xx/mpc52xx_pic.c | 38 +
arch/powerpc/platforms/82xx/Kconfig | 3 -
arch/powerpc/platforms/82xx/ep8248e.c | 2 +-
arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 +
arch/powerpc/platforms/83xx/mpc83xx.h | 2 +
arch/powerpc/platforms/83xx/usb.c | 12 +-
arch/powerpc/platforms/85xx/Kconfig | 13 +-
arch/powerpc/platforms/85xx/Makefile | 1 +
arch/powerpc/platforms/85xx/ksi8560.c | 257 +
arch/powerpc/platforms/85xx/mpc85xx_ads.c | 2 +-
arch/powerpc/platforms/85xx/mpc85xx_ds.c | 15 +-
arch/powerpc/platforms/86xx/Kconfig | 9 +-
arch/powerpc/platforms/86xx/Makefile | 1 +
arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 190 +-
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 15 +-
arch/powerpc/platforms/86xx/sbc8641d.c | 164 +
arch/powerpc/platforms/8xx/Kconfig | 4 -
arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +-
arch/powerpc/platforms/Kconfig | 9 +-
arch/powerpc/platforms/Kconfig.cputype | 6 +-
arch/powerpc/platforms/Makefile | 1 -
arch/powerpc/platforms/cell/Kconfig | 13 +
arch/powerpc/platforms/cell/Makefile | 20 +-
arch/powerpc/platforms/cell/axon_msi.c | 6 +-
arch/powerpc/platforms/cell/beat.c | 264 +
arch/powerpc/platforms/cell/beat.h | 39 +
arch/powerpc/platforms/cell/beat_htab.c | 441 +
arch/powerpc/platforms/cell/beat_hvCall.S | 287 +
arch/powerpc/platforms/cell/beat_interrupt.c | 283 +
arch/powerpc/platforms/cell/beat_interrupt.h | 33 +
arch/powerpc/platforms/cell/beat_iommu.c | 116 +
arch/powerpc/platforms/cell/beat_smp.c | 124 +
arch/powerpc/platforms/cell/beat_spu_priv1.c | 207 +
arch/powerpc/platforms/cell/beat_syscall.h | 164 +
arch/powerpc/platforms/cell/beat_udbg.c | 98 +
arch/powerpc/platforms/cell/beat_wrapper.h | 289 +
arch/powerpc/platforms/cell/celleb_pci.c | 514 +
arch/powerpc/platforms/cell/celleb_pci.h | 45 +
arch/powerpc/platforms/cell/celleb_scc.h | 232 +
arch/powerpc/platforms/cell/celleb_scc_epci.c | 438 +
arch/powerpc/platforms/cell/celleb_scc_pciex.c | 547 +
arch/powerpc/platforms/cell/celleb_scc_sio.c | 101 +
arch/powerpc/platforms/cell/celleb_scc_uhc.c | 95 +
arch/powerpc/platforms/cell/celleb_setup.c | 256 +
arch/powerpc/platforms/cell/io-workarounds.c | 358 +-
arch/powerpc/platforms/cell/io-workarounds.h | 49 +
arch/powerpc/platforms/cell/iommu.c | 10 +-
arch/powerpc/platforms/cell/pervasive.c | 2 +-
arch/powerpc/platforms/cell/ras.c | 10 +-
arch/powerpc/platforms/cell/setup.c | 43 +-
arch/powerpc/platforms/cell/spider-pci.c | 184 +
arch/powerpc/platforms/cell/spu_base.c | 8 +-
arch/powerpc/platforms/cell/spu_callbacks.c | 2 +-
arch/powerpc/platforms/cell/spu_manage.c | 8 +-
arch/powerpc/platforms/cell/spufs/.gitignore | 2 +
arch/powerpc/platforms/cell/spufs/context.c | 4 +
arch/powerpc/platforms/cell/spufs/coredump.c | 9 +-
arch/powerpc/platforms/cell/spufs/file.c | 175 +-
arch/powerpc/platforms/cell/spufs/inode.c | 1 -
arch/powerpc/platforms/cell/spufs/run.c | 16 +-
arch/powerpc/platforms/cell/spufs/sched.c | 7 +-
arch/powerpc/platforms/cell/spufs/spufs.h | 33 +-
arch/powerpc/platforms/cell/spufs/sputrace.c | 39 +-
arch/powerpc/platforms/cell/spufs/switch.c | 2 +-
arch/powerpc/platforms/celleb/Kconfig | 12 -
arch/powerpc/platforms/celleb/Makefile | 9 -
arch/powerpc/platforms/celleb/beat.c | 267 -
arch/powerpc/platforms/celleb/beat.h | 39 -
arch/powerpc/platforms/celleb/beat_syscall.h | 164 -
arch/powerpc/platforms/celleb/beat_wrapper.h | 288 -
arch/powerpc/platforms/celleb/htab.c | 440 -
arch/powerpc/platforms/celleb/hvCall.S | 287 -
arch/powerpc/platforms/celleb/interrupt.c | 281 -
arch/powerpc/platforms/celleb/interrupt.h | 33 -
arch/powerpc/platforms/celleb/io-workarounds.c | 280 -
arch/powerpc/platforms/celleb/iommu.c | 116 -
arch/powerpc/platforms/celleb/pci.c | 502 -
arch/powerpc/platforms/celleb/pci.h | 42 -
arch/powerpc/platforms/celleb/scc.h | 145 -
arch/powerpc/platforms/celleb/scc_epci.c | 485 -
arch/powerpc/platforms/celleb/scc_sio.c | 101 -
arch/powerpc/platforms/celleb/scc_uhc.c | 95 -
arch/powerpc/platforms/celleb/setup.c | 258 -
arch/powerpc/platforms/celleb/smp.c | 124 -
arch/powerpc/platforms/celleb/spu_priv1.c | 208 -
arch/powerpc/platforms/celleb/udbg_beat.c | 97 -
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 10 +-
arch/powerpc/platforms/embedded6xx/prpmc2800.c | 4 +-
arch/powerpc/platforms/iseries/exception.S | 39 +-
arch/powerpc/platforms/iseries/ipl_parms.h | 2 -
arch/powerpc/platforms/iseries/lpardata.c | 121 +-
arch/powerpc/platforms/iseries/lpevents.c | 8 +-
arch/powerpc/platforms/iseries/mf.c | 6 +-
arch/powerpc/platforms/iseries/naca.h | 2 +-
arch/powerpc/platforms/iseries/pci.c | 3 +-
arch/powerpc/platforms/iseries/proc.c | 8 +-
arch/powerpc/platforms/iseries/release_data.h | 2 +-
arch/powerpc/platforms/iseries/spcomm_area.h | 2 -
arch/powerpc/platforms/iseries/viopath.c | 7 +-
arch/powerpc/platforms/iseries/vpd_areas.h | 4 +-
arch/powerpc/platforms/maple/pci.c | 47 -
arch/powerpc/platforms/maple/setup.c | 4 +-
arch/powerpc/platforms/pasemi/dma_lib.c | 144 +
arch/powerpc/platforms/pasemi/gpio_mdio.c | 2 +-
arch/powerpc/platforms/pasemi/iommu.c | 19 +-
arch/powerpc/platforms/powermac/Makefile | 5 +-
arch/powerpc/platforms/powermac/pci.c | 22 -
arch/powerpc/platforms/powermac/pfunc_core.c | 1 -
arch/powerpc/platforms/powermac/pmac.h | 5 -
arch/powerpc/platforms/powermac/setup.c | 13 +-
arch/powerpc/platforms/ps3/device-init.c | 78 +-
arch/powerpc/platforms/ps3/htab.c | 3 +-
arch/powerpc/platforms/ps3/interrupt.c | 8 +-
arch/powerpc/platforms/ps3/mm.c | 3 +-
arch/powerpc/platforms/ps3/os-area.c | 4 +-
arch/powerpc/platforms/ps3/setup.c | 14 +-
arch/powerpc/platforms/ps3/spu.c | 7 +
arch/powerpc/platforms/pseries/Kconfig | 5 +
arch/powerpc/platforms/pseries/Makefile | 6 +
arch/powerpc/platforms/pseries/eeh.c | 16 +-
arch/powerpc/platforms/pseries/eeh_cache.c | 1 -
arch/powerpc/platforms/pseries/firmware.c | 10 +-
arch/powerpc/platforms/pseries/hotplug-memory.c | 141 +
arch/powerpc/platforms/pseries/iommu.c | 39 +-
arch/powerpc/platforms/pseries/lpar.c | 61 +-
arch/powerpc/platforms/pseries/pci_dlpar.c | 9 +-
arch/powerpc/platforms/pseries/phyp_dump.c | 507 +
arch/powerpc/platforms/pseries/pseries.h | 2 +
arch/powerpc/platforms/pseries/ras.c | 4 +-
arch/powerpc/platforms/pseries/reconfig.c | 19 +-
arch/powerpc/platforms/pseries/rtasd.c | 21 +-
arch/powerpc/platforms/pseries/scanlog.c | 73 +-
arch/powerpc/platforms/pseries/setup.c | 122 +-
arch/powerpc/platforms/pseries/smp.c | 11 +-
arch/powerpc/platforms/pseries/xics.c | 88 +-
arch/powerpc/platforms/pseries/xics.h | 3 -
arch/powerpc/sysdev/Makefile | 2 +
arch/powerpc/sysdev/axonram.c | 5 +-
arch/powerpc/sysdev/cpm1.c | 114 +-
arch/powerpc/sysdev/cpm2.c | 105 +-
arch/powerpc/sysdev/cpm_common.c | 3 -
arch/powerpc/sysdev/dart_iommu.c | 2 +-
arch/powerpc/sysdev/fsl_lbc.c | 129 +
arch/powerpc/sysdev/fsl_rio.c | 716 +-
arch/powerpc/sysdev/fsl_rio.h | 20 -
arch/powerpc/sysdev/fsl_soc.c | 684 +-
arch/powerpc/sysdev/fsl_soc.h | 24 +
arch/powerpc/sysdev/mpic.c | 41 +-
arch/powerpc/sysdev/mv64x60_dev.c | 118 +-
arch/powerpc/sysdev/mv64x60_pci.c | 6 +-
arch/powerpc/sysdev/mv64x60_pic.c | 4 +-
arch/powerpc/sysdev/mv64x60_udbg.c | 4 +-
arch/powerpc/sysdev/ppc4xx_pci.c | 133 +-
arch/powerpc/sysdev/ppc4xx_pci.h | 59 +
arch/powerpc/sysdev/ppc4xx_soc.c | 200 +
arch/powerpc/sysdev/qe_lib/qe.c | 13 +-
arch/powerpc/sysdev/qe_lib/qe_io.c | 7 +-
arch/powerpc/sysdev/qe_lib/ucc_fast.c | 32 +-
arch/powerpc/sysdev/qe_lib/ucc_slow.c | 18 +-
arch/powerpc/sysdev/rtc_cmos_setup.c | 2 +
arch/powerpc/sysdev/tsi108_dev.c | 4 +-
arch/powerpc/sysdev/tsi108_pci.c | 4 +-
arch/powerpc/sysdev/xilinx_intc.c | 2 +-
arch/powerpc/xmon/xmon.c | 24 +-
arch/ppc/8260_io/fcc_enet.c | 19 +-
arch/ppc/8xx_io/commproc.c | 2 +-
arch/ppc/8xx_io/enet.c | 23 -
arch/ppc/8xx_io/fec.c | 7 +-
arch/ppc/Kconfig | 82 +-
arch/ppc/configs/ads8272_defconfig | 930 --
arch/ppc/configs/mpc86x_ads_defconfig | 633 --
arch/ppc/configs/mpc885ads_defconfig | 622 -
arch/ppc/configs/sandpoint_defconfig | 2 +-
arch/ppc/kernel/asm-offsets.c | 7 +-
arch/ppc/kernel/head.S | 17 -
arch/ppc/kernel/pci.c | 63 +-
arch/ppc/kernel/ppc_ksyms.c | 9 +-
arch/ppc/kernel/semaphore.c | 131 -
arch/ppc/kernel/setup.c | 2 -
arch/ppc/lib/string.S | 14 +
arch/ppc/mm/init.c | 1 -
arch/ppc/platforms/4xx/bamboo.c | 1 -
arch/ppc/platforms/4xx/ebony.c | 1 -
arch/ppc/platforms/4xx/luan.c | 1 -
arch/ppc/platforms/4xx/ocotea.c | 1 -
arch/ppc/platforms/4xx/taishan.c | 1 -
arch/ppc/platforms/4xx/yucca.c | 1 -
arch/ppc/platforms/Makefile | 4 -
arch/ppc/platforms/chestnut.c | 1 -
arch/ppc/platforms/cpci690.c | 1 -
arch/ppc/platforms/ev64260.c | 1 -
arch/ppc/platforms/fads.h | 25 -
arch/ppc/platforms/hdpu.c | 36 -
arch/ppc/platforms/lopec.c | 85 -
arch/ppc/platforms/mpc8272ads_setup.c | 367 -
arch/ppc/platforms/mpc885ads.h | 93 -
arch/ppc/platforms/mpc885ads_setup.c | 476 -
arch/ppc/platforms/mvme5100.c | 1 -
arch/ppc/platforms/powerpmc250.c | 1 -
arch/ppc/platforms/pplus.c | 58 -
arch/ppc/platforms/pq2ads.c | 53 -
arch/ppc/platforms/pq2ads.h | 94 -
arch/ppc/platforms/pq2ads_pd.h | 32 -
arch/ppc/platforms/prep_setup.c | 38 -
arch/ppc/platforms/prpmc750.c | 1 -
arch/ppc/platforms/prpmc800.c | 1 -
arch/ppc/platforms/radstone_ppc7d.c | 9 +-
arch/ppc/platforms/residual.c | 1 -
arch/ppc/platforms/sandpoint.c | 94 -
arch/ppc/platforms/sandpoint.h | 3 -
arch/ppc/platforms/sbc82xx.c | 6 +-
arch/ppc/platforms/spruce.c | 1 -
arch/ppc/syslib/m8260_setup.c | 6 -
arch/ppc/syslib/m82xx_pci.c | 38 -
arch/ppc/syslib/m8xx_setup.c | 16 -
arch/ppc/syslib/mpc52xx_setup.c | 2 +-
arch/ppc/syslib/ocp.c | 1 -
arch/ppc/syslib/ppc4xx_setup.c | 23 -
arch/s390/Kconfig | 55 +-
arch/s390/Makefile | 2 +-
arch/s390/crypto/Makefile | 5 +-
arch/s390/crypto/aes_s390.c | 8 +-
arch/s390/crypto/crypt_s390.h | 2 +
arch/s390/crypto/des_s390.c | 8 +-
arch/s390/crypto/sha.h | 35 +
arch/s390/crypto/sha1_s390.c | 99 +-
arch/s390/crypto/sha256_s390.c | 98 +-
arch/s390/crypto/sha512_s390.c | 114 +
arch/s390/crypto/sha_common.c | 97 +
arch/s390/defconfig | 150 +-
arch/s390/kernel/Makefile | 6 +-
arch/s390/kernel/asm-offsets.c | 54 +-
arch/s390/kernel/compat_linux.c | 1 -
arch/s390/kernel/compat_linux.h | 73 +
arch/s390/kernel/compat_signal.c | 11 +
arch/s390/kernel/debug.c | 54 +-
arch/s390/kernel/early.c | 128 +-
arch/s390/kernel/entry.S | 14 +-
arch/s390/kernel/entry.h | 60 +
arch/s390/kernel/entry64.S | 14 +-
arch/s390/kernel/head31.S | 61 -
arch/s390/kernel/head64.S | 64 +-
arch/s390/kernel/ipl.c | 2 +-
arch/s390/kernel/irq.c | 2 -
arch/s390/kernel/kprobes.c | 2 +-
arch/s390/kernel/process.c | 93 +-
arch/s390/kernel/ptrace.c | 58 +-
arch/s390/kernel/s390_ext.c | 14 +-
arch/s390/kernel/s390_ksyms.c | 7 -
arch/s390/kernel/semaphore.c | 108 -
arch/s390/kernel/setup.c | 50 +-
arch/s390/kernel/signal.c | 16 +-
arch/s390/kernel/smp.c | 118 +-
arch/s390/kernel/sys_s390.c | 19 +-
arch/s390/kernel/time.c | 259 +-
arch/s390/kernel/topology.c | 341 +
arch/s390/kernel/traps.c | 37 +-
arch/s390/kernel/vtime.c | 1 +
arch/s390/kvm/Kconfig | 46 +
arch/s390/kvm/Makefile | 14 +
arch/s390/kvm/diag.c | 67 +
arch/s390/kvm/gaccess.h | 274 +
arch/s390/kvm/intercept.c | 216 +
arch/s390/kvm/interrupt.c | 592 +
arch/s390/kvm/kvm-s390.c | 685 ++
arch/s390/kvm/kvm-s390.h | 64 +
arch/s390/kvm/priv.c | 314 +
arch/s390/kvm/sie64a.S | 47 +
arch/s390/kvm/sigp.c | 288 +
arch/s390/lib/Makefile | 2 -
arch/s390/lib/delay.c | 14 +-
arch/s390/lib/uaccess_mvcos.c | 2 +
arch/s390/lib/uaccess_pt.c | 59 +-
arch/s390/math-emu/Makefile | 1 -
arch/s390/mm/Makefile | 2 +-
arch/s390/mm/extmem.c | 75 +-
arch/s390/mm/fault.c | 24 +-
arch/s390/mm/hugetlbpage.c | 134 +
arch/s390/mm/init.c | 26 +-
arch/s390/mm/pgtable.c | 65 +-
arch/s390/mm/vmem.c | 135 +-
arch/sh/Kconfig | 30 +-
arch/sh/Kconfig.debug | 13 +-
arch/sh/Makefile | 1 +
arch/sh/boards/renesas/migor/setup.c | 196 +-
arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 39 +-
arch/sh/boards/renesas/r7780rp/setup.c | 41 +-
arch/sh/boards/se/7721/Makefile | 1 +
arch/sh/boards/se/7721/irq.c | 45 +
arch/sh/boards/se/7721/setup.c | 99 +
arch/sh/boards/se/7722/setup.c | 41 +
arch/sh/configs/se7721_defconfig | 1085 ++
arch/sh/drivers/pci/pci-sh4.h | 2 -
arch/sh/drivers/pci/pci.c | 4 +-
arch/sh/kernel/Makefile_32 | 2 +-
arch/sh/kernel/Makefile_64 | 2 +-
arch/sh/kernel/asm-offsets.c | 7 +-
arch/sh/kernel/cf-enabler.c | 15 +-
arch/sh/kernel/cpu/sh2a/Makefile | 7 +-
arch/sh/kernel/cpu/sh2a/probe.c | 3 +
arch/sh/kernel/cpu/sh2a/setup-mxg.c | 168 +
arch/sh/kernel/cpu/sh4/probe.c | 33 +-
arch/sh/kernel/cpu/sh4a/Makefile | 2 +
arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 28 +-
arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 300 +
arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 10 +-
arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 37 +-
arch/sh/kernel/irq.c | 2 -
arch/sh/kernel/semaphore.c | 139 -
arch/sh/kernel/setup.c | 15 +
arch/sh/kernel/sh_ksyms_32.c | 7 -
arch/sh/kernel/sh_ksyms_64.c | 4 -
arch/sh/kernel/sys_sh64.c | 17 -
arch/sh/lib/clear_page.S | 6 +-
arch/sh/lib/copy_page.S | 6 +-
arch/sh/mm/cache-debugfs.c | 4 +-
arch/sh/mm/init.c | 9 -
arch/sh/mm/pmb.c | 2 +-
arch/sh/tools/mach-types | 5 +-
arch/sparc/Kconfig | 13 +-
arch/sparc/defconfig | 288 +-
arch/sparc/kernel/Makefile | 13 +-
arch/sparc/kernel/asm-offsets.c | 6 +-
arch/sparc/kernel/entry.S | 332 +-
arch/sparc/kernel/errtbls.c | 144 -
arch/sparc/kernel/head.S | 46 +-
arch/sparc/kernel/kgdb.c | 164 +
arch/sparc/kernel/process.c | 2 -
arch/sparc/kernel/sclow.S | 86 -
arch/sparc/kernel/semaphore.c | 155 -
arch/sparc/kernel/setup.c | 5 +-
arch/sparc/kernel/signal.c | 564 +-
arch/sparc/kernel/sparc-stub.c | 724 --
arch/sparc/kernel/sparc_ksyms.c | 15 +-
arch/sparc/kernel/sun4d_smp.c | 32 -
arch/sparc/kernel/sun4m_smp.c | 45 -
arch/sparc/kernel/sunos_asm.S | 67 -
arch/sparc/kernel/sunos_ioctl.c | 230 -
arch/sparc/kernel/sys_solaris.c | 35 -
arch/sparc/kernel/sys_sparc.c | 14 +-
arch/sparc/kernel/sys_sunos.c | 1210 --
arch/sparc/kernel/systbls.S | 121 -
arch/sparc/kernel/time.c | 2 +-
arch/sparc/lib/iomap.c | 4 +-
arch/sparc/mm/fault.c | 61 +-
arch/sparc/prom/init.c | 7 -
arch/sparc/prom/memory.c | 235 +-
arch/sparc64/Kconfig | 152 +-
arch/sparc64/Makefile | 1 -
arch/sparc64/defconfig | 137 +-
arch/sparc64/kernel/Makefile | 18 +-
arch/sparc64/kernel/audit.c | 6 +-
arch/sparc64/kernel/binfmt_aout32.c | 419 -
arch/sparc64/kernel/cherrs.S | 579 +
arch/sparc64/kernel/ebus.c | 1 +
arch/sparc64/kernel/entry.S | 2633 -----
arch/sparc64/kernel/entry.h | 1 -
arch/sparc64/kernel/etrap.S | 4 +
arch/sparc64/kernel/fpu_traps.S | 384 +
arch/sparc64/kernel/getsetcc.S | 24 +
arch/sparc64/kernel/head.S | 15 +-
arch/sparc64/kernel/helpers.S | 63 +
arch/sparc64/kernel/hvcalls.S | 886 ++
arch/sparc64/kernel/iommu.c | 33 +-
arch/sparc64/kernel/irq.c | 3 +-
arch/sparc64/kernel/isa.c | 190 -
arch/sparc64/kernel/ivec.S | 51 +
arch/sparc64/kernel/kgdb.c | 186 +
arch/sparc64/kernel/mdesc.c | 28 +-
arch/sparc64/kernel/misctrap.S | 97 +
arch/sparc64/kernel/of_device.c | 18 +-
arch/sparc64/kernel/pci.c | 144 +-
arch/sparc64/kernel/pci_common.c | 6 -
arch/sparc64/kernel/pci_fire.c | 5 +-
arch/sparc64/kernel/pci_impl.h | 13 +-
arch/sparc64/kernel/pci_msi.c | 8 +-
arch/sparc64/kernel/pci_psycho.c | 5 +-
arch/sparc64/kernel/pci_sabre.c | 4 +-
arch/sparc64/kernel/pci_schizo.c | 5 +-
arch/sparc64/kernel/pci_sun4v.c | 13 +-
arch/sparc64/kernel/process.c | 6 +-
arch/sparc64/kernel/prom.c | 14 +-
arch/sparc64/kernel/rtrap.S | 21 +-
arch/sparc64/kernel/sbus.c | 3 +-
arch/sparc64/kernel/semaphore.c | 254 -
arch/sparc64/kernel/setup.c | 3 +-
arch/sparc64/kernel/signal.c | 38 +-
arch/sparc64/kernel/signal32.c | 592 +-
arch/sparc64/kernel/smp.c | 49 +-
arch/sparc64/kernel/sparc64_ksyms.c | 51 -
arch/sparc64/kernel/spiterrs.S | 245 +
arch/sparc64/kernel/stacktrace.c | 16 +-
arch/sparc64/kernel/sun4v_tlb_miss.S | 16 +-
arch/sparc64/kernel/sunos_ioctl32.c | 275 -
arch/sparc64/kernel/sys_sparc.c | 42 +-
arch/sparc64/kernel/sys_sparc32.c | 12 +-
arch/sparc64/kernel/sys_sunos32.c | 1359 ---
arch/sparc64/kernel/syscalls.S | 279 +
arch/sparc64/kernel/sysfs.c | 12 +
arch/sparc64/kernel/systbls.S | 122 -
arch/sparc64/kernel/systbls.h | 2 -
arch/sparc64/kernel/traps.c | 19 +-
arch/sparc64/kernel/tsb.S | 2 +-
arch/sparc64/kernel/ttable.S | 16 +-
arch/sparc64/kernel/utrap.S | 29 +
arch/sparc64/kernel/winfixup.S | 12 +-
arch/sparc64/lib/iomap.c | 4 +-
arch/sparc64/mm/init.c | 1006 ++-
arch/sparc64/mm/tsb.c | 3 +-
arch/sparc64/mm/ultra.S | 31 +-
arch/sparc64/solaris/Makefile | 10 -
arch/sparc64/solaris/conv.h | 38 -
arch/sparc64/solaris/entry64.S | 223 -
arch/sparc64/solaris/fs.c | 745 --
arch/sparc64/solaris/ioctl.c | 825 --
arch/sparc64/solaris/ipc.c | 126 -
arch/sparc64/solaris/misc.c | 786 --
arch/sparc64/solaris/signal.c | 429 -
arch/sparc64/solaris/signal.h | 108 -
arch/sparc64/solaris/socket.c | 461 -
arch/sparc64/solaris/socksys.c | 203 -
arch/sparc64/solaris/socksys.h | 208 -
arch/sparc64/solaris/systbl.S | 285 -
arch/sparc64/solaris/timod.c | 976 --
arch/um/Kconfig.i386 | 4 -
arch/um/Kconfig.x86_64 | 11 +-
arch/um/drivers/chan_kern.c | 15 +-
arch/um/drivers/line.c | 2 +-
arch/um/drivers/mcast_kern.c | 2 +-
arch/um/drivers/mconsole_user.c | 2 +-
arch/um/drivers/net_kern.c | 6 +-
arch/um/drivers/port_user.c | 2 +-
arch/um/drivers/slip_kern.c | 4 +-
arch/um/drivers/stdio_console.c | 4 +-
arch/um/drivers/ubd_kern.c | 385 +-
arch/um/include/chan_kern.h | 2 -
arch/um/kernel/exitcode.c | 2 +-
arch/um/kernel/process.c | 2 +-
arch/um/kernel/syscall.c | 17 -
arch/um/kernel/time.c | 3 +-
arch/um/kernel/um_arch.c | 7 +-
arch/um/os-Linux/helper.c | 1 +
arch/um/os-Linux/start_up.c | 14 +-
arch/um/os-Linux/sys-i386/task_size.c | 12 +-
arch/um/sys-i386/Makefile | 2 +-
arch/um/sys-i386/ksyms.c | 12 -
arch/um/sys-ppc/Makefile | 8 +-
arch/um/sys-x86_64/Makefile | 2 +-
arch/um/sys-x86_64/ksyms.c | 13 +-
arch/v850/kernel/Makefile | 2 +-
arch/v850/kernel/asm-offsets.c | 7 +-
arch/v850/kernel/rte_mb_a_pci.c | 4 +-
arch/v850/kernel/semaphore.c | 166 -
arch/v850/kernel/syscalls.c | 18 -
arch/v850/kernel/v850_ksyms.c | 7 -
arch/x86/Kconfig | 162 +-
arch/x86/Kconfig.cpu | 13 +-
arch/x86/Kconfig.debug | 50 +-
arch/x86/Makefile | 7 +-
arch/x86/boot/.gitignore | 5 +-
arch/x86/boot/Makefile | 16 +-
arch/x86/boot/a20.c | 2 -
arch/x86/boot/apm.c | 2 -
arch/x86/boot/bitops.h | 2 -
arch/x86/boot/boot.h | 7 +-
arch/x86/boot/cmdline.c | 2 -
arch/x86/boot/compressed/Makefile | 2 +-
arch/x86/boot/compressed/head_32.S | 15 +-
arch/x86/boot/compressed/head_64.S | 30 +-
arch/x86/boot/compressed/misc.c | 210 +-
arch/x86/boot/compressed/relocs.c | 2 +-
arch/x86/boot/compressed/vmlinux_64.lds | 4 +-
arch/x86/boot/copy.S | 2 -
arch/x86/boot/cpucheck.c | 22 +-
arch/x86/boot/edd.c | 12 +-
arch/x86/boot/header.S | 10 +-
arch/x86/boot/install.sh | 2 -
arch/x86/boot/main.c | 2 -
arch/x86/boot/mca.c | 2 -
arch/x86/boot/memory.c | 2 -
arch/x86/boot/pm.c | 4 +-
arch/x86/boot/pmjump.S | 2 -
arch/x86/boot/printf.c | 2 -
arch/x86/boot/string.c | 2 -
arch/x86/boot/tools/build.c | 88 +-
arch/x86/boot/tty.c | 2 -
arch/x86/boot/version.c | 2 -
arch/x86/boot/video-bios.c | 8 +-
arch/x86/boot/video-mode.c | 173 +
arch/x86/boot/video-vesa.c | 10 +-
arch/x86/boot/video-vga.c | 14 +-
arch/x86/boot/video.c | 159 +-
arch/x86/boot/video.h | 2 -
arch/x86/boot/voyager.c | 2 -
arch/x86/configs/i386_defconfig | 1 +
arch/x86/configs/x86_64_defconfig | 1 +
arch/x86/crypto/aes-i586-asm_32.S | 3 -
arch/x86/ia32/ia32_signal.c | 14 +-
arch/x86/ia32/ia32entry.S | 14 +-
arch/x86/ia32/sys_ia32.c | 32 +-
arch/x86/kernel/Makefile | 36 +-
arch/x86/kernel/acpi/Makefile | 9 +-
arch/x86/kernel/acpi/boot.c | 141 +-
arch/x86/kernel/acpi/cstate.c | 6 +-
arch/x86/kernel/acpi/processor.c | 2 -
arch/x86/kernel/acpi/realmode/.gitignore | 3 +
arch/x86/kernel/acpi/realmode/Makefile | 58 +
arch/x86/kernel/acpi/realmode/copy.S | 1 +
arch/x86/kernel/acpi/realmode/video-bios.c | 1 +
arch/x86/kernel/acpi/realmode/video-mode.c | 1 +
arch/x86/kernel/acpi/realmode/video-vesa.c | 1 +
arch/x86/kernel/acpi/realmode/video-vga.c | 1 +
arch/x86/kernel/acpi/realmode/wakemain.c | 81 +
arch/x86/kernel/acpi/realmode/wakeup.S | 113 +
arch/x86/kernel/acpi/realmode/wakeup.h | 36 +
arch/x86/kernel/acpi/realmode/wakeup.lds.S | 61 +
arch/x86/kernel/acpi/sleep.c | 73 +-
arch/x86/kernel/acpi/sleep.h | 16 +
arch/x86/kernel/acpi/sleep_32.c | 40 -
arch/x86/kernel/acpi/wakeup_32.S | 247 +-
arch/x86/kernel/acpi/wakeup_64.S | 313 +-
arch/x86/kernel/acpi/wakeup_rm.S | 10 +
arch/x86/kernel/alternative.c | 102 +-
arch/x86/kernel/aperture_64.c | 6 +-
arch/x86/kernel/apic_32.c | 227 +-
arch/x86/kernel/apic_64.c | 147 +-
arch/x86/kernel/apm_32.c | 24 +-
arch/x86/kernel/asm-offsets_32.c | 11 +-
arch/x86/kernel/asm-offsets_64.c | 9 +-
arch/x86/kernel/bugs_64.c | 14 +-
arch/x86/kernel/cpu/Makefile | 5 +-
arch/x86/kernel/cpu/amd.c | 125 +-
arch/x86/kernel/cpu/centaur.c | 490 +-
arch/x86/kernel/cpu/common.c | 181 +-
arch/x86/kernel/cpu/cpu.h | 26 +-
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 39 +-
arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 4 +-
arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 32 +-
arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 13 +-
arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 20 +-
arch/x86/kernel/cpu/cyrix.c | 136 +-
arch/x86/kernel/cpu/feature_names.c | 2 +-
arch/x86/kernel/cpu/intel.c | 106 +-
arch/x86/kernel/cpu/intel_cacheinfo.c | 92 +-
arch/x86/kernel/cpu/mcheck/mce_32.c | 50 +-
arch/x86/kernel/cpu/mcheck/mce_64.c | 18 +-
arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 46 +-
arch/x86/kernel/cpu/mcheck/non-fatal.c | 21 +-
arch/x86/kernel/cpu/mcheck/p5.c | 16 +-
arch/x86/kernel/cpu/mcheck/p6.c | 48 +-
arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 -
arch/x86/kernel/cpu/mcheck/winchip.c | 8 +-
arch/x86/kernel/cpu/mtrr/generic.c | 139 +
arch/x86/kernel/cpu/mtrr/if.c | 7 +-
arch/x86/kernel/cpu/mtrr/main.c | 2 +-
arch/x86/kernel/cpu/mtrr/state.c | 14 +-
arch/x86/kernel/cpu/nexgen.c | 60 -
arch/x86/kernel/cpu/perfctr-watchdog.c | 14 +-
arch/x86/kernel/cpu/proc.c | 171 +-
arch/x86/kernel/cpu/transmeta.c | 30 +-
arch/x86/kernel/cpu/umc.c | 19 +-
arch/x86/kernel/cpuid.c | 4 +-
arch/x86/kernel/crash.c | 7 +-
arch/x86/kernel/ds.c | 8 +-
arch/x86/kernel/e820_32.c | 31 +-
arch/x86/kernel/e820_64.c | 191 +-
arch/x86/kernel/early_printk.c | 24 +-
arch/x86/kernel/efi.c | 18 +-
arch/x86/kernel/efi_64.c | 12 +-
arch/x86/kernel/entry_32.S | 52 +-
arch/x86/kernel/entry_64.S | 8 +-
arch/x86/kernel/genapic_64.c | 49 +-
arch/x86/kernel/genapic_flat_64.c | 7 +-
arch/x86/kernel/genx2apic_uv_x.c | 250 +
arch/x86/kernel/head32.c | 14 +
arch/x86/kernel/head64.c | 101 +-
arch/x86/kernel/head_32.S | 22 +-
arch/x86/kernel/head_64.S | 28 +-
arch/x86/kernel/hpet.c | 7 +-
arch/x86/kernel/i386_ksyms_32.c | 5 -
arch/x86/kernel/i387.c | 200 +-
arch/x86/kernel/i8253.c | 6 +-
arch/x86/kernel/io_apic_32.c | 167 +-
arch/x86/kernel/io_apic_64.c | 67 +-
arch/x86/kernel/ipi.c | 178 +
arch/x86/kernel/irq_32.c | 6 +-
arch/x86/kernel/kdebugfs.c | 163 +-
arch/x86/kernel/kgdb.c | 567 +
arch/x86/kernel/kprobes.c | 14 +-
arch/x86/kernel/kvm.c | 248 +
arch/x86/kernel/kvmclock.c | 191 +
arch/x86/kernel/mca_32.c | 96 +-
arch/x86/kernel/mfgpt_32.c | 11 +-
arch/x86/kernel/microcode.c | 32 +-
arch/x86/kernel/mmconf-fam10h_64.c | 243 +
arch/x86/kernel/mpparse.c | 1087 ++
arch/x86/kernel/mpparse_32.c | 1139 --
arch/x86/kernel/mpparse_64.c | 867 --
arch/x86/kernel/msr.c | 8 +-
arch/x86/kernel/nmi_32.c | 17 +-
arch/x86/kernel/nmi_64.c | 8 +-
arch/x86/kernel/olpc.c | 260 +
arch/x86/kernel/paravirt.c | 30 +-
arch/x86/kernel/pci-calgary_64.c | 7 +-
arch/x86/kernel/pci-dma.c | 524 +
arch/x86/kernel/pci-dma_32.c | 177 -
arch/x86/kernel/pci-dma_64.c | 344 -
arch/x86/kernel/pci-gart_64.c | 15 +-
arch/x86/kernel/pci-nommu.c | 100 +
arch/x86/kernel/pci-nommu_64.c | 98 -
arch/x86/kernel/pci-swiotlb_64.c | 9 +-
arch/x86/kernel/process.c | 161 +
arch/x86/kernel/process_32.c | 197 +-
arch/x86/kernel/process_64.c | 224 +-
arch/x86/kernel/ptrace.c | 96 +-
arch/x86/kernel/reboot.c | 26 +-
arch/x86/kernel/relocate_kernel_32.S | 30 +-
arch/x86/kernel/relocate_kernel_64.S | 40 +-
arch/x86/kernel/rtc.c | 33 +-
arch/x86/kernel/setup.c | 137 +
arch/x86/kernel/setup64.c | 101 +-
arch/x86/kernel/setup_32.c | 110 +-
arch/x86/kernel/setup_64.c | 291 +-
arch/x86/kernel/sigframe.h | 27 +
arch/x86/kernel/sigframe_32.h | 21 -
arch/x86/kernel/signal_32.c | 347 +-
arch/x86/kernel/signal_64.c | 152 +-
arch/x86/kernel/smp.c | 343 +
arch/x86/kernel/smp_32.c | 712 --
arch/x86/kernel/smp_64.c | 530 -
arch/x86/kernel/smpboot.c | 1446 +++
arch/x86/kernel/smpboot_32.c | 1320 ---
arch/x86/kernel/smpboot_64.c | 1108 --
arch/x86/kernel/smpcommon.c | 83 +
arch/x86/kernel/smpcommon_32.c | 81 -
arch/x86/kernel/srat_32.c | 10 +-
arch/x86/kernel/step.c | 2 +-
arch/x86/kernel/summit_32.c | 62 +-
arch/x86/kernel/sys_i386_32.c | 17 -
arch/x86/kernel/sys_x86_64.c | 17 -
arch/x86/kernel/syscall_64.c | 13 +-
arch/x86/kernel/test_nx.c | 2 +
arch/x86/kernel/time_32.c | 1 -
arch/x86/kernel/tlb_32.c | 243 +
arch/x86/kernel/tlb_64.c | 274 +
arch/x86/kernel/trampoline.c | 18 +
arch/x86/kernel/trampoline_32.S | 2 +-
arch/x86/kernel/trampoline_64.S | 5 -
arch/x86/kernel/traps_32.c | 647 +-
arch/x86/kernel/traps_64.c | 47 +-
arch/x86/kernel/tsc_32.c | 39 +-
arch/x86/kernel/tsc_64.c | 26 +-
arch/x86/kernel/vm86_32.c | 213 +-
arch/x86/kernel/vmi_32.c | 22 +-
arch/x86/kernel/vmlinux_32.lds.S | 5 +
arch/x86/kernel/vmlinux_64.lds.S | 17 +-
arch/x86/kernel/vsmp_64.c | 131 +-
arch/x86/kernel/vsyscall_64.c | 2 +-
arch/x86/kernel/x8664_ksyms_64.c | 18 +-
arch/x86/kvm/Kconfig | 13 +-
arch/x86/kvm/Makefile | 6 +-
arch/x86/kvm/i8254.c | 613 +
arch/x86/kvm/i8254.h | 63 +
arch/x86/kvm/irq.c | 18 +
arch/x86/kvm/irq.h | 3 +
arch/x86/kvm/kvm_svm.h | 2 +
arch/x86/kvm/lapic.c | 41 +-
arch/x86/kvm/mmu.c | 753 +-
arch/x86/kvm/mmu.h | 33 +
arch/x86/kvm/paging_tmpl.h | 86 +-
arch/x86/kvm/segment_descriptor.h | 29 -
arch/x86/kvm/svm.c | 362 +-
arch/x86/kvm/svm.h | 3 +
arch/x86/kvm/tss.h | 59 +
arch/x86/kvm/vmx.c | 649 +-
arch/x86/kvm/vmx.h | 48 +-
arch/x86/kvm/x86.c | 915 ++-
arch/x86/kvm/x86_emulate.c | 286 +-
arch/x86/lguest/boot.c | 2 +-
arch/x86/lib/Makefile | 3 +-
arch/x86/lib/bitops_32.c | 70 -
arch/x86/lib/bitops_64.c | 175 -
arch/x86/lib/memcpy_32.c | 2 +-
arch/x86/lib/memmove_64.c | 8 +-
arch/x86/lib/mmx_32.c | 197 +-
arch/x86/lib/semaphore_32.S | 83 -
arch/x86/lib/string_32.c | 60 +-
arch/x86/lib/strstr_32.c | 4 +-
arch/x86/lib/thunk_64.S | 5 -
arch/x86/lib/usercopy_32.c | 122 +-
arch/x86/mach-generic/bigsmp.c | 30 +-
arch/x86/mach-generic/default.c | 8 +-
arch/x86/mach-generic/probe.c | 37 +-
arch/x86/mach-generic/summit.c | 8 +-
arch/x86/mach-rdc321x/Makefile | 2 +-
arch/x86/mach-rdc321x/wdt.c | 275 -
arch/x86/mach-visws/mpparse.c | 15 +-
arch/x86/mach-visws/visws_apic.c | 2 -
arch/x86/mach-voyager/voyager_basic.c | 2 -
arch/x86/mach-voyager/voyager_cat.c | 4 +-
arch/x86/mach-voyager/voyager_smp.c | 43 +-
arch/x86/mach-voyager/voyager_thread.c | 2 -
arch/x86/math-emu/fpu_entry.c | 5 +-
arch/x86/math-emu/fpu_system.h | 26 +-
arch/x86/math-emu/reg_ld_str.c | 17 +-
arch/x86/mm/Makefile | 16 +-
arch/x86/mm/Makefile_32 | 9 -
arch/x86/mm/Makefile_64 | 9 -
arch/x86/mm/discontig_32.c | 34 +-
arch/x86/mm/dump_pagetables.c | 354 +
arch/x86/mm/fault.c | 6 +-
arch/x86/mm/highmem_32.c | 1 -
arch/x86/mm/init_32.c | 105 +-
arch/x86/mm/init_64.c | 299 +-
arch/x86/mm/ioremap.c | 202 +-
arch/x86/mm/k8topology_64.c | 40 +-
arch/x86/mm/numa_64.c | 67 +-
arch/x86/mm/pageattr.c | 117 +-
arch/x86/mm/pat.c | 596 +
arch/x86/mm/pgtable.c | 276 +
arch/x86/mm/pgtable_32.c | 209 -
arch/x86/mm/srat_64.c | 41 +-
arch/x86/oprofile/init.c | 13 +-
arch/x86/oprofile/nmi_int.c | 49 +-
arch/x86/oprofile/nmi_timer_int.c | 6 +-
arch/x86/oprofile/op_model_athlon.c | 46 +-
arch/x86/oprofile/op_model_ppro.c | 52 +-
arch/x86/pci/Makefile_32 | 10 +
arch/x86/pci/Makefile_64 | 2 +-
arch/x86/pci/acpi.c | 79 +-
arch/x86/pci/common.c | 139 +-
arch/x86/pci/direct.c | 8 +-
arch/x86/pci/fixup.c | 17 +
arch/x86/pci/i386.c | 117 +-
arch/x86/pci/init.c | 19 +-
arch/x86/pci/irq.c | 16 +-
arch/x86/pci/k8-bus_64.c | 575 +-
arch/x86/pci/legacy.c | 4 +-
arch/x86/pci/mmconfig-shared.c | 247 +-
arch/x86/pci/mmconfig_32.c | 4 +
arch/x86/pci/mmconfig_64.c | 22 +-
arch/x86/pci/mp_bus_to_node.c | 23 +
arch/x86/pci/numa.c | 32 +-
arch/x86/pci/olpc.c | 313 +
arch/x86/pci/pcbios.c | 72 -
arch/x86/pci/pci.h | 11 +-
arch/x86/power/cpu_32.c | 41 +-
arch/x86/vdso/Makefile | 5 +-
arch/x86/vdso/vdso.S | 10 +-
arch/x86/vdso/vdso32-setup.c | 15 +-
arch/x86/video/fbdev.c | 3 +-
arch/x86/xen/Kconfig | 2 +-
arch/x86/xen/Makefile | 4 +-
arch/x86/xen/enlighten.c | 61 +-
arch/x86/xen/events.c | 591 -
arch/x86/xen/features.c | 29 -
arch/x86/xen/grant-table.c | 91 +
arch/x86/xen/mmu.c | 147 +-
arch/x86/xen/multicalls.c | 4 +-
arch/x86/xen/setup.c | 21 +
arch/x86/xen/smp.c | 28 +-
arch/x86/xen/xen-asm.S | 53 +-
arch/x86/xen/xen-ops.h | 10 +-
arch/xtensa/kernel/Makefile | 2 +-
arch/xtensa/kernel/asm-offsets.c | 3 +-
arch/xtensa/kernel/semaphore.c | 226 -
arch/xtensa/kernel/xtensa_ksyms.c | 9 -
block/Kconfig | 65 +-
block/blk-barrier.c | 14 +-
block/blk-core.c | 80 +-
block/blk-map.c | 67 +-
block/blk-merge.c | 15 +-
block/blk-settings.c | 23 +-
block/blk-sysfs.c | 36 +-
block/blk-tag.c | 16 +-
block/blk.h | 1 -
block/bsg.c | 110 +-
block/compat_ioctl.c | 1 -
block/elevator.c | 23 +-
block/genhd.c | 8 +
block/scsi_ioctl.c | 8 +-
crypto/Kconfig | 638 +-
crypto/Makefile | 6 +-
crypto/aes_generic.c | 56 +-
crypto/anubis.c | 8 +-
crypto/api.c | 3 +
crypto/async_tx/async_memcpy.c | 2 +-
crypto/async_tx/async_tx.c | 202 +-
crypto/async_tx/async_xor.c | 2 +-
crypto/authenc.c | 5 +-
crypto/blowfish.c | 8 +-
crypto/cast5.c | 8 +-
crypto/cast6.c | 8 +-
crypto/crc32c.c | 8 +-
crypto/cryptd.c | 4 +-
crypto/crypto_null.c | 8 +-
crypto/cts.c | 347 +
crypto/deflate.c | 8 +-
crypto/des_generic.c | 8 +-
crypto/eseqiv.c | 3 +-
crypto/fcrypt.c | 8 +-
crypto/khazad.c | 8 +-
crypto/lrw.c | 5 +-
crypto/lzo.c | 8 +-
crypto/md4.c | 8 +-
crypto/md5.c | 8 +-
crypto/proc.c | 8 +-
crypto/salsa20_generic.c | 8 +-
crypto/serpent.c | 8 +-
crypto/sha1_generic.c | 8 +-
crypto/sha256_generic.c | 8 +-
crypto/sha512.c | 305 -
crypto/sha512_generic.c | 306 +
crypto/tcrypt.c | 529 +-
crypto/tcrypt.h |11923 ++++++++++----------
crypto/tea.c | 8 +-
crypto/tgr192.c | 8 +-
crypto/twofish.c | 8 +-
crypto/wp512.c | 8 +-
drivers/Kconfig | 4 +
drivers/Makefile | 1 +
drivers/accessibility/Kconfig | 23 +
drivers/accessibility/Makefile | 1 +
drivers/accessibility/braille/Makefile | 1 +
drivers/accessibility/braille/braille_console.c | 397 +
drivers/acpi/Kconfig | 3 +
drivers/acpi/ac.c | 14 +-
drivers/acpi/battery.c | 12 +-
drivers/acpi/bay.c | 2 +
drivers/acpi/bus.c | 2 +
drivers/acpi/button.c | 24 +-
drivers/acpi/dispatcher/dsfield.c | 173 +-
drivers/acpi/dispatcher/dsinit.c | 2 +-
drivers/acpi/dispatcher/dsmethod.c | 57 +-
drivers/acpi/dispatcher/dsmthdat.c | 2 +-
drivers/acpi/dispatcher/dsobject.c | 101 +-
drivers/acpi/dispatcher/dsopcode.c | 260 +-
drivers/acpi/dispatcher/dsutils.c | 167 +-
drivers/acpi/dispatcher/dswexec.c | 78 +-
drivers/acpi/dispatcher/dswload.c | 37 +-
drivers/acpi/dispatcher/dswscope.c | 2 +-
drivers/acpi/dispatcher/dswstate.c | 517 +-
drivers/acpi/ec.c | 251 +-
drivers/acpi/event.c | 8 +-
drivers/acpi/events/evevent.c | 2 +-
drivers/acpi/events/evgpe.c | 6 +-
drivers/acpi/events/evgpeblk.c | 2 +-
drivers/acpi/events/evmisc.c | 92 +-
drivers/acpi/events/evregion.c | 4 +-
drivers/acpi/events/evrgnini.c | 2 +-
drivers/acpi/events/evsci.c | 2 +-
drivers/acpi/events/evxface.c | 23 +-
drivers/acpi/events/evxfevnt.c | 2 +-
drivers/acpi/events/evxfregn.c | 2 +-
drivers/acpi/executer/exconfig.c | 105 +-
drivers/acpi/executer/exconvrt.c | 2 +-
drivers/acpi/executer/excreate.c | 117 +-
drivers/acpi/executer/exdump.c | 69 +-
drivers/acpi/executer/exfield.c | 63 +-
drivers/acpi/executer/exfldio.c | 46 +-
drivers/acpi/executer/exmisc.c | 2 +-
drivers/acpi/executer/exmutex.c | 237 +-
drivers/acpi/executer/exnames.c | 2 +-
drivers/acpi/executer/exoparg1.c | 25 +-
drivers/acpi/executer/exoparg2.c | 21 +-
drivers/acpi/executer/exoparg3.c | 3 +-
drivers/acpi/executer/exoparg6.c | 10 +-
drivers/acpi/executer/exprep.c | 17 +-
drivers/acpi/executer/exregion.c | 10 +-
drivers/acpi/executer/exresnte.c | 12 +-
drivers/acpi/executer/exresolv.c | 55 +-
drivers/acpi/executer/exresop.c | 13 +-
drivers/acpi/executer/exstore.c | 119 +-
drivers/acpi/executer/exstoren.c | 2 +-
drivers/acpi/executer/exstorob.c | 2 +-
drivers/acpi/executer/exsystem.c | 3 +-
drivers/acpi/executer/exutils.c | 67 +-
drivers/acpi/fan.c | 49 +-
drivers/acpi/glue.c | 20 +
drivers/acpi/hardware/hwacpi.c | 2 +-
drivers/acpi/hardware/hwgpe.c | 2 +-
drivers/acpi/hardware/hwregs.c | 2 +-
drivers/acpi/hardware/hwsleep.c | 16 +-
drivers/acpi/hardware/hwtimer.c | 2 +-
drivers/acpi/namespace/nsaccess.c | 101 +-
drivers/acpi/namespace/nsalloc.c | 2 +-
drivers/acpi/namespace/nsdump.c | 11 +-
drivers/acpi/namespace/nsdumpdv.c | 2 +-
drivers/acpi/namespace/nseval.c | 2 +-
drivers/acpi/namespace/nsinit.c | 12 +-
drivers/acpi/namespace/nsload.c | 6 +-
drivers/acpi/namespace/nsnames.c | 8 +-
drivers/acpi/namespace/nsobject.c | 2 +-
drivers/acpi/namespace/nsparse.c | 33 +-
drivers/acpi/namespace/nssearch.c | 2 +-
drivers/acpi/namespace/nsutils.c | 2 +-
drivers/acpi/namespace/nswalk.c | 6 +-
drivers/acpi/namespace/nsxfeval.c | 15 +-
drivers/acpi/namespace/nsxfname.c | 2 +-
drivers/acpi/namespace/nsxfobj.c | 2 +-
drivers/acpi/osl.c | 90 +-
drivers/acpi/parser/psargs.c | 63 +-
drivers/acpi/parser/psloop.c | 61 +-
drivers/acpi/parser/psopcode.c | 38 +-
drivers/acpi/parser/psparse.c | 45 +-
drivers/acpi/parser/psscope.c | 2 +-
drivers/acpi/parser/pstree.c | 4 +-
drivers/acpi/parser/psutils.c | 2 +-
drivers/acpi/parser/pswalk.c | 2 +-
drivers/acpi/parser/psxface.c | 2 +-
drivers/acpi/power.c | 13 +-
drivers/acpi/processor_core.c | 79 +-
drivers/acpi/processor_idle.c | 50 +-
drivers/acpi/processor_perflib.c | 13 +-
drivers/acpi/processor_thermal.c | 31 +-
drivers/acpi/processor_throttling.c | 11 +-
drivers/acpi/resources/rsaddr.c | 2 +-
drivers/acpi/resources/rscalc.c | 26 +-
drivers/acpi/resources/rscreate.c | 2 +-
drivers/acpi/resources/rsdump.c | 10 +-
drivers/acpi/resources/rsinfo.c | 2 +-
drivers/acpi/resources/rsio.c | 41 +-
drivers/acpi/resources/rsirq.c | 45 +-
drivers/acpi/resources/rslist.c | 2 +-
drivers/acpi/resources/rsmemory.c | 2 +-
drivers/acpi/resources/rsmisc.c | 13 +-
drivers/acpi/resources/rsutils.c | 8 +-
drivers/acpi/resources/rsxface.c | 2 +-
drivers/acpi/sbs.c | 35 +-
drivers/acpi/scan.c | 63 +-
drivers/acpi/sleep/main.c | 42 +-
drivers/acpi/sleep/proc.c | 26 +-
drivers/acpi/system.c | 27 +-
drivers/acpi/tables/tbfadt.c | 2 +-
drivers/acpi/tables/tbfind.c | 34 +-
drivers/acpi/tables/tbinstal.c | 24 +-
drivers/acpi/tables/tbutils.c | 4 +-
drivers/acpi/tables/tbxface.c | 91 +-
drivers/acpi/tables/tbxfroot.c | 2 +-
drivers/acpi/thermal.c | 89 +-
drivers/acpi/utilities/utalloc.c | 4 +-
drivers/acpi/utilities/utcache.c | 2 +-
drivers/acpi/utilities/utcopy.c | 61 +-
drivers/acpi/utilities/utdebug.c | 19 +-
drivers/acpi/utilities/utdelete.c | 23 +-
drivers/acpi/utilities/uteval.c | 2 +-
drivers/acpi/utilities/utglobal.c | 49 +-
drivers/acpi/utilities/utinit.c | 5 +-
drivers/acpi/utilities/utmath.c | 4 +-
drivers/acpi/utilities/utmisc.c | 6 +-
drivers/acpi/utilities/utmutex.c | 2 +-
drivers/acpi/utilities/utobject.c | 8 +-
drivers/acpi/utilities/utresrc.c | 2 +-
drivers/acpi/utilities/utstate.c | 2 +-
drivers/acpi/utilities/utxface.c | 41 +-
drivers/acpi/utils.c | 2 +-
drivers/acpi/video.c | 307 +-
drivers/ata/Kconfig | 85 +-
drivers/ata/Makefile | 8 +-
drivers/ata/ahci.c | 328 +-
drivers/ata/ata_generic.c | 57 +-
drivers/ata/ata_piix.c | 338 +-
drivers/ata/libata-acpi.c | 12 +-
drivers/ata/libata-core.c | 2238 +----
drivers/ata/libata-eh.c | 228 +-
drivers/ata/libata-pmp.c | 247 +-
drivers/ata/libata-scsi.c | 544 +-
drivers/ata/libata-sff.c | 2292 ++++-
drivers/ata/libata.h | 82 +-
drivers/ata/pata_acpi.c | 89 +-
drivers/ata/pata_ali.c | 165 +-
drivers/ata/pata_amd.c | 268 +-
drivers/ata/pata_artop.c | 125 +-
drivers/ata/pata_at32.c | 49 +-
drivers/ata/pata_atiixp.c | 61 +-
drivers/ata/pata_bf54x.c | 262 +-
drivers/ata/pata_cmd640.c | 83 +-
drivers/ata/pata_cmd64x.c | 137 +-
drivers/ata/pata_cs5520.c | 64 +-
drivers/ata/pata_cs5530.c | 80 +-
drivers/ata/pata_cs5535.c | 50 +-
drivers/ata/pata_cs5536.c | 50 +-
drivers/ata/pata_cypress.c | 50 +-
drivers/ata/pata_efar.c | 66 +-
drivers/ata/pata_hpt366.c | 77 +-
drivers/ata/pata_hpt37x.c | 245 +-
drivers/ata/pata_hpt3x2n.c | 85 +-
drivers/ata/pata_hpt3x3.c | 56 +-
drivers/ata/pata_icside.c | 67 +-
drivers/ata/pata_isapnp.c | 41 +-
drivers/ata/pata_it8213.c | 67 +-
drivers/ata/pata_it821x.c | 109 +-
drivers/ata/pata_ixp4xx_cf.c | 47 +-
drivers/ata/pata_jmicron.c | 68 +-
drivers/ata/pata_legacy.c | 316 +-
drivers/ata/pata_marvell.c | 69 +-
drivers/ata/pata_mpc52xx.c | 48 +-
drivers/ata/pata_mpiix.c | 71 +-
drivers/ata/pata_netcell.c | 58 +-
drivers/ata/pata_ninja32.c | 54 +-
drivers/ata/pata_ns87410.c | 68 +-
drivers/ata/pata_ns87415.c | 102 +-
drivers/ata/pata_oldpiix.c | 74 +-
drivers/ata/pata_opti.c | 66 +-
drivers/ata/pata_optidma.c | 103 +-
drivers/ata/pata_pcmcia.c | 68 +-
drivers/ata/pata_pdc2027x.c | 99 +-
drivers/ata/pata_pdc202xx_old.c | 96 +-
drivers/ata/pata_platform.c | 47 +-
drivers/ata/pata_qdi.c | 77 +-
drivers/ata/pata_radisys.c | 57 +-
drivers/ata/pata_rb500_cf.c | 314 -
drivers/ata/pata_rb532_cf.c | 277 +
drivers/ata/pata_rz1000.c | 49 +-
drivers/ata/pata_sc1200.c | 59 +-
drivers/ata/pata_scc.c | 257 +-
drivers/ata/pata_sch.c | 206 +
drivers/ata/pata_serverworks.c | 114 +-
drivers/ata/pata_sil680.c | 71 +-
drivers/ata/pata_sis.c | 230 +-
drivers/ata/pata_sl82c105.c | 67 +-
drivers/ata/pata_triflex.c | 58 +-
drivers/ata/pata_via.c | 145 +-
drivers/ata/pata_winbond.c | 47 +-
drivers/ata/pdc_adma.c | 80 +-
drivers/ata/sata_fsl.c | 136 +-
drivers/ata/sata_inic162x.c | 689 +-
drivers/ata/sata_mv.c | 1681 ++--
drivers/ata/sata_nv.c | 272 +-
drivers/ata/sata_promise.c | 118 +-
drivers/ata/sata_qstor.c | 56 +-
drivers/ata/sata_sil.c | 55 +-
drivers/ata/sata_sil24.c | 247 +-
drivers/ata/sata_sis.c | 56 +-
drivers/ata/sata_svw.c | 47 +-
drivers/ata/sata_sx4.c | 52 +-
drivers/ata/sata_uli.c | 55 +-
drivers/ata/sata_via.c | 126 +-
drivers/ata/sata_vsc.c | 44 +-
drivers/atm/ambassador.c | 41 +-
drivers/atm/ambassador.h | 2 +-
drivers/atm/horizon.c | 24 +-
drivers/atm/iphase.c | 7 +-
drivers/atm/nicstar.c | 119 +-
drivers/atm/nicstar.h | 12 -
drivers/base/attribute_container.c | 77 +-
drivers/base/base.h | 11 -
drivers/base/bus.c | 16 +-
drivers/base/class.c | 640 +--
drivers/base/core.c | 74 +-
drivers/base/cpu.c | 62 +-
drivers/base/dd.c | 14 +-
drivers/base/driver.c | 10 +
drivers/base/firmware_class.c | 20 +-
drivers/base/memory.c | 33 +-
drivers/base/node.c | 31 +-
drivers/base/power/main.c | 103 +-
drivers/base/power/power.h | 23 +-
drivers/base/power/sysfs.c | 2 +
drivers/base/sys.c | 17 +-
drivers/base/topology.c | 41 +-
drivers/base/transport_class.c | 17 +-
drivers/block/aoe/aoe.h | 1 -
drivers/block/aoe/aoecmd.c | 24 +-
drivers/block/aoe/aoedev.c | 18 -
drivers/block/aoe/aoenet.c | 6 +-
drivers/block/brd.c | 26 +-
drivers/block/cciss.c | 29 +-
drivers/block/cciss_scsi.c | 2 +-
drivers/block/cpqarray.c | 4 +-
drivers/block/cryptoloop.c | 1 -
drivers/block/floppy.c | 6 +-
drivers/block/loop.c | 28 +-
drivers/block/nbd.c | 172 +-
drivers/block/paride/pd.c | 4 +-
drivers/block/pktcdvd.c | 13 +-
drivers/block/ps3disk.c | 4 +-
drivers/block/sx8.c | 6 +-
drivers/block/ub.c | 65 +-
drivers/block/viodasd.c | 2 +-
drivers/block/virtio_blk.c | 44 +-
drivers/block/xen-blkfront.c | 25 +-
drivers/bluetooth/hci_ldisc.c | 13 +-
drivers/bluetooth/hci_usb.c | 24 +-
drivers/bluetooth/hci_usb.h | 26 +-
drivers/cdrom/cdrom.c | 329 +-
drivers/cdrom/gdrom.c | 4 +-
drivers/cdrom/viocd.c | 15 +-
drivers/char/Kconfig | 50 +-
drivers/char/Makefile | 1 +
drivers/char/agp/agp.h | 2 +-
drivers/char/agp/amd-k7-agp.c | 3 +-
drivers/char/agp/frontend.c | 4 +-
drivers/char/amiserial.c | 30 +-
drivers/char/apm-emulation.c | 23 +-
drivers/char/applicom.c | 4 +-
drivers/char/bfin-otp.c | 189 +
drivers/char/consolemap.c | 1 +
drivers/char/cs5535_gpio.c | 2 +-
drivers/char/cyclades.c | 432 +-
drivers/char/drm/ati_pcigart.c | 7 -
drivers/char/drm/drm.h | 17 +
drivers/char/drm/drmP.h | 142 +-
drivers/char/drm/drm_agpsupport.c | 2 +-
drivers/char/drm/drm_drv.c | 60 +-
drivers/char/drm/drm_fops.c | 41 +-
drivers/char/drm/drm_irq.c | 381 +-
drivers/char/drm/drm_proc.c | 61 +-
drivers/char/drm/drm_stub.c | 138 +-
drivers/char/drm/drm_sysfs.c | 48 +-
drivers/char/drm/drm_vm.c | 22 +-
drivers/char/drm/i810_dma.c | 4 +-
drivers/char/drm/i830_dma.c | 22 +-
drivers/char/drm/i830_drv.h | 2 +-
drivers/char/drm/i830_irq.c | 8 +-
drivers/char/drm/i915_dma.c | 164 +-
drivers/char/drm/i915_drm.h | 45 +-
drivers/char/drm/i915_drv.c | 8 +-
drivers/char/drm/i915_drv.h | 105 +-
drivers/char/drm/i915_irq.c | 605 +-
drivers/char/drm/mga_drv.c | 7 +-
drivers/char/drm/mga_drv.h | 6 +-
drivers/char/drm/mga_irq.c | 69 +-
drivers/char/drm/r128_cce.c | 2 +-
drivers/char/drm/r128_drv.c | 7 +-
drivers/char/drm/r128_drv.h | 9 +-
drivers/char/drm/r128_irq.c | 55 +-
drivers/char/drm/radeon_cp.c | 2 +-
drivers/char/drm/radeon_drv.c | 8 +-
drivers/char/drm/radeon_drv.h | 19 +-
drivers/char/drm/radeon_irq.c | 171 +-
drivers/char/drm/via_drv.c | 6 +-
drivers/char/drm/via_drv.h | 7 +-
drivers/char/drm/via_irq.c | 81 +-
drivers/char/ds1286.c | 3 +-
drivers/char/epca.c | 315 +-
drivers/char/esp.c | 611 +-
drivers/char/generic_serial.c | 19 +-
drivers/char/hpet.c | 10 +-
drivers/char/hvc_beat.c | 4 +-
drivers/char/hvsi.c | 52 +-
drivers/char/hw_random/core.c | 14 +-
drivers/char/hw_random/omap-rng.c | 26 +-
drivers/char/i8k.c | 12 +-
drivers/char/ip2/i2ellis.c | 194 +-
drivers/char/ip2/i2ellis.h | 58 +-
drivers/char/ip2/i2hw.h | 6 +-
drivers/char/ip2/i2lib.c | 141 +-
drivers/char/ip2/i2os.h | 127 -
drivers/char/ip2/ip2main.c | 144 +-
drivers/char/ipmi/Makefile | 4 -
drivers/char/ipmi/ipmi_bt_sm.c | 153 +-
drivers/char/ipmi/ipmi_kcs_sm.c | 153 +-
drivers/char/ipmi/ipmi_msghandler.c | 1508 ++--
drivers/char/ipmi/ipmi_poweroff.c | 206 +-
drivers/char/ipmi/ipmi_si_intf.c | 698 +-
drivers/char/ipmi/ipmi_si_sm.h | 89 +-
drivers/char/ipmi/ipmi_smic_sm.c | 149 +-
drivers/char/ipmi/ipmi_watchdog.c | 244 +-
drivers/char/isicom.c | 171 +-
drivers/char/istallion.c | 22 +-
drivers/char/keyboard.c | 13 +-
drivers/char/mem.c | 143 +-
drivers/char/misc.c | 40 +-
drivers/char/mmtimer.c | 424 +-
drivers/char/moxa.c | 2999 ++---
drivers/char/moxa.h | 304 +
drivers/char/mspec.c | 12 +-
drivers/char/mxser.c | 346 +-
drivers/char/mxser.h | 137 -
drivers/char/n_hdlc.c | 37 +-
drivers/char/n_r3964.c | 33 +-
drivers/char/n_tty.c | 160 +-
drivers/char/nozomi.c | 17 +-
drivers/char/pcmcia/cm4000_cs.c | 2 +-
drivers/char/pcmcia/cm4040_cs.c | 2 +-
drivers/char/pcmcia/ipwireless/hardware.c | 26 -
drivers/char/pcmcia/ipwireless/hardware.h | 2 -
drivers/char/pcmcia/ipwireless/network.c | 15 -
drivers/char/pcmcia/ipwireless/network.h | 3 -
drivers/char/pcmcia/synclink_cs.c | 158 +-
drivers/char/pty.c | 32 +-
drivers/char/random.c | 297 +-
drivers/char/rio/cirrus.h | 210 +-
drivers/char/rio/rio_linux.c | 10 +-
drivers/char/rio/rio_linux.h | 6 +-
drivers/char/rio/rioboot.c | 1 -
drivers/char/rio/riocmd.c | 20 +-
drivers/char/rio/rioctrl.c | 38 +-
drivers/char/rio/rioinit.c | 1 -
drivers/char/rio/riointr.c | 6 +-
drivers/char/rio/rioparam.c | 71 +-
drivers/char/rio/rioroute.c | 3 +-
drivers/char/rio/riotable.c | 1 -
drivers/char/rio/riotty.c | 26 +-
drivers/char/riscom8.c | 706 +-
drivers/char/rocket.c | 43 +-
drivers/char/rocket_int.h | 2 +-
drivers/char/rtc.c | 10 +-
drivers/char/serial167.c | 27 +-
drivers/char/snsc.c | 18 +-
drivers/char/snsc.h | 2 +-
drivers/char/snsc_event.c | 16 +-
drivers/char/sonypi.c | 4 +-
drivers/char/specialix.c | 121 +-
drivers/char/stallion.c | 19 +-
drivers/char/sx.c | 35 +-
drivers/char/synclink.c | 324 +-
drivers/char/synclink_gt.c | 195 +-
drivers/char/synclinkmp.c | 328 +-
drivers/char/sysrq.c | 49 +-
drivers/char/toshiba.c | 5 +-
drivers/char/tpm/Kconfig | 5 +-
drivers/char/tpm/tpm_nsc.c | 2 +-
drivers/char/tpm/tpm_tis.c | 2 +-
drivers/char/tty_audit.c | 64 +-
drivers/char/tty_io.c | 409 +-
drivers/char/tty_ioctl.c | 126 +-
drivers/char/viocons.c | 12 +-
drivers/char/viotape.c | 9 +-
drivers/char/vt.c | 36 +-
drivers/char/vt_ioctl.c | 452 +-
drivers/char/xilinx_hwicap/buffer_icap.c | 22 +-
drivers/char/xilinx_hwicap/buffer_icap.h | 5 +-
drivers/char/xilinx_hwicap/fifo_icap.c | 31 +-
drivers/char/xilinx_hwicap/fifo_icap.h | 1 +
drivers/char/xilinx_hwicap/xilinx_hwicap.c | 71 +-
drivers/char/xilinx_hwicap/xilinx_hwicap.h | 24 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/tcb_clksrc.c | 302 +
drivers/cpufreq/Kconfig | 9 +
drivers/cpufreq/cpufreq.c | 156 +-
drivers/cpufreq/cpufreq_powersave.c | 8 +-
drivers/cpufreq/cpufreq_stats.c | 8 +-
drivers/crypto/Kconfig | 15 +
drivers/crypto/padlock-aes.c | 320 +-
drivers/dma/Kconfig | 8 -
drivers/dma/dmaengine.c | 21 +-
drivers/dma/fsldma.c | 57 +-
drivers/dma/ioat_dma.c | 36 +-
drivers/dma/iop-adma.c | 60 +-
drivers/edac/Kconfig | 2 +-
drivers/edac/amd76x_edac.c | 7 +
drivers/edac/e752x_edac.c | 220 +-
drivers/edac/e7xxx_edac.c | 13 +-
drivers/edac/edac_core.h | 2 +-
drivers/edac/edac_device.c | 39 +-
drivers/edac/edac_mc.c | 29 +-
drivers/edac/edac_module.h | 1 -
drivers/edac/edac_pci.c | 14 +-
drivers/edac/edac_pci_sysfs.c | 11 +-
drivers/edac/i3000_edac.c | 13 +-
drivers/edac/i5000_edac.c | 14 +-
drivers/edac/i82443bxgx_edac.c | 7 +
drivers/edac/i82860_edac.c | 7 +
drivers/edac/i82875p_edac.c | 9 +
drivers/edac/i82975x_edac.c | 8 +-
drivers/edac/pasemi_edac.c | 7 +
drivers/edac/r82600_edac.c | 7 +
drivers/firewire/Kconfig | 5 +
drivers/firewire/fw-card.c | 50 +-
drivers/firewire/fw-cdev.c | 13 +-
drivers/firewire/fw-device.c | 264 +-
drivers/firewire/fw-device.h | 38 +-
drivers/firewire/fw-iso.c | 5 -
drivers/firewire/fw-ohci.c | 402 +-
drivers/firewire/fw-ohci.h | 2 +
drivers/firewire/fw-sbp2.c | 154 +-
drivers/firewire/fw-topology.c | 10 +-
drivers/firewire/fw-topology.h | 11 +-
drivers/firewire/fw-transaction.c | 76 +-
drivers/firewire/fw-transaction.h | 10 -
drivers/firmware/Kconfig | 29 +
drivers/firmware/Makefile | 2 +
drivers/firmware/dcdbas.c | 21 +-
drivers/firmware/dell_rbu.c | 12 +-
drivers/firmware/iscsi_ibft.c | 982 ++
drivers/firmware/iscsi_ibft_find.c | 84 +
drivers/gpio/gpiolib.c | 127 +-
drivers/gpio/mcp23s08.c | 1 +
drivers/gpio/pca953x.c | 29 +-
drivers/gpio/pcf857x.c | 37 +-
drivers/hid/hid-core.c | 25 +-
drivers/hid/hid-debug.c | 2 +-
drivers/hid/hid-input-quirks.c | 24 +-
drivers/hid/usbhid/Kconfig | 12 +-
drivers/hid/usbhid/Makefile | 3 +
drivers/hid/usbhid/hid-core.c | 71 +-
drivers/hid/usbhid/hid-ff.c | 3 +
drivers/hid/usbhid/hid-lg2ff.c | 114 +
drivers/hid/usbhid/hid-quirks.c | 89 +-
drivers/hid/usbhid/hiddev.c | 286 +-
drivers/hid/usbhid/usbhid.h | 3 +-
drivers/hwmon/ads7828.c | 2 +-
drivers/hwmon/adt7473.c | 45 +-
drivers/hwmon/asb100.c | 4 -
drivers/hwmon/f75375s.c | 29 +-
drivers/hwmon/lm75.c | 5 +-
drivers/hwmon/smsc47b397.c | 17 +-
drivers/hwmon/w83793.c | 26 +-
drivers/hwmon/w83l785ts.c | 4 +-
drivers/i2c/algos/Kconfig | 39 +-
drivers/i2c/algos/i2c-algo-pca.c | 126 +-
drivers/i2c/algos/i2c-algo-pca.h | 26 -
drivers/i2c/busses/Kconfig | 75 +-
drivers/i2c/busses/Makefile | 3 +
drivers/i2c/busses/i2c-amd756-s4882.c | 5 +-
drivers/i2c/busses/i2c-at91.c | 2 +-
drivers/i2c/busses/i2c-au1550.c | 1 +
drivers/i2c/busses/i2c-bfin-twi.c | 475 +-
drivers/i2c/busses/i2c-davinci.c | 9 +-
drivers/i2c/busses/i2c-gpio.c | 1 +
drivers/i2c/busses/i2c-ibm_iic.c | 197 +-
drivers/i2c/busses/i2c-iop3xx.c | 1 +
drivers/i2c/busses/i2c-ixp2000.c | 1 +
drivers/i2c/busses/i2c-mpc.c | 3 +
drivers/i2c/busses/i2c-ocores.c | 3 +
drivers/i2c/busses/i2c-omap.c | 1 +
drivers/i2c/busses/i2c-pca-isa.c | 53 +-
drivers/i2c/busses/i2c-pca-platform.c | 298 +
drivers/i2c/busses/i2c-piix4.c | 10 +-
drivers/i2c/busses/i2c-pmcmsp.c | 7 +-
drivers/i2c/busses/i2c-pnx.c | 45 +-
drivers/i2c/busses/i2c-powermac.c | 3 +
drivers/i2c/busses/i2c-pxa.c | 4 +-
drivers/i2c/busses/i2c-s3c2410.c | 5 +-
drivers/i2c/busses/i2c-sh7760.c | 577 +
drivers/i2c/busses/i2c-sh_mobile.c | 500 +
drivers/i2c/busses/i2c-simtec.c | 3 +
drivers/i2c/busses/i2c-sis5595.c | 14 +-
drivers/i2c/busses/i2c-sis630.c | 2 +-
drivers/i2c/busses/i2c-stub.c | 2 +-
drivers/i2c/busses/i2c-taos-evm.c | 3 +-
drivers/i2c/busses/i2c-versatile.c | 1 +
drivers/i2c/busses/scx200_acb.c | 2 +-
drivers/i2c/chips/Kconfig | 1 +
drivers/i2c/chips/ds1682.c | 10 +-
drivers/i2c/chips/isp1301_omap.c | 28 +-
drivers/i2c/chips/menelaus.c | 10 +-
drivers/i2c/chips/tps65010.c | 135 +-
drivers/i2c/chips/tsl2550.c | 10 +-
drivers/i2c/i2c-core.c | 55 +-
drivers/i2c/i2c-dev.c | 329 +-
drivers/ide/Kconfig | 80 +-
drivers/ide/Makefile | 4 +-
drivers/ide/arm/bast-ide.c | 25 +-
drivers/ide/arm/icside.c | 79 +-
drivers/ide/arm/ide_arm.c | 20 +-
drivers/ide/arm/palm_bk3710.c | 69 +-
drivers/ide/arm/rapide.c | 12 +-
drivers/ide/cris/Makefile | 3 -
drivers/ide/cris/ide-cris.c | 1071 --
drivers/ide/h8300/ide-h8300.c | 118 +-
drivers/ide/ide-acpi.c | 32 +-
drivers/ide/ide-cd.c | 956 +-
drivers/ide/ide-cd.h | 4 -
drivers/ide/ide-cd_verbose.c | 2 +-
drivers/ide/ide-disk.c | 159 +-
drivers/ide/ide-dma.c | 164 +-
drivers/ide/ide-floppy.c | 385 +-
drivers/ide/ide-generic.c | 119 +-
drivers/ide/ide-io.c | 94 +-
drivers/ide/ide-iops.c | 432 +-
drivers/ide/ide-lib.c | 46 +-
drivers/ide/ide-pnp.c | 45 +-
drivers/ide/ide-probe.c | 398 +-
drivers/ide/ide-proc.c | 195 +-
drivers/ide/ide-scan-pci.c | 11 +-
drivers/ide/ide-tape.c | 1681 +--
drivers/ide/ide-taskfile.c | 92 +-
drivers/ide/ide.c | 870 +-
drivers/ide/legacy/Makefile | 1 +
drivers/ide/legacy/ali14xx.c | 32 +-
drivers/ide/legacy/buddha.c | 18 +-
drivers/ide/legacy/dtc2278.c | 27 +-
drivers/ide/legacy/falconide.c | 40 +-
drivers/ide/legacy/gayle.c | 22 +-
drivers/ide/legacy/hd.c | 78 +-
drivers/ide/legacy/ht6560b.c | 54 +-
drivers/ide/legacy/ide-4drives.c | 72 +
drivers/ide/legacy/ide-cs.c | 84 +-
drivers/ide/legacy/ide_platform.c | 16 +-
drivers/ide/legacy/macide.c | 8 +-
drivers/ide/legacy/q40ide.c | 74 +-
drivers/ide/legacy/qd65xx.c | 223 +-
drivers/ide/legacy/qd65xx.h | 1 -
drivers/ide/legacy/umc8672.c | 80 +-
drivers/ide/mips/au1xxx-ide.c | 158 +-
drivers/ide/mips/swarm.c | 20 +-
drivers/ide/pci/aec62xx.c | 39 +-
drivers/ide/pci/alim15x3.c | 334 +-
drivers/ide/pci/amd74xx.c | 19 +-
drivers/ide/pci/atiixp.c | 29 +-
drivers/ide/pci/cmd640.c | 318 +-
drivers/ide/pci/cmd64x.c | 153 +-
drivers/ide/pci/cs5520.c | 29 +-
drivers/ide/pci/cs5530.c | 18 +-
drivers/ide/pci/cs5535.c | 24 +-
drivers/ide/pci/cy82c693.c | 97 +-
drivers/ide/pci/delkin_cb.c | 20 +-
drivers/ide/pci/generic.c | 10 +-
drivers/ide/pci/hpt34x.c | 17 +-
drivers/ide/pci/hpt366.c | 191 +-
drivers/ide/pci/it8213.c | 34 +-
drivers/ide/pci/it821x.c | 52 +-
drivers/ide/pci/jmicron.c | 29 +-
drivers/ide/pci/ns87415.c | 88 +-
drivers/ide/pci/opti621.c | 82 +-
drivers/ide/pci/pdc202xx_new.c | 31 +-
drivers/ide/pci/pdc202xx_old.c | 126 +-
drivers/ide/pci/piix.c | 18 +-
drivers/ide/pci/rz1000.c | 2 +-
drivers/ide/pci/sc1200.c | 39 +-
drivers/ide/pci/scc_pata.c | 335 +-
drivers/ide/pci/serverworks.c | 38 +-
drivers/ide/pci/sgiioc4.c | 153 +-
drivers/ide/pci/siimage.c | 719 +-
drivers/ide/pci/sis5513.c | 253 +-
drivers/ide/pci/sl82c105.c | 87 +-
drivers/ide/pci/slc90e66.c | 22 +-
drivers/ide/pci/tc86c001.c | 90 +-
drivers/ide/pci/triflex.c | 12 +-
drivers/ide/pci/trm290.c | 47 +-
drivers/ide/pci/via82cxxx.c | 20 +-
drivers/ide/ppc/mpc8xx.c | 142 +-
drivers/ide/ppc/pmac.c | 282 +-
drivers/ide/setup-pci.c | 246 +-
drivers/ieee1394/csr.c | 6 +-
drivers/ieee1394/dv1394.c | 6 +-
drivers/ieee1394/highlevel.c | 6 +-
drivers/ieee1394/ieee1394_core.c | 4 +-
drivers/ieee1394/iso.h | 2 +
drivers/ieee1394/nodemgr.c | 13 +-
drivers/ieee1394/ohci1394.c | 263 +-
drivers/ieee1394/pcilynx.c | 15 +-
drivers/ieee1394/raw1394.c | 11 +-
drivers/ieee1394/sbp2.c | 11 +-
drivers/ieee1394/video1394.c | 6 +-
drivers/infiniband/core/cm.c | 63 +-
drivers/infiniband/core/cma.c | 2 +-
drivers/infiniband/core/fmr_pool.c | 3 +-
drivers/infiniband/core/sysfs.c | 76 +-
drivers/infiniband/core/ucm.c | 62 +-
drivers/infiniband/core/ucma.c | 2 +-
drivers/infiniband/core/umem.c | 17 +-
drivers/infiniband/core/user_mad.c | 111 +-
drivers/infiniband/core/uverbs.h | 8 +-
drivers/infiniband/core/uverbs_cmd.c | 14 +-
drivers/infiniband/core/uverbs_main.c | 79 +-
drivers/infiniband/core/verbs.c | 14 +-
drivers/infiniband/hw/amso1100/c2.c | 80 +-
drivers/infiniband/hw/amso1100/c2.h | 17 +-
drivers/infiniband/hw/amso1100/c2_ae.c | 10 +-
drivers/infiniband/hw/amso1100/c2_alloc.c | 12 +-
drivers/infiniband/hw/amso1100/c2_cq.c | 4 +-
drivers/infiniband/hw/amso1100/c2_intr.c | 6 +-
drivers/infiniband/hw/amso1100/c2_mm.c | 2 +-
drivers/infiniband/hw/amso1100/c2_mq.c | 4 +-
drivers/infiniband/hw/amso1100/c2_mq.h | 2 +-
drivers/infiniband/hw/amso1100/c2_provider.c | 135 +-
drivers/infiniband/hw/amso1100/c2_qp.c | 30 +-
drivers/infiniband/hw/amso1100/c2_rnic.c | 31 +-
drivers/infiniband/hw/amso1100/c2_vq.c | 2 +-
drivers/infiniband/hw/amso1100/c2_wr.h | 212 +-
drivers/infiniband/hw/cxgb3/cxio_dbg.c | 24 +-
drivers/infiniband/hw/cxgb3/cxio_hal.c | 115 +-
drivers/infiniband/hw/cxgb3/cxio_hal.h | 5 +-
drivers/infiniband/hw/cxgb3/cxio_resource.c | 12 +-
drivers/infiniband/hw/cxgb3/cxio_wr.h | 21 +-
drivers/infiniband/hw/cxgb3/iwch.c | 7 +-
drivers/infiniband/hw/cxgb3/iwch.h | 3 +-
drivers/infiniband/hw/cxgb3/iwch_cm.c | 335 +-
drivers/infiniband/hw/cxgb3/iwch_cm.h | 6 +-
drivers/infiniband/hw/cxgb3/iwch_cq.c | 4 +-
drivers/infiniband/hw/cxgb3/iwch_ev.c | 12 +-
drivers/infiniband/hw/cxgb3/iwch_mem.c | 6 +-
drivers/infiniband/hw/cxgb3/iwch_provider.c | 150 +-
drivers/infiniband/hw/cxgb3/iwch_provider.h | 7 +-
drivers/infiniband/hw/cxgb3/iwch_qp.c | 115 +-
drivers/infiniband/hw/ehca/ehca_av.c | 31 -
drivers/infiniband/hw/ehca/ehca_classes.h | 8 +-
drivers/infiniband/hw/ehca/ehca_cq.c | 30 +-
drivers/infiniband/hw/ehca/ehca_eq.c | 35 +-
drivers/infiniband/hw/ehca/ehca_hca.c | 128 +-
drivers/infiniband/hw/ehca/ehca_irq.c | 2 +-
drivers/infiniband/hw/ehca/ehca_main.c | 128 +-
drivers/infiniband/hw/ehca/ehca_mrmw.c | 60 +-
drivers/infiniband/hw/ehca/ehca_pd.c | 11 -
drivers/infiniband/hw/ehca/ehca_qp.c | 90 +-
drivers/infiniband/hw/ehca/ehca_reqs.c | 53 +-
drivers/infiniband/hw/ehca/ehca_tools.h | 16 +-
drivers/infiniband/hw/ehca/ehca_uverbs.c | 25 +-
drivers/infiniband/hw/ehca/hcp_if.c | 23 +-
drivers/infiniband/hw/ipath/Kconfig | 2 +-
drivers/infiniband/hw/ipath/Makefile | 7 +-
drivers/infiniband/hw/ipath/ipath_7220.h | 57 +
drivers/infiniband/hw/ipath/ipath_common.h | 54 +-
drivers/infiniband/hw/ipath/ipath_debug.h | 2 +
drivers/infiniband/hw/ipath/ipath_diag.c | 45 +-
drivers/infiniband/hw/ipath/ipath_driver.c | 1041 ++-
drivers/infiniband/hw/ipath/ipath_eeprom.c | 428 +-
drivers/infiniband/hw/ipath/ipath_file_ops.c | 220 +-
drivers/infiniband/hw/ipath/ipath_iba6110.c | 51 +-
drivers/infiniband/hw/ipath/ipath_iba6120.c | 203 +-
drivers/infiniband/hw/ipath/ipath_iba7220.c | 2566 +++++
drivers/infiniband/hw/ipath/ipath_init_chip.c | 312 +-
drivers/infiniband/hw/ipath/ipath_intr.c | 656 +-
drivers/infiniband/hw/ipath/ipath_kernel.h | 312 +-
drivers/infiniband/hw/ipath/ipath_mad.c | 110 +-
drivers/infiniband/hw/ipath/ipath_mr.c | 3 +-
drivers/infiniband/hw/ipath/ipath_qp.c | 59 +-
drivers/infiniband/hw/ipath/ipath_rc.c | 67 +-
drivers/infiniband/hw/ipath/ipath_registers.h | 168 +-
drivers/infiniband/hw/ipath/ipath_ruc.c | 22 +-
drivers/infiniband/hw/ipath/ipath_sd7220.c | 1462 +++
drivers/infiniband/hw/ipath/ipath_sd7220_img.c | 1082 ++
drivers/infiniband/hw/ipath/ipath_sdma.c | 790 ++
drivers/infiniband/hw/ipath/ipath_srq.c | 5 +-
drivers/infiniband/hw/ipath/ipath_stats.c | 33 +-
drivers/infiniband/hw/ipath/ipath_sysfs.c | 104 +-
drivers/infiniband/hw/ipath/ipath_uc.c | 8 +-
drivers/infiniband/hw/ipath/ipath_ud.c | 7 +-
drivers/infiniband/hw/ipath/ipath_user_sdma.c | 879 ++
drivers/infiniband/hw/ipath/ipath_user_sdma.h | 54 +
drivers/infiniband/hw/ipath/ipath_verbs.c | 451 +-
drivers/infiniband/hw/ipath/ipath_verbs.h | 32 +-
drivers/infiniband/hw/mlx4/cq.c | 327 +-
drivers/infiniband/hw/mlx4/doorbell.c | 124 +-
drivers/infiniband/hw/mlx4/mad.c | 2 +-
drivers/infiniband/hw/mlx4/main.c | 77 +-
drivers/infiniband/hw/mlx4/mlx4_ib.h | 48 +-
drivers/infiniband/hw/mlx4/mr.c | 3 +-
drivers/infiniband/hw/mlx4/qp.c | 125 +-
drivers/infiniband/hw/mlx4/srq.c | 8 +-
drivers/infiniband/hw/mthca/mthca_cmd.c | 6 +-
drivers/infiniband/hw/mthca/mthca_cmd.h | 1 +
drivers/infiniband/hw/mthca/mthca_cq.c | 14 +-
drivers/infiniband/hw/mthca/mthca_dev.h | 17 +-
drivers/infiniband/hw/mthca/mthca_eq.c | 4 +-
drivers/infiniband/hw/mthca/mthca_mad.c | 2 +-
drivers/infiniband/hw/mthca/mthca_main.c | 15 +-
drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +-
drivers/infiniband/hw/mthca/mthca_mr.c | 13 -
drivers/infiniband/hw/mthca/mthca_profile.c | 4 +-
drivers/infiniband/hw/mthca/mthca_profile.h | 2 +-
drivers/infiniband/hw/mthca/mthca_provider.c | 73 +-
drivers/infiniband/hw/mthca/mthca_provider.h | 1 +
drivers/infiniband/hw/mthca/mthca_qp.c | 28 +-
drivers/infiniband/hw/mthca/mthca_user.h | 10 +
drivers/infiniband/hw/mthca/mthca_wqe.h | 18 +-
drivers/infiniband/hw/nes/Kconfig | 1 +
drivers/infiniband/hw/nes/nes.c | 42 +-
drivers/infiniband/hw/nes/nes.h | 38 +-
drivers/infiniband/hw/nes/nes_cm.c | 166 +-
drivers/infiniband/hw/nes/nes_cm.h | 35 -
drivers/infiniband/hw/nes/nes_hw.c | 438 +-
drivers/infiniband/hw/nes/nes_hw.h | 21 +-
drivers/infiniband/hw/nes/nes_nic.c | 231 +-
drivers/infiniband/hw/nes/nes_utils.c | 16 +-
drivers/infiniband/hw/nes/nes_verbs.c | 89 +-
drivers/infiniband/ulp/ipoib/Makefile | 3 +-
drivers/infiniband/ulp/ipoib/ipoib.h | 39 +-
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 23 +-
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 99 +
drivers/infiniband/ulp/ipoib/ipoib_ib.c | 341 +-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 55 +-
drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 3 +-
drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 58 +-
drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 +
drivers/infiniband/ulp/iser/iscsi_iser.c | 4 +-
drivers/infiniband/ulp/iser/iscsi_iser.h | 7 +
drivers/infiniband/ulp/iser/iser_initiator.c | 4 +-
drivers/infiniband/ulp/iser/iser_memory.c | 9 +-
drivers/infiniband/ulp/iser/iser_verbs.c | 5 +-
drivers/infiniband/ulp/srp/ib_srp.c | 188 +-
drivers/infiniband/ulp/srp/ib_srp.h | 4 +-
drivers/input/Kconfig | 9 +
drivers/input/Makefile | 2 +
drivers/input/input-polldev.c | 6 +-
drivers/input/input.c | 18 +-
drivers/input/joystick/Kconfig | 12 +
drivers/input/joystick/Makefile | 3 +-
drivers/input/joystick/iforce/iforce-usb.c | 2 +-
drivers/input/joystick/xpad.c | 233 +-
drivers/input/joystick/zhenhua.c | 243 +
drivers/input/keyboard/Kconfig | 9 +
drivers/input/keyboard/Makefile | 1 +
drivers/input/keyboard/aaed2000_kbd.c | 4 +
drivers/input/keyboard/bf54x-keys.c | 37 +-
drivers/input/keyboard/corgikbd.c | 3 +
drivers/input/keyboard/gpio_keys.c | 5 +-
drivers/input/keyboard/jornada680_kbd.c | 2 +
drivers/input/keyboard/jornada720_kbd.c | 4 +
drivers/input/keyboard/locomokbd.c | 73 +-
drivers/input/keyboard/omap-keypad.c | 9 +-
drivers/input/keyboard/pxa27x_keypad.c | 4 +
drivers/input/keyboard/sh_keysc.c | 280 +
drivers/input/keyboard/spitzkbd.c | 2 +
drivers/input/keyboard/tosakbd.c | 23 +-
drivers/input/misc/Kconfig | 1 +
drivers/input/misc/cobalt_btns.c | 3 +
drivers/input/misc/sparcspkr.c | 262 +-
drivers/input/mouse/gpio_mouse.c | 4 +
drivers/input/serio/Kconfig | 10 +
drivers/input/serio/Makefile | 1 +
drivers/input/serio/at32psif.c | 375 +
drivers/input/serio/hp_sdc.c | 1 +
drivers/input/serio/hp_sdc_mlc.c | 2 +-
drivers/input/serio/i8042-x86ia64io.h | 12 +-
drivers/input/serio/rpckbd.c | 2 +
drivers/input/serio/serport.c | 2 +-
drivers/input/tablet/Kconfig | 10 +-
drivers/input/tablet/aiptek.c | 18 +-
drivers/input/tablet/gtco.c | 22 +-
drivers/input/tablet/kbtab.c | 4 +-
drivers/input/tablet/wacom.h | 3 +
drivers/input/tablet/wacom_sys.c | 76 +-
drivers/input/tablet/wacom_wac.c | 2 +
drivers/input/touchscreen/Kconfig | 53 +
drivers/input/touchscreen/Makefile | 7 +
drivers/input/touchscreen/ads7846.c | 62 +-
drivers/input/touchscreen/corgi_ts.c | 3 +
drivers/input/touchscreen/jornada720_ts.c | 4 +
drivers/input/touchscreen/mainstone-wm97xx.c | 302 +
drivers/input/touchscreen/ucb1400_ts.c | 4 -
drivers/input/touchscreen/usbtouchscreen.c | 31 +-
drivers/input/touchscreen/wm9705.c | 353 +
drivers/input/touchscreen/wm9712.c | 462 +
drivers/input/touchscreen/wm9713.c | 460 +
drivers/input/touchscreen/wm97xx-core.c | 829 ++
drivers/input/xen-kbdfront.c | 340 +
drivers/isdn/capi/capi.c | 43 +-
drivers/isdn/capi/capidrv.c | 28 +-
drivers/isdn/capi/capifs.c | 5 +-
drivers/isdn/capi/capilib.c | 4 +-
drivers/isdn/capi/capiutil.c | 2 +-
drivers/isdn/capi/kcapi.c | 22 +-
drivers/isdn/capi/kcapi.h | 2 +-
drivers/isdn/capi/kcapi_proc.c | 24 +-
drivers/isdn/divert/divert_procfs.c | 5 +-
drivers/isdn/gigaset/ser-gigaset.c | 15 +-
drivers/isdn/hardware/avm/b1.c | 10 +-
drivers/isdn/hardware/avm/b1dma.c | 10 +-
drivers/isdn/hardware/avm/b1isa.c | 4 +-
drivers/isdn/hardware/avm/b1pci.c | 4 +-
drivers/isdn/hardware/avm/b1pcmcia.c | 4 +-
drivers/isdn/hardware/avm/c4.c | 12 +-
drivers/isdn/hardware/avm/t1isa.c | 4 +-
drivers/isdn/hardware/avm/t1pci.c | 4 +-
drivers/isdn/hardware/eicon/divasmain.c | 2 +-
drivers/isdn/hardware/eicon/divasproc.c | 8 +-
drivers/isdn/hardware/eicon/message.c | 12 +-
drivers/isdn/hisax/asuscom.c | 7 +-
drivers/isdn/hisax/avm_a1.c | 27 +-
drivers/isdn/hisax/avm_pci.c | 2 +-
drivers/isdn/hisax/bkm_a4t.c | 19 +-
drivers/isdn/hisax/bkm_a8.c | 31 +-
drivers/isdn/hisax/config.c | 14 +-
drivers/isdn/hisax/diva.c | 2 +-
drivers/isdn/hisax/elsa.c | 6 +-
drivers/isdn/hisax/elsa_ser.c | 4 +-
drivers/isdn/hisax/gazel.c | 5 +-
drivers/isdn/hisax/hfc_pci.c | 2 -
drivers/isdn/hisax/hfc_sx.c | 4 +-
drivers/isdn/hisax/hfc_usb.c | 6 +-
drivers/isdn/hisax/hfcscard.c | 2 +-
drivers/isdn/hisax/hisax.h | 2 +-
drivers/isdn/hisax/hisax_cfg.h | 2 +
drivers/isdn/hisax/hisax_debug.h | 6 +-
drivers/isdn/hisax/hisax_fcpcipnp.c | 12 +-
drivers/isdn/hisax/isurf.c | 13 +-
drivers/isdn/hisax/ix1_micro.c | 11 +-
drivers/isdn/hisax/mic.c | 5 +-
drivers/isdn/hisax/netjet.h | 2 -
drivers/isdn/hisax/niccy.c | 21 +-
drivers/isdn/hisax/nj_s.c | 3 +-
drivers/isdn/hisax/nj_u.c | 4 +-
drivers/isdn/hisax/s0box.c | 13 +-
drivers/isdn/hisax/saphir.c | 8 +-
drivers/isdn/hisax/sedlbauer.c | 2 +-
drivers/isdn/hisax/sportster.c | 11 +-
drivers/isdn/hisax/st5481.h | 10 +-
drivers/isdn/hisax/st5481_usb.c | 2 +-
drivers/isdn/hisax/teleint.c | 5 +-
drivers/isdn/hisax/teles3.c | 2 +-
drivers/isdn/hisax/telespci.c | 5 +-
drivers/isdn/hisax/w6692.c | 2 -
drivers/isdn/hysdn/hysdn_procconf.c | 10 +-
drivers/isdn/hysdn/hysdn_proclog.c | 8 +-
drivers/isdn/i4l/isdn_common.c | 2 +-
drivers/isdn/i4l/isdn_net.h | 6 +-
drivers/isdn/i4l/isdn_ppp.c | 32 +-
drivers/isdn/i4l/isdn_tty.c | 36 +-
drivers/leds/Kconfig | 25 +-
drivers/leds/Makefile | 3 +-
drivers/leds/led-class.c | 25 +-
drivers/leds/led-core.c | 4 +-
drivers/leds/led-triggers.c | 120 +-
drivers/leds/leds-clevo-mail.c | 16 +-
drivers/leds/leds-cobalt-qube.c | 2 +-
drivers/leds/leds-cobalt-raq.c | 6 +-
drivers/leds/leds-corgi.c | 11 +-
drivers/leds/leds-fsg.c | 261 +
drivers/leds/leds-gpio.c | 15 +
drivers/leds/leds-h1940.c | 64 +-
drivers/leds/leds-hp6xx.c | 6 +-
drivers/leds/leds-s3c24xx.c | 4 +-
drivers/leds/leds-spitz.c | 11 +-
drivers/leds/leds-tosa.c | 132 -
drivers/leds/leds.h | 11 +-
drivers/leds/ledtrig-default-on.c | 45 +
drivers/leds/ledtrig-ide-disk.c | 2 +-
drivers/leds/ledtrig-timer.c | 35 +-
drivers/lguest/lg.h | 1 -
drivers/lguest/lguest_device.c | 68 +-
drivers/lguest/lguest_user.c | 4 +-
drivers/macintosh/Kconfig | 8 +
drivers/macintosh/Makefile | 5 +
drivers/macintosh/adb.c | 30 +-
drivers/macintosh/mac_hid.c | 6 +
drivers/macintosh/mediabay.c | 17 +-
drivers/macintosh/therm_pm72.c | 31 +-
drivers/macintosh/windfarm_lm75_sensor.c | 6 +
drivers/macintosh/windfarm_max6690_sensor.c | 20 +-
drivers/macintosh/windfarm_pm112.c | 3 +-
drivers/macintosh/windfarm_pm121.c | 1040 ++
drivers/macintosh/windfarm_pm81.c | 4 +-
drivers/macintosh/windfarm_pm91.c | 3 +-
drivers/macintosh/windfarm_smu_controls.c | 4 +
drivers/macintosh/windfarm_smu_sat.c | 10 +-
drivers/mca/mca-legacy.c | 18 -
drivers/mca/mca-proc.c | 2 +-
drivers/md/Makefile | 6 +-
drivers/md/dm-emc.c | 2 -
drivers/md/dm-exception-store.c | 10 +-
drivers/md/dm-io.c | 38 +-
drivers/md/dm-io.h | 79 -
drivers/md/dm-kcopyd.c | 654 ++
drivers/md/dm-log.c | 254 +-
drivers/md/dm-log.h | 131 -
drivers/md/dm-mpath-hp-sw.c | 1 -
drivers/md/dm-mpath-rdac.c | 1 -
drivers/md/dm-raid1.c | 132 +-
drivers/md/dm-snap.c | 22 +-
drivers/md/dm-snap.h | 4 +-
drivers/md/dm-table.c | 47 +-
drivers/md/dm-uevent.c | 22 +-
drivers/md/dm.c | 16 +-
drivers/md/dm.h | 98 +-
drivers/md/kcopyd.c | 708 --
drivers/md/kcopyd.h | 42 -
drivers/md/md.c | 131 +-
drivers/md/multipath.c | 3 +-
drivers/md/raid1.c | 31 +-
drivers/md/raid10.c | 33 +-
drivers/md/raid5.c | 191 +-
drivers/md/raid6algos.c | 3 +-
drivers/media/Kconfig | 169 +-
drivers/media/Makefile | 10 +-
drivers/media/common/Makefile | 1 +
drivers/media/common/ir-functions.c | 2 +-
drivers/media/common/ir-keymaps.c | 172 +-
drivers/media/common/saa7146_core.c | 8 +-
drivers/media/common/saa7146_i2c.c | 6 +-
drivers/media/common/saa7146_vbi.c | 4 +-
drivers/media/common/saa7146_video.c | 4 +-
drivers/media/common/tuners/Kconfig | 151 +
drivers/media/common/tuners/Makefile | 25 +
drivers/media/common/tuners/mt2060.c | 369 +
drivers/media/common/tuners/mt2060.h | 43 +
drivers/media/common/tuners/mt2060_priv.h | 105 +
drivers/media/common/tuners/mt20xx.c | 670 ++
drivers/media/common/tuners/mt20xx.h | 37 +
drivers/media/common/tuners/mt2131.c | 314 +
drivers/media/common/tuners/mt2131.h | 54 +
drivers/media/common/tuners/mt2131_priv.h | 49 +
drivers/media/common/tuners/mt2266.c | 351 +
drivers/media/common/tuners/mt2266.h | 37 +
drivers/media/common/tuners/qt1010.c | 485 +
drivers/media/common/tuners/qt1010.h | 53 +
drivers/media/common/tuners/qt1010_priv.h | 105 +
drivers/media/common/tuners/tda18271-common.c | 666 ++
drivers/media/common/tuners/tda18271-fe.c | 1153 ++
drivers/media/common/tuners/tda18271-maps.c | 1313 +++
drivers/media/common/tuners/tda18271-priv.h | 220 +
drivers/media/common/tuners/tda18271.h | 99 +
drivers/media/common/tuners/tda827x.c | 852 ++
drivers/media/common/tuners/tda827x.h | 69 +
drivers/media/common/tuners/tda8290.c | 804 ++
drivers/media/common/tuners/tda8290.h | 57 +
drivers/media/common/tuners/tda9887.c | 717 ++
drivers/media/common/tuners/tda9887.h | 38 +
drivers/media/common/tuners/tea5761.c | 324 +
drivers/media/common/tuners/tea5761.h | 47 +
drivers/media/common/tuners/tea5767.c | 474 +
drivers/media/common/tuners/tea5767.h | 66 +
drivers/media/common/tuners/tuner-i2c.h | 173 +
drivers/media/common/tuners/tuner-simple.c | 1093 ++
drivers/media/common/tuners/tuner-simple.h | 39 +
drivers/media/common/tuners/tuner-types.c | 1652 +++
drivers/media/common/tuners/tuner-xc2028-types.h | 141 +
drivers/media/common/tuners/tuner-xc2028.c | 1227 ++
drivers/media/common/tuners/tuner-xc2028.h | 63 +
drivers/media/common/tuners/xc5000.c | 964 ++
drivers/media/common/tuners/xc5000.h | 63 +
drivers/media/common/tuners/xc5000_priv.h | 36 +
drivers/media/dvb/Kconfig | 4 +-
drivers/media/dvb/b2c2/Kconfig | 5 +
drivers/media/dvb/b2c2/Makefile | 2 +
drivers/media/dvb/b2c2/flexcop-common.h | 17 +-
drivers/media/dvb/b2c2/flexcop-dma.c | 4 +-
drivers/media/dvb/b2c2/flexcop-eeprom.c | 9 +-
drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 211 +-
drivers/media/dvb/b2c2/flexcop-i2c.c | 180 +-
drivers/media/dvb/b2c2/flexcop-misc.c | 2 +
drivers/media/dvb/b2c2/flexcop-pci.c | 2 +-
drivers/media/dvb/b2c2/flexcop-reg.h | 2 +
drivers/media/dvb/b2c2/flexcop-sram.c | 28 +-
drivers/media/dvb/b2c2/flexcop-usb.c | 17 +-
drivers/media/dvb/b2c2/flexcop.c | 18 +-
drivers/media/dvb/bt8xx/Kconfig | 2 +-
drivers/media/dvb/bt8xx/Makefile | 5 +-
drivers/media/dvb/bt8xx/dst.c | 4 +-
drivers/media/dvb/bt8xx/dst_ca.c | 10 +-
drivers/media/dvb/bt8xx/dvb-bt8xx.c | 23 +-
drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 +-
drivers/media/dvb/cinergyT2/cinergyT2.c | 9 +-
drivers/media/dvb/dvb-core/Kconfig | 34 -
drivers/media/dvb/dvb-core/demux.h | 2 +
drivers/media/dvb/dvb-core/dmxdev.c | 87 +-
drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 36 +-
drivers/media/dvb/dvb-core/dvb_demux.c | 6 +-
drivers/media/dvb/dvb-core/dvb_frontend.c | 32 +-
drivers/media/dvb/dvb-core/dvb_net.c | 32 +-
drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 6 +-
drivers/media/dvb/dvb-core/dvb_ringbuffer.h | 8 +
drivers/media/dvb/dvb-core/dvbdev.c | 47 +-
drivers/media/dvb/dvb-core/dvbdev.h | 15 +-
drivers/media/dvb/dvb-usb/Kconfig | 25 +-
drivers/media/dvb/dvb-usb/Makefile | 2 +-
drivers/media/dvb/dvb-usb/a800.c | 6 +-
drivers/media/dvb/dvb-usb/af9005.c | 5 +-
drivers/media/dvb/dvb-usb/au6610.c | 6 +-
drivers/media/dvb/dvb-usb/cxusb.c | 51 +-
drivers/media/dvb/dvb-usb/dib0700.h | 4 +
drivers/media/dvb/dvb-usb/dib0700_core.c | 9 +-
drivers/media/dvb/dvb-usb/dib0700_devices.c | 325 +-
drivers/media/dvb/dvb-usb/dibusb-mb.c | 14 +-
drivers/media/dvb/dvb-usb/dibusb-mc.c | 5 +-
drivers/media/dvb/dvb-usb/digitv.c | 8 +-
drivers/media/dvb/dvb-usb/dtt200u.c | 17 +-
drivers/media/dvb/dvb-usb/dvb-usb-common.h | 3 +-
drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 9 +-
drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 13 +-
drivers/media/dvb/dvb-usb/dvb-usb-init.c | 16 +-
drivers/media/dvb/dvb-usb/dvb-usb.h | 5 +-
drivers/media/dvb/dvb-usb/gl861.c | 6 +-
drivers/media/dvb/dvb-usb/gp8psk-fe.c | 4 +-
drivers/media/dvb/dvb-usb/gp8psk.c | 5 +-
drivers/media/dvb/dvb-usb/m920x.c | 34 +-
drivers/media/dvb/dvb-usb/nova-t-usb2.c | 5 +-
drivers/media/dvb/dvb-usb/opera1.c | 8 +-
drivers/media/dvb/dvb-usb/ttusb2.c | 67 +-
drivers/media/dvb/dvb-usb/umt-010.c | 5 +-
drivers/media/dvb/dvb-usb/vp702x-fe.c | 18 +-
drivers/media/dvb/dvb-usb/vp702x.c | 5 +-
drivers/media/dvb/dvb-usb/vp7045.c | 6 +-
drivers/media/dvb/frontends/Kconfig | 137 +-
drivers/media/dvb/frontends/Makefile | 16 +-
drivers/media/dvb/frontends/au8522.c | 692 ++
drivers/media/dvb/frontends/au8522.h | 56 +
drivers/media/dvb/frontends/bcm3510.c | 4 +-
drivers/media/dvb/frontends/bcm3510.h | 2 +-
drivers/media/dvb/frontends/bsbe1.h | 58 +-
drivers/media/dvb/frontends/bsru6.h | 2 +-
drivers/media/dvb/frontends/cx22700.c | 12 +-
drivers/media/dvb/frontends/cx22700.h | 2 +-
drivers/media/dvb/frontends/cx22702.c | 26 +-
drivers/media/dvb/frontends/cx22702.h | 2 +-
drivers/media/dvb/frontends/cx24110.c | 6 +-
drivers/media/dvb/frontends/cx24110.h | 2 +-
drivers/media/dvb/frontends/cx24113.h | 48 +
drivers/media/dvb/frontends/cx24123.c | 304 +-
drivers/media/dvb/frontends/cx24123.h | 21 +-
drivers/media/dvb/frontends/dib3000.h | 2 +-
drivers/media/dvb/frontends/dib3000mc.h | 2 +-
drivers/media/dvb/frontends/dib7000p.c | 8 +-
drivers/media/dvb/frontends/dib7000p.h | 2 +
drivers/media/dvb/frontends/dvb-pll.c | 260 +-
drivers/media/dvb/frontends/dvb-pll.h | 33 +-
drivers/media/dvb/frontends/isl6405.c | 164 +
drivers/media/dvb/frontends/isl6405.h | 74 +
drivers/media/dvb/frontends/isl6421.h | 2 +-
drivers/media/dvb/frontends/itd1000.c | 400 +
drivers/media/dvb/frontends/itd1000.h | 42 +
drivers/media/dvb/frontends/itd1000_priv.h | 88 +
drivers/media/dvb/frontends/l64781.c | 2 +-
drivers/media/dvb/frontends/l64781.h | 2 +-
drivers/media/dvb/frontends/lgdt330x.c | 40 +-
drivers/media/dvb/frontends/lgdt330x.h | 2 +-
drivers/media/dvb/frontends/lnbp21.h | 2 +-
drivers/media/dvb/frontends/mt2060.c | 369 -
drivers/media/dvb/frontends/mt2060.h | 43 -
drivers/media/dvb/frontends/mt2060_priv.h | 105 -
drivers/media/dvb/frontends/mt2131.c | 314 -
drivers/media/dvb/frontends/mt2131.h | 54 -
drivers/media/dvb/frontends/mt2131_priv.h | 49 -
drivers/media/dvb/frontends/mt2266.c | 351 -
drivers/media/dvb/frontends/mt2266.h | 37 -
drivers/media/dvb/frontends/mt312.c | 151 +-
drivers/media/dvb/frontends/mt312.h | 5 +-
drivers/media/dvb/frontends/mt312_priv.h | 5 +-
drivers/media/dvb/frontends/mt352.c | 8 +-
drivers/media/dvb/frontends/mt352.h | 2 +-
drivers/media/dvb/frontends/nxt200x.c | 26 +-
drivers/media/dvb/frontends/nxt200x.h | 2 +-
drivers/media/dvb/frontends/nxt6000.c | 2 +-
drivers/media/dvb/frontends/nxt6000.h | 2 +-
drivers/media/dvb/frontends/or51132.c | 10 +-
drivers/media/dvb/frontends/or51132.h | 2 +-
drivers/media/dvb/frontends/or51211.c | 6 +-
drivers/media/dvb/frontends/or51211.h | 2 +-
drivers/media/dvb/frontends/qt1010.c | 485 -
drivers/media/dvb/frontends/qt1010.h | 53 -
drivers/media/dvb/frontends/qt1010_priv.h | 105 -
drivers/media/dvb/frontends/s5h1409.c | 50 +-
drivers/media/dvb/frontends/s5h1409.h | 2 +-
drivers/media/dvb/frontends/s5h1411.c | 888 ++
drivers/media/dvb/frontends/s5h1411.h | 90 +
drivers/media/dvb/frontends/s5h1420.c | 523 +-
drivers/media/dvb/frontends/s5h1420.h | 64 +-
drivers/media/dvb/frontends/s5h1420_priv.h | 102 +
drivers/media/dvb/frontends/sp8870.c | 38 +-
drivers/media/dvb/frontends/sp8870.h | 2 +-
drivers/media/dvb/frontends/sp887x.c | 18 +-
drivers/media/dvb/frontends/sp887x.h | 2 +-
drivers/media/dvb/frontends/stv0297.c | 14 +-
drivers/media/dvb/frontends/stv0297.h | 2 +-
drivers/media/dvb/frontends/stv0299.c | 85 +-
drivers/media/dvb/frontends/stv0299.h | 13 +-
drivers/media/dvb/frontends/tda10021.c | 4 +-
drivers/media/dvb/frontends/tda10023.c | 4 +-
drivers/media/dvb/frontends/tda1002x.h | 4 +-
drivers/media/dvb/frontends/tda10048.c | 841 ++
drivers/media/dvb/frontends/tda10048.h | 63 +
drivers/media/dvb/frontends/tda1004x.c | 56 +-
drivers/media/dvb/frontends/tda1004x.h | 5 +-
drivers/media/dvb/frontends/tda10086.c | 147 +-
drivers/media/dvb/frontends/tda10086.h | 14 +-
drivers/media/dvb/frontends/tda18271-common.c | 653 --
drivers/media/dvb/frontends/tda18271-fe.c | 1225 --
drivers/media/dvb/frontends/tda18271-priv.h | 212 -
drivers/media/dvb/frontends/tda18271-tables.c | 1285 ---
drivers/media/dvb/frontends/tda18271.h | 78 -
drivers/media/dvb/frontends/tda8083.c | 4 +-
drivers/media/dvb/frontends/tda8083.h | 2 +-
drivers/media/dvb/frontends/tda826x.c | 25 +-
drivers/media/dvb/frontends/tda826x.h | 2 +-
drivers/media/dvb/frontends/tda827x.c | 849 --
drivers/media/dvb/frontends/tda827x.h | 69 -
drivers/media/dvb/frontends/tua6100.c | 2 +-
drivers/media/dvb/frontends/tua6100.h | 2 +-
drivers/media/dvb/frontends/ves1820.c | 4 +-
drivers/media/dvb/frontends/ves1820.h | 2 +-
drivers/media/dvb/frontends/ves1x93.c | 8 +-
drivers/media/dvb/frontends/ves1x93.h | 2 +-
drivers/media/dvb/frontends/xc5000.c | 964 --
drivers/media/dvb/frontends/xc5000.h | 63 -
drivers/media/dvb/frontends/xc5000_priv.h | 36 -
drivers/media/dvb/frontends/zl10353.c | 8 +-
drivers/media/dvb/frontends/zl10353.h | 2 +-
drivers/media/dvb/pluto2/pluto2.c | 5 +-
drivers/media/dvb/ttpci/av7110.c | 16 +-
drivers/media/dvb/ttpci/av7110.h | 2 +-
drivers/media/dvb/ttpci/av7110_hw.c | 42 +-
drivers/media/dvb/ttpci/av7110_ir.c | 6 +-
drivers/media/dvb/ttpci/av7110_v4l.c | 4 +-
drivers/media/dvb/ttpci/budget-av.c | 16 +-
drivers/media/dvb/ttpci/budget-ci.c | 6 +-
drivers/media/dvb/ttpci/budget-core.c | 9 +-
drivers/media/dvb/ttpci/budget.c | 111 +-
drivers/media/dvb/ttpci/budget.h | 3 +-
drivers/media/dvb/ttpci/ttpci-eeprom.c | 2 +-
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 58 +-
drivers/media/dvb/ttusb-dec/ttusb_dec.c | 112 +-
drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 4 +-
drivers/media/radio/dsbr100.c | 2 +
drivers/media/radio/miropcm20-radio.c | 2 +
drivers/media/radio/miropcm20-rds.c | 2 +-
drivers/media/radio/radio-aimslab.c | 3 +-
drivers/media/radio/radio-aztech.c | 2 +
drivers/media/radio/radio-cadet.c | 12 +-
drivers/media/radio/radio-gemtek-pci.c | 2 +
drivers/media/radio/radio-gemtek.c | 2 +
drivers/media/radio/radio-maestro.c | 2 +
drivers/media/radio/radio-maxiradio.c | 2 +
drivers/media/radio/radio-rtrack2.c | 2 +
drivers/media/radio/radio-sf16fmi.c | 2 +
drivers/media/radio/radio-sf16fmr2.c | 104 +-
drivers/media/radio/radio-si470x.c | 59 +-
drivers/media/radio/radio-terratec.c | 2 +
drivers/media/radio/radio-trust.c | 2 +
drivers/media/radio/radio-typhoon.c | 44 +-
drivers/media/radio/radio-zoltrix.c | 2 +
drivers/media/video/Kconfig | 106 +-
drivers/media/video/Makefile | 22 +-
drivers/media/video/adv7170.c | 2 +-
drivers/media/video/adv7175.c | 2 +-
drivers/media/video/arv.c | 6 +-
drivers/media/video/au0828/Kconfig | 12 +
drivers/media/video/au0828/Makefile | 9 +
drivers/media/video/au0828/au0828-cards.c | 181 +
drivers/media/video/au0828/au0828-cards.h | 25 +
drivers/media/video/au0828/au0828-core.c | 256 +
drivers/media/video/au0828/au0828-dvb.c | 373 +
drivers/media/video/au0828/au0828-i2c.c | 381 +
drivers/media/video/au0828/au0828-reg.h | 38 +
drivers/media/video/au0828/au0828.h | 124 +
drivers/media/video/bt819.c | 2 +-
drivers/media/video/bt856.c | 2 +-
drivers/media/video/bt8xx/Kconfig | 2 +-
drivers/media/video/bt8xx/Makefile | 1 +
drivers/media/video/bt8xx/bttv-cards.c | 55 +-
drivers/media/video/bt8xx/bttv-driver.c | 36 +-
drivers/media/video/bt8xx/bttv-input.c | 6 +
drivers/media/video/bt8xx/bttv-vbi.c | 2 +-
drivers/media/video/bt8xx/bttv.h | 3 +
drivers/media/video/bt8xx/bttvp.h | 3 -
drivers/media/video/bw-qcam.c | 6 +-
drivers/media/video/c-qcam.c | 13 +-
drivers/media/video/cafe_ccic.c | 4 +-
drivers/media/video/cpia.c | 2 +
drivers/media/video/cpia.h | 4 +-
drivers/media/video/cpia2/cpia2_core.c | 16 +-
drivers/media/video/cpia2/cpia2_usb.c | 2 +-
drivers/media/video/cpia2/cpia2_v4l.c | 2 +
drivers/media/video/cpia_usb.c | 2 +-
drivers/media/video/cs5345.c | 3 +-
drivers/media/video/cs53l32a.c | 3 +-
drivers/media/video/cx18/Kconfig | 20 +
drivers/media/video/cx18/Makefile | 11 +
drivers/media/video/cx18/cx18-audio.c | 73 +
drivers/media/video/cx18/cx18-audio.h | 26 +
drivers/media/video/cx18/cx18-av-audio.c | 361 +
drivers/media/video/cx18/cx18-av-core.c | 879 ++
drivers/media/video/cx18/cx18-av-core.h | 318 +
drivers/media/video/cx18/cx18-av-firmware.c | 120 +
drivers/media/video/cx18/cx18-av-vbi.c | 413 +
drivers/media/video/cx18/cx18-cards.c | 277 +
drivers/media/video/cx18/cx18-cards.h | 170 +
drivers/media/video/cx18/cx18-controls.c | 306 +
drivers/media/video/cx18/cx18-controls.h | 24 +
drivers/media/video/cx18/cx18-driver.c | 971 ++
drivers/media/video/cx18/cx18-driver.h | 500 +
drivers/media/video/cx18/cx18-dvb.c | 288 +
drivers/media/video/cx18/cx18-dvb.h | 25 +
drivers/media/video/cx18/cx18-fileops.c | 711 ++
drivers/media/video/cx18/cx18-fileops.h | 45 +
drivers/media/video/cx18/cx18-firmware.c | 373 +
drivers/media/video/cx18/cx18-firmware.h | 25 +
drivers/media/video/cx18/cx18-gpio.c | 74 +
drivers/media/video/cx18/cx18-gpio.h | 24 +
drivers/media/video/cx18/cx18-i2c.c | 431 +
drivers/media/video/cx18/cx18-i2c.h | 33 +
drivers/media/video/cx18/cx18-ioctl.c | 851 ++
drivers/media/video/cx18/cx18-ioctl.h | 30 +
drivers/media/video/cx18/cx18-irq.c | 179 +
drivers/media/video/cx18/cx18-irq.h | 37 +
drivers/media/video/cx18/cx18-mailbox.c | 372 +
drivers/media/video/cx18/cx18-mailbox.h | 73 +
drivers/media/video/cx18/cx18-queue.c | 282 +
drivers/media/video/cx18/cx18-queue.h | 59 +
drivers/media/video/cx18/cx18-scb.c | 121 +
drivers/media/video/cx18/cx18-scb.h | 285 +
drivers/media/video/cx18/cx18-streams.c | 566 +
drivers/media/video/cx18/cx18-streams.h | 33 +
drivers/media/video/cx18/cx18-vbi.c | 208 +
drivers/media/video/cx18/cx18-vbi.h | 26 +
drivers/media/video/cx18/cx18-version.h | 34 +
drivers/media/video/cx18/cx18-video.c | 45 +
drivers/media/video/cx18/cx18-video.h | 22 +
drivers/media/video/cx18/cx23418.h | 458 +
drivers/media/video/cx23885/Kconfig | 14 +-
drivers/media/video/cx23885/Makefile | 3 +-
drivers/media/video/cx23885/cx23885-417.c | 1764 +++
drivers/media/video/cx23885/cx23885-cards.c | 116 +-
drivers/media/video/cx23885/cx23885-core.c | 310 +-
drivers/media/video/cx23885/cx23885-dvb.c | 172 +-
drivers/media/video/cx23885/cx23885-i2c.c | 46 +-
drivers/media/video/cx23885/cx23885-video.c | 58 +-
drivers/media/video/cx23885/cx23885.h | 27 +
drivers/media/video/cx25840/cx25840-core.c | 100 +-
drivers/media/video/cx25840/cx25840-core.h | 2 +-
drivers/media/video/cx25840/cx25840-firmware.c | 11 +-
drivers/media/video/cx25840/cx25840-vbi.c | 6 +-
drivers/media/video/cx88/Kconfig | 4 +-
drivers/media/video/cx88/Makefile | 1 +
drivers/media/video/cx88/cx88-alsa.c | 14 +-
drivers/media/video/cx88/cx88-blackbird.c | 24 +-
drivers/media/video/cx88/cx88-cards.c | 636 +-
drivers/media/video/cx88/cx88-core.c | 17 +-
drivers/media/video/cx88/cx88-dvb.c | 292 +-
drivers/media/video/cx88/cx88-i2c.c | 35 +-
drivers/media/video/cx88/cx88-input.c | 15 +-
drivers/media/video/cx88/cx88-mpeg.c | 20 +-
drivers/media/video/cx88/cx88-tvaudio.c | 30 +-
drivers/media/video/cx88/cx88-vbi.c | 2 +-
drivers/media/video/cx88/cx88-video.c | 63 +-
drivers/media/video/cx88/cx88.h | 14 +-
drivers/media/video/dabfirmware.h | 7 +
drivers/media/video/dabusb.c | 8 +-
drivers/media/video/dpc7146.c | 4 +-
drivers/media/video/em28xx/Kconfig | 16 +-
drivers/media/video/em28xx/Makefile | 2 +
drivers/media/video/em28xx/em28xx-audio.c | 2 +-
drivers/media/video/em28xx/em28xx-cards.c | 207 +-
drivers/media/video/em28xx/em28xx-core.c | 776 +-
drivers/media/video/em28xx/em28xx-dvb.c | 474 +
drivers/media/video/em28xx/em28xx-i2c.c | 160 +-
drivers/media/video/em28xx/em28xx-input.c | 26 +-
drivers/media/video/em28xx/em28xx-reg.h | 88 +
drivers/media/video/em28xx/em28xx-video.c | 1078 +-
drivers/media/video/em28xx/em28xx.h | 318 +-
drivers/media/video/et61x251/et61x251.h | 6 +-
drivers/media/video/et61x251/et61x251_core.c | 4 +-
drivers/media/video/hexium_gemini.c | 4 +-
drivers/media/video/hexium_orion.c | 4 +-
drivers/media/video/ir-kbd-i2c.c | 32 +-
drivers/media/video/ivtv/Kconfig | 3 +-
drivers/media/video/ivtv/Makefile | 1 +
drivers/media/video/ivtv/ivtv-cards.c | 105 +-
drivers/media/video/ivtv/ivtv-cards.h | 7 +-
drivers/media/video/ivtv/ivtv-driver.c | 95 +-
drivers/media/video/ivtv/ivtv-driver.h | 2 +
drivers/media/video/ivtv/ivtv-fileops.c | 8 +-
drivers/media/video/ivtv/ivtv-gpio.c | 9 +-
drivers/media/video/ivtv/ivtv-i2c.c | 15 +-
drivers/media/video/ivtv/ivtv-ioctl.c | 82 +-
drivers/media/video/ivtv/ivtv-irq.c | 25 +-
drivers/media/video/ivtv/ivtv-mailbox.c | 11 +-
drivers/media/video/ivtv/ivtv-queue.c | 4 +-
drivers/media/video/ivtv/ivtv-streams.c | 3 +-
drivers/media/video/ivtv/ivtv-version.h | 2 +-
drivers/media/video/ivtv/ivtv-yuv.c | 42 +-
drivers/media/video/ivtv/ivtvfb.c | 2 +-
drivers/media/video/m52790.c | 3 +-
drivers/media/video/meye.c | 1361 ++--
drivers/media/video/msp3400-driver.c | 6 +-
drivers/media/video/msp3400-kthreads.c | 15 +-
drivers/media/video/mt20xx.c | 671 --
drivers/media/video/mt20xx.h | 37 -
drivers/media/video/mt9m001.c | 730 ++
drivers/media/video/mt9v022.c | 852 ++
drivers/media/video/mxb.c | 4 +-
drivers/media/video/ov511.c | 5 +-
drivers/media/video/ov511.h | 2 +-
drivers/media/video/ovcamchip/ovcamchip_priv.h | 4 +-
drivers/media/video/pms.c | 6 +-
drivers/media/video/pvrusb2/Kconfig | 50 +-
drivers/media/video/pvrusb2/Makefile | 7 +
drivers/media/video/pvrusb2/pvrusb2-audio.c | 2 +-
drivers/media/video/pvrusb2/pvrusb2-context.c | 307 +-
drivers/media/video/pvrusb2/pvrusb2-context.h | 16 +-
drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +-
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 6 +-
drivers/media/video/pvrusb2/pvrusb2-debug.h | 3 +-
drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 24 +
drivers/media/video/pvrusb2/pvrusb2-devattr.c | 306 +-
drivers/media/video/pvrusb2/pvrusb2-devattr.h | 72 +-
drivers/media/video/pvrusb2/pvrusb2-dvb.c | 433 +
drivers/media/video/pvrusb2/pvrusb2-dvb.h | 41 +
drivers/media/video/pvrusb2/pvrusb2-encoder.c | 19 +-
drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 43 +-
drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 26 +-
drivers/media/video/pvrusb2/pvrusb2-hdw.c | 904 ++-
drivers/media/video/pvrusb2/pvrusb2-hdw.h | 39 +-
drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +-
drivers/media/video/pvrusb2/pvrusb2-io.c | 30 +
drivers/media/video/pvrusb2/pvrusb2-io.h | 12 +
drivers/media/video/pvrusb2/pvrusb2-main.c | 16 +
drivers/media/video/pvrusb2/pvrusb2-std.c | 9 +-
drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 54 +-
drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 195 +-
drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 2 +-
drivers/media/video/pwc/pwc-if.c | 16 +-
drivers/media/video/pwc/pwc-v4l.c | 4 +-
drivers/media/video/pxa_camera.c | 1206 ++
drivers/media/video/saa5249.c | 2 +
drivers/media/video/saa6588.c | 8 +-
drivers/media/video/saa7110.c | 2 +-
drivers/media/video/saa7111.c | 2 +-
drivers/media/video/saa7114.c | 2 +-
drivers/media/video/saa7115.c | 7 +-
drivers/media/video/saa711x.c | 2 +-
drivers/media/video/saa7127.c | 3 +-
drivers/media/video/saa7134/Kconfig | 5 +-
drivers/media/video/saa7134/Makefile | 1 +
drivers/media/video/saa7134/saa7134-alsa.c | 16 +-
drivers/media/video/saa7134/saa7134-cards.c | 687 +-
drivers/media/video/saa7134/saa7134-core.c | 52 +-
drivers/media/video/saa7134/saa7134-dvb.c | 434 +-
drivers/media/video/saa7134/saa7134-empress.c | 10 +-
drivers/media/video/saa7134/saa7134-i2c.c | 48 +-
drivers/media/video/saa7134/saa7134-input.c | 20 +-
drivers/media/video/saa7134/saa7134-reg.h | 3 +
drivers/media/video/saa7134/saa7134-ts.c | 2 +-
drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +-
drivers/media/video/saa7134/saa7134-vbi.c | 2 +-
drivers/media/video/saa7134/saa7134-video.c | 17 +-
drivers/media/video/saa7134/saa7134.h | 23 +-
drivers/media/video/saa717x.c | 1517 +++
drivers/media/video/saa7185.c | 2 +-
drivers/media/video/se401.c | 12 +-
drivers/media/video/sn9c102/sn9c102.h | 6 +-
drivers/media/video/sn9c102/sn9c102_core.c | 12 +-
drivers/media/video/sn9c102/sn9c102_sensor.h | 5 +-
drivers/media/video/soc_camera.c | 1031 ++
drivers/media/video/stk-webcam.c | 6 +-
drivers/media/video/stradis.c | 6 +-
drivers/media/video/stv680.c | 13 +-
drivers/media/video/tcm825x.c | 5 +-
drivers/media/video/tda8290.c | 806 --
drivers/media/video/tda8290.h | 57 -
drivers/media/video/tda9840.c | 4 +-
drivers/media/video/tda9887.c | 695 --
drivers/media/video/tda9887.h | 38 -
drivers/media/video/tea5761.c | 320 -
drivers/media/video/tea5761.h | 47 -
drivers/media/video/tea5767.c | 479 -
drivers/media/video/tea5767.h | 66 -
drivers/media/video/tea6415c.c | 4 +-
drivers/media/video/tea6420.c | 4 +-
drivers/media/video/tlv320aic23b.c | 3 +-
drivers/media/video/tuner-core.c | 214 +-
drivers/media/video/tuner-i2c.h | 87 -
drivers/media/video/tuner-simple.c | 652 --
drivers/media/video/tuner-simple.h | 46 -
drivers/media/video/tuner-types.c | 1484 ---
drivers/media/video/tuner-xc2028-types.h | 128 -
drivers/media/video/tuner-xc2028.c | 1216 --
drivers/media/video/tuner-xc2028.h | 63 -
drivers/media/video/tvaudio.c | 10 +-
drivers/media/video/tveeprom.c | 103 -
drivers/media/video/tvp5150.c | 2 +-
drivers/media/video/upd64031a.c | 3 +-
drivers/media/video/upd64083.c | 3 +-
drivers/media/video/usbvideo/ibmcam.c | 64 +-
drivers/media/video/usbvideo/konicawc.c | 4 +-
drivers/media/video/usbvideo/quickcam_messenger.c | 4 +-
drivers/media/video/usbvideo/ultracam.c | 4 +-
drivers/media/video/usbvideo/usbvideo.c | 148 +-
drivers/media/video/usbvideo/vicam.c | 10 +-
drivers/media/video/usbvision/Kconfig | 2 +-
drivers/media/video/usbvision/Makefile | 1 +
drivers/media/video/usbvision/usbvision-core.c | 45 +-
drivers/media/video/usbvision/usbvision-i2c.c | 8 +-
drivers/media/video/usbvision/usbvision-video.c | 46 +-
drivers/media/video/v4l1-compat.c | 1737 ++--
drivers/media/video/v4l2-common.c | 7 +-
drivers/media/video/videobuf-core.c | 212 +-
drivers/media/video/videobuf-dma-sg.c | 156 +-
drivers/media/video/videobuf-dvb.c | 18 +-
drivers/media/video/videobuf-vmalloc.c | 211 +-
drivers/media/video/videocodec.c | 115 +-
drivers/media/video/videodev.c | 74 +-
drivers/media/video/vino.c | 12 +-
drivers/media/video/vivi.c | 352 +-
drivers/media/video/vp27smpx.c | 3 +-
drivers/media/video/vpx3220.c | 2 +-
drivers/media/video/w9966.c | 8 +-
drivers/media/video/w9968cf.c | 4 +-
drivers/media/video/w9968cf.h | 6 +-
drivers/media/video/wm8739.c | 3 +-
drivers/media/video/wm8775.c | 3 +-
drivers/media/video/zc0301/zc0301.h | 6 +-
drivers/media/video/zc0301/zc0301_core.c | 4 +-
drivers/media/video/zoran.h | 16 -
drivers/media/video/zoran_card.c | 6 +-
drivers/media/video/zoran_card.h | 2 +
drivers/media/video/zoran_device.c | 12 +-
drivers/media/video/zoran_driver.c | 26 +-
drivers/media/video/zoran_procfs.c | 7 +-
drivers/media/video/zr36016.c | 5 +-
drivers/media/video/zr36050.c | 5 +-
drivers/media/video/zr36060.c | 6 +-
drivers/media/video/zr364xx.c | 4 +-
drivers/memstick/core/memstick.c | 33 +-
drivers/memstick/core/mspro_block.c | 4 +-
drivers/memstick/host/jmb38x_ms.c | 16 +-
drivers/message/fusion/mptbase.c | 29 +-
drivers/message/fusion/mptbase.h | 5 +-
drivers/message/fusion/mptsas.c | 22 +-
drivers/message/fusion/mptscsih.c | 130 +-
drivers/message/fusion/mptscsih.h | 2 +-
drivers/message/i2o/i2o_block.c | 2 +-
drivers/message/i2o/i2o_proc.c | 6 +-
drivers/mfd/Kconfig | 16 +
drivers/mfd/Makefile | 3 +
drivers/mfd/asic3.c | 6 +-
drivers/mfd/htc-egpio.c | 440 +
drivers/mfd/htc-pasic3.c | 263 +
drivers/mfd/sm501.c | 88 +-
drivers/mfd/ucb1x00-ts.c | 8 +-
drivers/misc/Kconfig | 66 +-
drivers/misc/Makefile | 6 +-
drivers/misc/atmel_tclib.c | 161 +
drivers/misc/eeepc-laptop.c | 666 ++
drivers/misc/enclosure.c | 202 +-
drivers/misc/hdpuftrs/hdpu_cpustate.c | 5 +-
drivers/misc/hdpuftrs/hdpu_nexus.c | 17 +-
drivers/misc/ibmasm/command.c | 6 +-
drivers/misc/ibmasm/heartbeat.c | 6 +-
drivers/misc/intel_menlow.c | 26 +-
drivers/misc/ioc4.c | 20 +-
drivers/misc/kgdbts.c | 1101 ++
drivers/misc/phantom.c | 34 +-
drivers/misc/sgi-xp/Makefile | 11 +
drivers/misc/sgi-xp/xp.h | 463 +
drivers/misc/sgi-xp/xp_main.c | 279 +
drivers/misc/sgi-xp/xp_nofault.S | 35 +
drivers/misc/sgi-xp/xpc.h | 1187 ++
drivers/misc/sgi-xp/xpc_channel.c | 2243 ++++
drivers/misc/sgi-xp/xpc_main.c | 1323 +++
drivers/misc/sgi-xp/xpc_partition.c | 1174 ++
drivers/misc/sgi-xp/xpnet.c | 677 ++
drivers/misc/sony-laptop.c | 4 +-
drivers/misc/thinkpad_acpi.c | 765 +-
drivers/mmc/core/core.c | 6 +-
drivers/mmc/core/core.h | 4 +
drivers/mmc/core/host.c | 39 +-
drivers/mmc/core/sdio_irq.c | 4 +-
drivers/mmc/core/sdio_ops.c | 1 +
drivers/mmc/host/mmc_spi.c | 2 +-
drivers/mmc/host/mmci.c | 4 +-
drivers/mmc/host/omap.c | 995 ++-
drivers/mmc/host/sdhci.c | 100 +-
drivers/mmc/host/sdhci.h | 9 +-
drivers/mtd/Kconfig | 6 +
drivers/mtd/Makefile | 1 +
drivers/mtd/ar7part.c | 151 +
drivers/mtd/chips/cfi_cmdset_0001.c | 33 +-
drivers/mtd/chips/cfi_cmdset_0002.c | 30 +-
drivers/mtd/chips/cfi_cmdset_0020.c | 15 +-
drivers/mtd/chips/cfi_probe.c | 7 +-
drivers/mtd/chips/cfi_util.c | 2 +-
drivers/mtd/chips/jedec_probe.c | 73 +-
drivers/mtd/cmdlinepart.c | 15 +-
drivers/mtd/devices/Kconfig | 7 +
drivers/mtd/devices/block2mtd.c | 10 +-
drivers/mtd/devices/lart.c | 16 +-
drivers/mtd/devices/m25p80.c | 40 +-
drivers/mtd/devices/mtdram.c | 12 +-
drivers/mtd/devices/phram.c | 15 +-
drivers/mtd/devices/pmc551.c | 27 +-
drivers/mtd/devices/slram.c | 15 +-
drivers/mtd/ftl.c | 6 +-
drivers/mtd/inftlmount.c | 5 -
drivers/mtd/maps/Kconfig | 3 +
drivers/mtd/maps/bast-flash.c | 5 +-
drivers/mtd/maps/ck804xrom.c | 89 +-
drivers/mtd/maps/integrator-flash.c | 2 +
drivers/mtd/maps/ixp2000.c | 3 +-
drivers/mtd/maps/ixp4xx.c | 2 +
drivers/mtd/maps/omap_nor.c | 12 +-
drivers/mtd/maps/pcmciamtd.c | 2 +-
drivers/mtd/maps/physmap.c | 8 +
drivers/mtd/maps/plat-ram.c | 50 +-
drivers/mtd/maps/pmcmsp-flash.c | 2 +-
drivers/mtd/maps/sa1100-flash.c | 2 +
drivers/mtd/maps/sharpsl-flash.c | 2 +-
drivers/mtd/maps/tqm8xxl.c | 6 +-
drivers/mtd/maps/uclinux.c | 6 +-
drivers/mtd/mtdoops.c | 2 +-
drivers/mtd/mtdpart.c | 8 +-
drivers/mtd/nand/Kconfig | 58 +-
drivers/mtd/nand/Makefile | 2 +
drivers/mtd/nand/at91_nand.c | 386 +-
drivers/mtd/nand/bf5xx_nand.c | 17 +-
drivers/mtd/nand/cs553x_nand.c | 2 +-
drivers/mtd/nand/fsl_elbc_nand.c | 258 +-
drivers/mtd/nand/fsl_upm.c | 291 +
drivers/mtd/nand/nand_base.c | 21 +
drivers/mtd/nand/ndfc.c | 2 +
drivers/mtd/nand/orion_nand.c | 3 +-
drivers/mtd/nand/plat_nand.c | 2 +
drivers/mtd/nand/pxa3xx_nand.c | 1249 ++
drivers/mtd/nand/rtc_from4.c | 50 +-
drivers/mtd/nand/s3c2410.c | 73 +-
drivers/mtd/nftlmount.c | 5 -
drivers/mtd/ofpart.c | 2 +
drivers/mtd/onenand/onenand_base.c | 51 +-
drivers/mtd/onenand/onenand_bbt.c | 3 -
drivers/mtd/rfd_ftl.c | 2 +-
drivers/mtd/ubi/Kconfig | 9 +-
drivers/mtd/ubi/build.c | 40 +-
drivers/mtd/ubi/debug.h | 4 +-
drivers/mtd/ubi/gluebi.c | 5 +-
drivers/mtd/ubi/io.c | 4 +
drivers/mtd/ubi/scan.c | 41 +-
drivers/mtd/ubi/scan.h | 2 +-
drivers/mtd/ubi/ubi-media.h | 372 +
drivers/mtd/ubi/ubi.h | 7 +-
drivers/net/3c505.c | 30 +-
drivers/net/3c505.h | 1 -
drivers/net/3c509.c | 776 +-
drivers/net/3c515.c | 64 +-
drivers/net/3c527.c | 2 +-
drivers/net/8139too.c | 10 +-
drivers/net/8390.c | 8 +-
drivers/net/Kconfig | 104 +-
drivers/net/Makefile | 9 +-
drivers/net/appletalk/cops.c | 9 +-
drivers/net/arcnet/arcnet.c | 5 +-
drivers/net/arcnet/com20020.c | 7 +-
drivers/net/arm/Kconfig | 8 +
drivers/net/arm/Makefile | 1 +
drivers/net/arm/am79c961a.c | 10 +-
drivers/net/arm/at91_ether.c | 5 +-
drivers/net/arm/ep93xx_eth.c | 2 +
drivers/net/arm/ixp4xx_eth.c | 1265 +++
drivers/net/at1700.c | 7 +-
drivers/net/atarilance.c | 7 +-
drivers/net/atl1/Makefile | 2 -
drivers/net/atl1/atl1.h | 286 -
drivers/net/atl1/atl1_ethtool.c | 505 -
drivers/net/atl1/atl1_hw.c | 720 --
drivers/net/atl1/atl1_hw.h | 946 --
drivers/net/atl1/atl1_main.c | 2450 ----
drivers/net/atl1/atl1_param.c | 203 -
drivers/net/atlx/Makefile | 1 +
drivers/net/atlx/atl1.c | 3702 ++++++
drivers/net/atlx/atl1.h | 796 ++
drivers/net/atlx/atlx.c | 256 +
drivers/net/atlx/atlx.h | 506 +
drivers/net/atp.c | 4 +-
drivers/net/au1000_eth.c | 6 +-
drivers/net/ax88796.c | 1 +
drivers/net/bfin_mac.c | 305 +-
drivers/net/bfin_mac.h | 2 +-
drivers/net/bnx2.c | 43 +-
drivers/net/bnx2_fw2.h | 502 +-
drivers/net/bonding/bond_3ad.c | 2 +-
drivers/net/bonding/bond_alb.c | 2 +-
drivers/net/bonding/bond_main.c | 23 +-
drivers/net/cassini.c | 12 +-
drivers/net/cpmac.c | 7 +-
drivers/net/cxgb3/adapter.h | 1 -
drivers/net/cxgb3/cxgb3_main.c | 4 +-
drivers/net/cxgb3/cxgb3_offload.c | 22 +-
drivers/net/cxgb3/l2t.c | 2 +-
drivers/net/cxgb3/t3cdev.h | 1 -
drivers/net/cxgb3/version.h | 2 +-
drivers/net/defxx.c | 3 +-
drivers/net/dm9000.c | 1 +
drivers/net/e100.c | 2 +-
drivers/net/e1000/e1000.h | 113 +-
drivers/net/e1000/e1000_ethtool.c | 175 +-
drivers/net/e1000/e1000_hw.c | 1541 ++--
drivers/net/e1000/e1000_hw.h | 572 +-
drivers/net/e1000/e1000_main.c | 305 +-
drivers/net/e1000/e1000_osdep.h | 7 -
drivers/net/e1000e/82571.c | 169 +-
drivers/net/e1000e/Makefile | 2 +-
drivers/net/e1000e/defines.h | 112 +-
drivers/net/e1000e/e1000.h | 71 +-
drivers/net/e1000e/es2lan.c | 266 +-
drivers/net/e1000e/ethtool.c | 331 +-
drivers/net/e1000e/hw.h | 185 +-
drivers/net/e1000e/ich8lan.c | 309 +-
drivers/net/e1000e/lib.c | 348 +-
drivers/net/e1000e/netdev.c | 804 +-
drivers/net/e1000e/param.c | 33 +-
drivers/net/e1000e/phy.c | 237 +-
drivers/net/eepro.c | 2 +-
drivers/net/ehea/ehea.h | 6 +-
drivers/net/ehea/ehea_main.c | 96 +-
drivers/net/fec.c | 125 +-
drivers/net/fec.h | 4 +-
drivers/net/fec_mpc52xx.c | 122 +-
drivers/net/fec_mpc52xx.h | 19 -
drivers/net/fec_mpc52xx_phy.c | 2 +-
drivers/net/forcedeth.c | 672 +-
drivers/net/fs_enet/fs_enet-main.c | 4 +-
drivers/net/fs_enet/mii-bitbang.c | 4 +-
drivers/net/fs_enet/mii-fec.c | 4 +-
drivers/net/gianfar.c | 209 +-
drivers/net/gianfar.h | 21 +-
drivers/net/gianfar_mii.c | 40 +-
drivers/net/gianfar_mii.h | 3 +
drivers/net/hamachi.c | 2 +-
drivers/net/hamradio/6pack.c | 38 +-
drivers/net/hamradio/bpqether.c | 4 +-
drivers/net/hamradio/dmascc.c | 3 -
drivers/net/hamradio/mkiss.c | 15 +-
drivers/net/ibm_newemac/core.c | 83 +-
drivers/net/ibm_newemac/core.h | 14 +-
drivers/net/ibm_newemac/mal.c | 20 +-
drivers/net/ibm_newemac/rgmii.c | 2 +-
drivers/net/ibm_newemac/tah.c | 2 +-
drivers/net/ibm_newemac/zmii.c | 2 +-
drivers/net/ibmveth.c | 52 +-
drivers/net/igb/igb_main.c | 2 +
drivers/net/irda/ali-ircc.c | 2 +
drivers/net/irda/irtty-sir.c | 95 +-
drivers/net/irda/mcs7780.c | 2 +-
drivers/net/irda/nsc-ircc.c | 6 +
drivers/net/irda/pxaficp_ir.c | 13 +
drivers/net/irda/sa1100_ir.c | 2 +
drivers/net/irda/smsc-ircc2.c | 5 +-
drivers/net/irda/stir4200.c | 2 +-
drivers/net/irda/vlsi_ir.c | 5 +-
drivers/net/iseries_veth.c | 3 +-
drivers/net/ixgb/ixgb.h | 60 +-
drivers/net/ixgb/ixgb_ee.c | 124 +-
drivers/net/ixgb/ixgb_ee.h | 12 +-
drivers/net/ixgb/ixgb_ethtool.c | 67 +-
drivers/net/ixgb/ixgb_hw.c | 199 +-
drivers/net/ixgb/ixgb_hw.h | 250 +-
drivers/net/ixgb/ixgb_main.c | 156 +-
drivers/net/ixgb/ixgb_osdep.h | 7 -
drivers/net/ixgbe/ixgbe.h | 87 +-
drivers/net/ixgbe/ixgbe_ethtool.c | 39 +-
drivers/net/ixgbe/ixgbe_main.c | 1522 ++-
drivers/net/jazzsonic.c | 2 +
drivers/net/korina.c | 1230 ++
drivers/net/loopback.c | 2 +-
drivers/net/macb.c | 4 +-
drivers/net/macvlan.c | 2 +-
drivers/net/meth.c | 2 +
drivers/net/mlx4/alloc.c | 157 +
drivers/net/mlx4/catas.c | 2 +-
drivers/net/mlx4/cmd.c | 3 +-
drivers/net/mlx4/cq.c | 76 +-
drivers/net/mlx4/eq.c | 5 +-
drivers/net/mlx4/fw.c | 13 +
drivers/net/mlx4/fw.h | 1 +
drivers/net/mlx4/intf.c | 8 +-
drivers/net/mlx4/main.c | 9 +-
drivers/net/mlx4/mcg.c | 12 +-
drivers/net/mlx4/mlx4.h | 7 +-
drivers/net/mlx4/mr.c | 8 +-
drivers/net/mlx4/qp.c | 31 +
drivers/net/mv643xx_eth.c | 480 +-
drivers/net/myri10ge/myri10ge.c | 2 +-
drivers/net/natsemi.c | 20 +-
drivers/net/netx-eth.c | 2 +-
drivers/net/netxen/netxen_nic.h | 18 -
drivers/net/netxen/netxen_nic_hdr.h | 1 -
drivers/net/netxen/netxen_nic_hw.c | 15 +-
drivers/net/netxen/netxen_nic_isr.c | 2 +
drivers/net/netxen/netxen_nic_main.c | 19 +-
drivers/net/ni52.c | 255 +-
drivers/net/ni52.h | 4 +-
drivers/net/niu.c | 1073 ++-
drivers/net/niu.h | 16 +-
drivers/net/pasemi_mac.c | 357 +-
drivers/net/pasemi_mac.h | 35 +-
drivers/net/pasemi_mac_ethtool.c | 159 +
drivers/net/phy/Kconfig | 2 +-
drivers/net/phy/broadcom.c | 77 +-
drivers/net/phy/fixed.c | 2 +-
drivers/net/phy/mdio_bus.c | 3 +
drivers/net/phy/phy.c | 4 +-
drivers/net/phy/phy_device.c | 169 +-
drivers/net/phy/smsc.c | 83 +-
drivers/net/ppp_async.c | 9 +-
drivers/net/ppp_generic.c | 48 +-
drivers/net/ppp_synctty.c | 9 +-
drivers/net/pppoe.c | 10 +-
drivers/net/pppol2tp.c | 4 +-
drivers/net/ps3_gelic_net.c | 81 +
drivers/net/ps3_gelic_net.h | 20 +
drivers/net/ps3_gelic_wireless.c | 2 +-
drivers/net/qla3xxx.c | 6 +-
drivers/net/r8169.c | 8 +-
drivers/net/rionet.c | 16 +-
drivers/net/s2io.c | 918 +-
drivers/net/s2io.h | 137 +-
drivers/net/sb1000.c | 101 +-
drivers/net/sb1250-mac.c | 2 +-
drivers/net/sc92031.c | 86 +-
drivers/net/sfc/Kconfig | 12 +
drivers/net/sfc/Makefile | 5 +
drivers/net/sfc/bitfield.h | 508 +
drivers/net/sfc/boards.c | 167 +
drivers/net/sfc/boards.h | 26 +
drivers/net/sfc/efx.c | 2208 ++++
drivers/net/sfc/efx.h | 67 +
drivers/net/sfc/enum.h | 50 +
drivers/net/sfc/ethtool.c | 460 +
drivers/net/sfc/ethtool.h | 27 +
drivers/net/sfc/falcon.c | 2722 +++++
drivers/net/sfc/falcon.h | 130 +
drivers/net/sfc/falcon_hwdefs.h | 1135 ++
drivers/net/sfc/falcon_io.h | 243 +
drivers/net/sfc/falcon_xmac.c | 585 +
drivers/net/sfc/gmii.h | 195 +
drivers/net/sfc/i2c-direct.c | 381 +
drivers/net/sfc/i2c-direct.h | 91 +
drivers/net/sfc/mac.h | 33 +
drivers/net/sfc/mdio_10g.c | 282 +
drivers/net/sfc/mdio_10g.h | 232 +
drivers/net/sfc/net_driver.h | 883 ++
drivers/net/sfc/phy.h | 48 +
drivers/net/sfc/rx.c | 875 ++
drivers/net/sfc/rx.h | 29 +
drivers/net/sfc/sfe4001.c | 252 +
drivers/net/sfc/spi.h | 71 +
drivers/net/sfc/tenxpress.c | 434 +
drivers/net/sfc/tx.c | 452 +
drivers/net/sfc/tx.h | 24 +
drivers/net/sfc/workarounds.h | 56 +
drivers/net/sfc/xenpack.h | 62 +
drivers/net/sfc/xfp_phy.c | 132 +
drivers/net/sgiseeq.c | 4 +-
drivers/net/sis190.c | 136 +-
drivers/net/sk98lin/Makefile | 87 -
drivers/net/sk98lin/h/lm80.h | 179 -
drivers/net/sk98lin/h/skaddr.h | 285 -
drivers/net/sk98lin/h/skcsum.h | 213 -
drivers/net/sk98lin/h/skdebug.h | 74 -
drivers/net/sk98lin/h/skdrv1st.h | 188 -
drivers/net/sk98lin/h/skdrv2nd.h | 447 -
drivers/net/sk98lin/h/skerror.h | 55 -
drivers/net/sk98lin/h/skgedrv.h | 51 -
drivers/net/sk98lin/h/skgehw.h | 2126 ----
drivers/net/sk98lin/h/skgehwt.h | 48 -
drivers/net/sk98lin/h/skgei2c.h | 210 -
drivers/net/sk98lin/h/skgeinit.h | 797 --
drivers/net/sk98lin/h/skgepnm2.h | 334 -
drivers/net/sk98lin/h/skgepnmi.h | 962 --
drivers/net/sk98lin/h/skgesirq.h | 110 -
drivers/net/sk98lin/h/ski2c.h | 174 -
drivers/net/sk98lin/h/skqueue.h | 94 -
drivers/net/sk98lin/h/skrlmt.h | 438 -
drivers/net/sk98lin/h/sktimer.h | 63 -
drivers/net/sk98lin/h/sktypes.h | 69 -
drivers/net/sk98lin/h/skversion.h | 38 -
drivers/net/sk98lin/h/skvpd.h | 248 -
drivers/net/sk98lin/h/xmac_ii.h | 1579 ---
drivers/net/sk98lin/skaddr.c | 1788 ---
drivers/net/sk98lin/skdim.c | 742 --
drivers/net/sk98lin/skethtool.c | 627 -
drivers/net/sk98lin/skge.c | 5218 ---------
drivers/net/sk98lin/skgehwt.c | 171 -
drivers/net/sk98lin/skgeinit.c | 2005 ----
drivers/net/sk98lin/skgemib.c | 1075 --
drivers/net/sk98lin/skgepnmi.c | 8198 --------------
drivers/net/sk98lin/skgesirq.c | 2229 ----
drivers/net/sk98lin/ski2c.c | 1296 ---
drivers/net/sk98lin/sklm80.c | 141 -
drivers/net/sk98lin/skqueue.c | 179 -
drivers/net/sk98lin/skrlmt.c | 3257 ------
drivers/net/sk98lin/sktimer.c | 250 -
drivers/net/sk98lin/skvpd.c | 1091 --
drivers/net/sk98lin/skxmac2.c | 4160 -------
drivers/net/skfp/fplustm.c | 12 +-
drivers/net/skfp/h/fplustm.h | 20 +-
drivers/net/skfp/hwmtm.c | 86 +-
drivers/net/skfp/skfddi.c | 4 +-
drivers/net/slip.c | 13 +-
drivers/net/smc911x.c | 8 +-
drivers/net/smc91x.c | 337 +-
drivers/net/smc91x.h | 331 +-
drivers/net/sni_82596.c | 2 +
drivers/net/spider_net.c | 36 +-
drivers/net/spider_net.h | 7 +-
drivers/net/tc35815.c | 1701 +--
drivers/net/tehuti.c | 15 +
drivers/net/tg3.c | 201 +-
drivers/net/tg3.h | 16 +-
drivers/net/tokenring/3c359.c | 21 +-
drivers/net/tsi108_eth.c | 2 +
drivers/net/tulip/Kconfig | 15 +-
drivers/net/tulip/Makefile | 1 -
drivers/net/tulip/de4x5.c | 35 +-
drivers/net/tulip/de4x5.h | 2 +-
drivers/net/tulip/tulip.h | 14 +-
drivers/net/tulip/tulip_core.c | 29 +-
drivers/net/tulip/winbond-840.c | 5 +-
drivers/net/tulip/xircom_tulip_cb.c | 1726 ---
drivers/net/tun.c | 115 +-
drivers/net/typhoon.c | 1 -
drivers/net/ucc_geth.c | 12 +-
drivers/net/ucc_geth.h | 2 +-
drivers/net/ucc_geth_mii.c | 13 +-
drivers/net/usb/dm9601.c | 10 +-
drivers/net/usb/kaweth.c | 1 -
drivers/net/usb/rndis_host.c | 5 +-
drivers/net/veth.c | 2 +-
drivers/net/via-velocity.c | 69 +-
drivers/net/virtio_net.c | 96 +-
drivers/net/wan/c101.c | 6 +-
drivers/net/wan/cosa.c | 14 +-
drivers/net/wan/dlci.c | 2 +-
drivers/net/wan/hdlc.c | 4 +-
drivers/net/wan/hdlc_fr.c | 4 -
drivers/net/wan/lapbether.c | 5 +-
drivers/net/wan/pc300_tty.c | 24 +-
drivers/net/wan/syncppp.c | 2 +-
drivers/net/wan/x25_asy.c | 279 +-
drivers/net/wireless/Kconfig | 113 +-
drivers/net/wireless/Makefile | 8 +-
drivers/net/wireless/adm8211.c | 95 +-
drivers/net/wireless/adm8211.h | 65 +-
drivers/net/wireless/airo.c | 94 +-
drivers/net/wireless/ath5k/Kconfig | 37 +
drivers/net/wireless/ath5k/Makefile | 8 +-
drivers/net/wireless/ath5k/ath5k.h | 170 +-
drivers/net/wireless/ath5k/base.c | 583 +-
drivers/net/wireless/ath5k/base.h | 18 +-
drivers/net/wireless/ath5k/debug.c | 92 +-
drivers/net/wireless/ath5k/debug.h | 29 +-
drivers/net/wireless/ath5k/hw.c | 797 +-
drivers/net/wireless/ath5k/hw.h | 150 +-
drivers/net/wireless/ath5k/initvals.c | 473 +-
drivers/net/wireless/ath5k/phy.c | 387 +-
drivers/net/wireless/ath5k/reg.h | 4 +-
drivers/net/wireless/ath5k/regdom.c | 121 -
drivers/net/wireless/ath5k/regdom.h | 500 -
drivers/net/wireless/atmel.c | 5 +-
drivers/net/wireless/b43/Kconfig | 18 +
drivers/net/wireless/b43/Makefile | 5 +-
drivers/net/wireless/b43/b43.h | 199 +-
drivers/net/wireless/b43/dma.c | 487 +-
drivers/net/wireless/b43/dma.h | 14 +-
drivers/net/wireless/b43/leds.c | 5 +-
drivers/net/wireless/b43/main.c | 1109 ++-
drivers/net/wireless/b43/main.h | 11 +-
drivers/net/wireless/b43/nphy.c | 1 -
drivers/net/wireless/b43/nphy.h | 40 +
drivers/net/wireless/b43/pcmcia.c | 10 +-
drivers/net/wireless/b43/phy.c | 2 +-
drivers/net/wireless/b43/pio.c | 842 ++
drivers/net/wireless/b43/pio.h | 220 +
drivers/net/wireless/b43/sysfs.c | 89 +-
drivers/net/wireless/b43/wa.c | 45 +-
drivers/net/wireless/b43/xmit.c | 206 +-
drivers/net/wireless/b43/xmit.h | 44 +-
drivers/net/wireless/b43legacy/b43legacy.h | 49 +-
drivers/net/wireless/b43legacy/main.c | 469 +-
drivers/net/wireless/b43legacy/xmit.c | 78 +-
drivers/net/wireless/bcm43xx/Kconfig | 70 -
drivers/net/wireless/bcm43xx/Makefile | 12 -
drivers/net/wireless/bcm43xx/bcm43xx.h | 997 --
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 556 -
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h | 118 -
drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 1263 ---
drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 386 -
drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 50 -
drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | 8 -
drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | 352 -
drivers/net/wireless/bcm43xx/bcm43xx_ilt.h | 33 -
drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 307 -
drivers/net/wireless/bcm43xx/bcm43xx_leds.h | 62 -
drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4281 -------
drivers/net/wireless/bcm43xx/bcm43xx_main.h | 133 -
drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2346 ----
drivers/net/wireless/bcm43xx/bcm43xx_phy.h | 78 -
drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 674 --
drivers/net/wireless/bcm43xx/bcm43xx_pio.h | 163 -
drivers/net/wireless/bcm43xx/bcm43xx_power.c | 393 -
drivers/net/wireless/bcm43xx/bcm43xx_power.h | 56 -
drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 2170 ----
drivers/net/wireless/bcm43xx/bcm43xx_radio.h | 115 -
drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 471 -
drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h | 9 -
drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 1035 --
drivers/net/wireless/bcm43xx/bcm43xx_wx.h | 36 -
drivers/net/wireless/bcm43xx/bcm43xx_xmit.c | 565 -
drivers/net/wireless/bcm43xx/bcm43xx_xmit.h | 150 -
drivers/net/wireless/ipw2200.c | 16 +-
drivers/net/wireless/ipw2200.h | 112 +-
drivers/net/wireless/iwlwifi/Kconfig | 62 +-
drivers/net/wireless/iwlwifi/Makefile | 12 +-
drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 96 +-
drivers/net/wireless/iwlwifi/iwl-3945-core.h | 80 +
drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 19 +-
drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 213 +-
drivers/net/wireless/iwlwifi/iwl-3945-io.h | 41 +-
drivers/net/wireless/iwlwifi/iwl-3945-led.c | 433 +
drivers/net/wireless/iwlwifi/iwl-3945-led.h | 73 +
drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 158 +-
drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 12 +-
drivers/net/wireless/iwlwifi/iwl-3945.c | 463 +-
drivers/net/wireless/iwlwifi/iwl-3945.h | 118 +-
drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 159 +-
drivers/net/wireless/iwlwifi/iwl-4965-debug.h | 152 -
drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 531 +-
drivers/net/wireless/iwlwifi/iwl-4965-io.h | 431 -
drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 567 +-
drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 20 +-
drivers/net/wireless/iwlwifi/iwl-4965.c | 2412 ++--
drivers/net/wireless/iwlwifi/iwl-4965.h | 431 +-
drivers/net/wireless/iwlwifi/iwl-core.c | 292 +
drivers/net/wireless/iwlwifi/iwl-core.h | 246 +
drivers/net/wireless/iwlwifi/iwl-csr.h | 265 +
drivers/net/wireless/iwlwifi/iwl-debug.h | 197 +
drivers/net/wireless/iwlwifi/iwl-debugfs.c | 341 +
drivers/net/wireless/iwlwifi/iwl-eeprom.c | 561 +
drivers/net/wireless/iwlwifi/iwl-eeprom.h | 375 +
drivers/net/wireless/iwlwifi/iwl-hcmd.c | 278 +
drivers/net/wireless/iwlwifi/iwl-helpers.h | 22 +-
drivers/net/wireless/iwlwifi/iwl-io.h | 429 +
drivers/net/wireless/iwlwifi/iwl-led.c | 449 +
drivers/net/wireless/iwlwifi/iwl-led.h | 82 +
drivers/net/wireless/iwlwifi/iwl-prph.h | 78 +-
drivers/net/wireless/iwlwifi/iwl-rfkill.c | 173 +
drivers/net/wireless/iwlwifi/iwl-rfkill.h | 54 +
drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-sta.c | 355 +
drivers/net/wireless/iwlwifi/iwl-sta.h | 49 +
drivers/net/wireless/iwlwifi/iwl3945-base.c | 1094 +--
drivers/net/wireless/iwlwifi/iwl4965-base.c | 3681 ++-----
drivers/net/wireless/libertas/11d.c | 16 +-
drivers/net/wireless/libertas/11d.h | 5 +-
drivers/net/wireless/libertas/Makefile | 2 +-
drivers/net/wireless/libertas/assoc.c | 1283 ++-
drivers/net/wireless/libertas/assoc.h | 29 +-
drivers/net/wireless/libertas/cmd.c | 538 +-
drivers/net/wireless/libertas/cmd.h | 11 +-
drivers/net/wireless/libertas/cmdresp.c | 229 +-
drivers/net/wireless/libertas/debugfs.c | 178 +-
drivers/net/wireless/libertas/decl.h | 23 +-
drivers/net/wireless/libertas/defs.h | 12 +-
drivers/net/wireless/libertas/dev.h | 84 +-
drivers/net/wireless/libertas/ethtool.c | 77 +-
drivers/net/wireless/libertas/host.h | 4 -
drivers/net/wireless/libertas/hostcmd.h | 57 +-
drivers/net/wireless/libertas/if_cs.c | 247 +-
drivers/net/wireless/libertas/if_sdio.c | 65 +-
drivers/net/wireless/libertas/if_usb.c | 71 +-
drivers/net/wireless/libertas/if_usb.h | 2 -
drivers/net/wireless/libertas/join.c | 895 --
drivers/net/wireless/libertas/join.h | 53 -
drivers/net/wireless/libertas/main.c | 289 +-
drivers/net/wireless/libertas/rx.c | 6 +-
drivers/net/wireless/libertas/scan.c | 880 +--
drivers/net/wireless/libertas/scan.h | 184 +-
drivers/net/wireless/libertas/tx.c | 25 +-
drivers/net/wireless/libertas/types.h | 13 +
drivers/net/wireless/libertas/wext.c | 62 +-
drivers/net/wireless/libertas/wext.h | 13 -
drivers/net/wireless/net2280.h | 452 -
drivers/net/wireless/p54.h | 81 -
drivers/net/wireless/p54/Kconfig | 63 +
drivers/net/wireless/p54/Makefile | 3 +
drivers/net/wireless/p54/net2280.h | 452 +
drivers/net/wireless/p54/p54.h | 77 +
drivers/net/wireless/p54/p54common.c | 1051 ++
drivers/net/wireless/p54/p54common.h | 254 +
drivers/net/wireless/p54/p54pci.c | 697 ++
drivers/net/wireless/p54/p54pci.h | 106 +
drivers/net/wireless/p54/p54usb.c | 910 ++
drivers/net/wireless/p54/p54usb.h | 133 +
drivers/net/wireless/p54common.c | 1025 --
drivers/net/wireless/p54common.h | 329 -
drivers/net/wireless/p54pci.c | 697 --
drivers/net/wireless/p54pci.h | 106 -
drivers/net/wireless/p54usb.c | 910 --
drivers/net/wireless/p54usb.h | 133 -
drivers/net/wireless/prism54/isl_ioctl.c | 53 +-
drivers/net/wireless/prism54/islpci_dev.c | 6 +-
drivers/net/wireless/prism54/islpci_dev.h | 6 +-
drivers/net/wireless/ray_cs.c | 73 +-
drivers/net/wireless/rndis_wlan.c | 456 +-
drivers/net/wireless/rt2x00/Kconfig | 65 +-
drivers/net/wireless/rt2x00/Makefile | 37 +-
drivers/net/wireless/rt2x00/rt2400pci.c | 571 +-
drivers/net/wireless/rt2x00/rt2400pci.h | 14 +-
drivers/net/wireless/rt2x00/rt2500pci.c | 593 +-
drivers/net/wireless/rt2x00/rt2500pci.h | 6 +-
drivers/net/wireless/rt2x00/rt2500usb.c | 644 +-
drivers/net/wireless/rt2x00/rt2500usb.h | 9 +-
drivers/net/wireless/rt2x00/rt2x00.h | 356 +-
drivers/net/wireless/rt2x00/rt2x00config.c | 167 +-
drivers/net/wireless/rt2x00/rt2x00debug.c | 125 +-
drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +-
drivers/net/wireless/rt2x00/rt2x00dev.c | 913 +-
drivers/net/wireless/rt2x00/rt2x00dump.h | 8 +-
drivers/net/wireless/rt2x00/rt2x00firmware.c | 21 +-
drivers/net/wireless/rt2x00/rt2x00leds.c | 234 +
drivers/net/wireless/rt2x00/rt2x00leds.h | 50 +
drivers/net/wireless/rt2x00/rt2x00lib.h | 106 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 309 +-
drivers/net/wireless/rt2x00/rt2x00pci.c | 287 +-
drivers/net/wireless/rt2x00/rt2x00pci.h | 67 +-
drivers/net/wireless/rt2x00/rt2x00queue.c | 304 +
drivers/net/wireless/rt2x00/rt2x00queue.h | 468 +
drivers/net/wireless/rt2x00/rt2x00reg.h | 75 +-
drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00ring.h | 290 -
drivers/net/wireless/rt2x00/rt2x00usb.c | 331 +-
drivers/net/wireless/rt2x00/rt2x00usb.h | 161 +-
drivers/net/wireless/rt2x00/rt61pci.c | 829 +-
drivers/net/wireless/rt2x00/rt61pci.h | 33 +-
drivers/net/wireless/rt2x00/rt73usb.c | 699 +-
drivers/net/wireless/rt2x00/rt73usb.h | 24 +-
drivers/net/wireless/rtl8180.h | 2 +-
drivers/net/wireless/rtl8180_dev.c | 107 +-
drivers/net/wireless/rtl8180_grf5101.c | 5 +-
drivers/net/wireless/rtl8180_max2820.c | 5 +-
drivers/net/wireless/rtl8180_rtl8225.c | 15 +-
drivers/net/wireless/rtl8180_sa2400.c | 5 +-
drivers/net/wireless/rtl8187.h | 2 +-
drivers/net/wireless/rtl8187_dev.c | 92 +-
drivers/net/wireless/rtl8187_rtl8225.c | 15 +-
drivers/net/wireless/rtl818x.h | 70 -
drivers/net/wireless/strip.c | 72 +-
drivers/net/wireless/wavelan_cs.c | 47 +-
drivers/net/wireless/wavelan_cs.p.h | 26 +-
drivers/net/wireless/zd1211rw/zd_chip.c | 24 +-
drivers/net/wireless/zd1211rw/zd_chip.h | 17 +-
drivers/net/wireless/zd1211rw/zd_ieee80211.c | 11 +-
drivers/net/wireless/zd1211rw/zd_mac.c | 241 +-
drivers/net/wireless/zd1211rw/zd_mac.h | 5 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 15 +-
drivers/net/xen-netfront.c | 4 +-
drivers/net/yellowfin.c | 6 +-
drivers/nubus/proc.c | 44 +-
drivers/of/Kconfig | 12 +
drivers/of/Makefile | 2 +
drivers/of/base.c | 26 +
drivers/of/gpio.c | 242 +
drivers/of/of_i2c.c | 118 +
drivers/oprofile/buffer_sync.c | 2 +-
drivers/oprofile/cpu_buffer.c | 16 +-
drivers/oprofile/cpu_buffer.h | 3 +-
drivers/oprofile/oprofile_stats.c | 4 +-
drivers/parisc/ccio-dma.c | 14 +-
drivers/parisc/dino.c | 1 -
drivers/parisc/sba_iommu.c | 14 +-
drivers/parport/Kconfig | 2 +-
drivers/parport/ieee1284.c | 4 +-
drivers/parport/parport_gsc.c | 4 +-
drivers/parport/parport_pc.c | 12 +-
drivers/pci/access.c | 166 +
drivers/pci/bus.c | 15 +-
drivers/pci/hotplug/Kconfig | 4 +-
drivers/pci/hotplug/acpi_pcihp.c | 24 +-
drivers/pci/hotplug/acpiphp_core.c | 18 +-
drivers/pci/hotplug/acpiphp_glue.c | 38 +-
drivers/pci/hotplug/acpiphp_ibm.c | 36 +-
drivers/pci/hotplug/cpci_hotplug_core.c | 60 +-
drivers/pci/hotplug/cpci_hotplug_pci.c | 10 +-
drivers/pci/hotplug/cpcihp_generic.c | 8 +-
drivers/pci/hotplug/cpqphp.h | 6 +-
drivers/pci/hotplug/cpqphp_core.c | 38 +-
drivers/pci/hotplug/cpqphp_ctrl.c | 64 +-
drivers/pci/hotplug/cpqphp_nvram.c | 2 +-
drivers/pci/hotplug/cpqphp_pci.c | 8 +-
drivers/pci/hotplug/fakephp.c | 4 +-
drivers/pci/hotplug/ibmphp_core.c | 30 +-
drivers/pci/hotplug/ibmphp_ebda.c | 92 +-
drivers/pci/hotplug/ibmphp_hpc.c | 68 +-
drivers/pci/hotplug/ibmphp_pci.c | 18 +-
drivers/pci/hotplug/ibmphp_res.c | 12 +-
drivers/pci/hotplug/pci_hotplug_core.c | 2 +-
drivers/pci/hotplug/pciehp.h | 19 +-
drivers/pci/hotplug/pciehp_core.c | 51 +-
drivers/pci/hotplug/pciehp_ctrl.c | 80 +-
drivers/pci/hotplug/pciehp_hpc.c | 631 +-
drivers/pci/hotplug/pciehp_pci.c | 8 +-
drivers/pci/hotplug/pcihp_skeleton.c | 18 +-
drivers/pci/hotplug/rpadlpar_core.c | 20 +-
drivers/pci/hotplug/rpaphp_core.c | 6 +-
drivers/pci/hotplug/rpaphp_pci.c | 14 +-
drivers/pci/hotplug/rpaphp_slot.c | 6 +-
drivers/pci/hotplug/sgi_hotplug.c | 8 +-
drivers/pci/hotplug/shpchp.h | 6 +-
drivers/pci/hotplug/shpchp_core.c | 37 +-
drivers/pci/hotplug/shpchp_ctrl.c | 46 +-
drivers/pci/hotplug/shpchp_hpc.c | 64 +-
drivers/pci/hotplug/shpchp_pci.c | 4 +-
drivers/pci/intel-iommu.c | 186 +-
drivers/pci/iova.c | 50 +-
drivers/pci/msi.c | 56 +-
drivers/pci/pci-driver.c | 11 +-
drivers/pci/pci-sysfs.c | 134 +-
drivers/pci/pci.c | 6 +-
drivers/pci/pci.h | 19 +
drivers/pci/pcie/Kconfig | 20 +
drivers/pci/pcie/Makefile | 3 +
drivers/pci/pcie/aer/aerdrv.c | 4 +-
drivers/pci/pcie/aer/aerdrv_acpi.c | 7 +-
drivers/pci/pcie/aer/aerdrv_core.c | 5 +-
drivers/pci/pcie/aspm.c | 811 ++
drivers/pci/pcie/portdrv_core.c | 4 +-
drivers/pci/pcie/portdrv_pci.c | 2 +-
drivers/pci/probe.c | 139 +-
drivers/pci/proc.c | 15 +-
drivers/pci/quirks.c | 17 +-
drivers/pci/remove.c | 14 +-
drivers/pci/search.c | 313 +-
drivers/pci/setup-bus.c | 39 +-
drivers/pci/setup-res.c | 87 +-
drivers/pcmcia/Kconfig | 2 +-
drivers/pcmcia/au1000_db1x00.c | 6 +-
drivers/pcmcia/au1000_generic.c | 11 +-
drivers/pcmcia/au1000_pb1x00.c | 14 +-
drivers/pcmcia/au1000_xxs1500.c | 2 +-
drivers/pcmcia/cardbus.c | 2 +-
drivers/pcmcia/cistpl.c | 39 +-
drivers/pcmcia/cs.c | 13 +-
drivers/pcmcia/cs_internal.h | 3 +-
drivers/pcmcia/ds.c | 2 +-
drivers/pcmcia/i82092.c | 6 +-
drivers/pcmcia/omap_cf.c | 2 +-
drivers/pcmcia/pcmcia_ioctl.c | 4 +-
drivers/pcmcia/pd6729.c | 6 +-
drivers/pcmcia/pxa2xx_cm_x270.c | 1 +
drivers/pcmcia/pxa2xx_lubbock.c | 8 +-
drivers/pcmcia/pxa2xx_mainstone.c | 4 +-
drivers/pcmcia/rsrc_nonstatic.c | 2 +-
drivers/pcmcia/sa1100_assabet.c | 4 +-
drivers/pcmcia/sa1100_badge4.c | 8 +-
drivers/pcmcia/sa1100_cerf.c | 2 +-
drivers/pcmcia/sa1100_jornada720.c | 4 +-
drivers/pcmcia/sa1100_neponset.c | 4 +-
drivers/pcmcia/sa1100_shannon.c | 8 +-
drivers/pcmcia/sa1100_simpad.c | 2 +-
drivers/pcmcia/soc_common.c | 17 +-
drivers/pcmcia/soc_common.h | 1 -
drivers/pcmcia/socket_sysfs.c | 52 +-
drivers/pnp/base.h | 74 +-
drivers/pnp/card.c | 55 +-
drivers/pnp/core.c | 46 +-
drivers/pnp/driver.c | 32 +-
drivers/pnp/interface.c | 111 +-
drivers/pnp/isapnp/Makefile | 4 +
drivers/pnp/isapnp/core.c | 340 +-
drivers/pnp/isapnp/proc.c | 9 +-
drivers/pnp/manager.c | 356 +-
drivers/pnp/pnpacpi/Makefile | 4 +
drivers/pnp/pnpacpi/core.c | 92 +-
drivers/pnp/pnpacpi/pnpacpi.h | 8 +-
drivers/pnp/pnpacpi/rsparser.c | 587 +-
drivers/pnp/pnpbios/Makefile | 4 +
drivers/pnp/pnpbios/bioscalls.c | 1 -
drivers/pnp/pnpbios/core.c | 31 +-
drivers/pnp/pnpbios/pnpbios.h | 140 +-
drivers/pnp/pnpbios/proc.c | 6 +-
drivers/pnp/pnpbios/rsparser.c | 328 +-
drivers/pnp/quirks.c | 30 +-
drivers/pnp/resource.c | 361 +-
drivers/pnp/support.c | 63 +
drivers/pnp/system.c | 21 +-
drivers/power/ds2760_battery.c | 4 +-
drivers/power/olpc_battery.c | 2 -
drivers/power/pda_power.c | 11 +
drivers/power/pmu_battery.c | 2 +-
drivers/power/power_supply_core.c | 6 +-
drivers/power/power_supply_leds.c | 4 +-
drivers/ps3/ps3-lpm.c | 1 +
drivers/ps3/ps3-sys-manager.c | 81 +-
drivers/ps3/sys-manager-core.c | 16 +-
drivers/rapidio/Kconfig | 8 -
drivers/rapidio/rio-access.c | 10 +-
drivers/rapidio/rio-scan.c | 55 +-
drivers/rapidio/rio-sysfs.c | 3 +-
drivers/rapidio/rio.c | 2 +-
drivers/rapidio/rio.h | 9 +-
drivers/rtc/Kconfig | 5 +-
drivers/rtc/rtc-at91rm9200.c | 12 +-
drivers/rtc/rtc-at91sam9.c | 2 +-
drivers/rtc/rtc-bfin.c | 2 +-
drivers/rtc/rtc-cmos.c | 7 +-
drivers/rtc/rtc-ds1302.c | 2 +-
drivers/rtc/rtc-ds1307.c | 66 +-
drivers/rtc/rtc-ds1374.c | 10 +-
drivers/rtc/rtc-ds1511.c | 6 +-
drivers/rtc/rtc-ds1672.c | 14 +-
drivers/rtc/rtc-isl1208.c | 364 +-
drivers/rtc/rtc-m41t80.c | 81 +-
drivers/rtc/rtc-max6900.c | 6 +-
drivers/rtc/rtc-max6902.c | 4 +-
drivers/rtc/rtc-pcf8563.c | 134 +-
drivers/rtc/rtc-pcf8583.c | 2 +-
drivers/rtc/rtc-proc.c | 8 +-
drivers/rtc/rtc-rs5c313.c | 4 +-
drivers/rtc/rtc-rs5c372.c | 45 +-
drivers/rtc/rtc-s35390a.c | 10 +-
drivers/rtc/rtc-s3c.c | 6 +-
drivers/rtc/rtc-sh.c | 298 +-
drivers/rtc/rtc-sysfs.c | 12 +-
drivers/rtc/rtc-test.c | 8 +-
drivers/rtc/rtc-v3020.c | 4 +-
drivers/rtc/rtc-x1205.c | 178 +-
drivers/s390/Makefile | 2 +-
drivers/s390/block/Kconfig | 1 +
drivers/s390/block/dasd.c | 10 +-
drivers/s390/block/dasd_3990_erp.c | 34 +
drivers/s390/block/dasd_alias.c | 49 +-
drivers/s390/block/dasd_eckd.c | 7 +
drivers/s390/block/dasd_fba.c | 3 +-
drivers/s390/block/dasd_int.h | 6 +
drivers/s390/block/dasd_proc.c | 16 +-
drivers/s390/block/dcssblk.c | 61 +-
drivers/s390/char/con3215.c | 5 +-
drivers/s390/char/monreader.c | 54 +-
drivers/s390/char/sclp_config.c | 17 +-
drivers/s390/char/sclp_tty.c | 6 +-
drivers/s390/char/sclp_vt220.c | 19 +-
drivers/s390/char/tape_34xx.c | 2 +-
drivers/s390/char/tape_char.c | 4 +-
drivers/s390/char/tape_class.c | 5 +-
drivers/s390/char/tape_class.h | 2 +-
drivers/s390/char/tape_proc.c | 9 +-
drivers/s390/char/tty3270.c | 3 +-
drivers/s390/char/vmur.c | 24 +-
drivers/s390/char/vmur.h | 4 +-
drivers/s390/char/vmwatchdog.c | 4 +-
drivers/s390/char/zcore.c | 2 +-
drivers/s390/cio/blacklist.c | 7 +-
drivers/s390/cio/ccwgroup.c | 104 +-
drivers/s390/cio/chsc.c | 15 +-
drivers/s390/cio/cio.c | 39 +-
drivers/s390/cio/cio.h | 4 +-
drivers/s390/cio/cmf.c | 11 +-
drivers/s390/cio/css.c | 26 +-
drivers/s390/cio/css.h | 1 +
drivers/s390/cio/device.c | 18 +-
drivers/s390/cio/device.h | 1 +
drivers/s390/cio/device_fsm.c | 10 +-
drivers/s390/cio/device_ops.c | 11 +-
drivers/s390/cio/device_status.c | 8 +-
drivers/s390/cio/qdio.c | 194 +-
drivers/s390/cio/qdio.h | 28 +
drivers/s390/crypto/ap_bus.c | 189 +-
drivers/s390/crypto/ap_bus.h | 15 +-
drivers/s390/crypto/zcrypt_api.c | 181 +-
drivers/s390/crypto/zcrypt_api.h | 16 +-
drivers/s390/crypto/zcrypt_cca_key.h | 4 +-
drivers/s390/crypto/zcrypt_error.h | 2 +-
drivers/s390/crypto/zcrypt_pcicc.c | 4 +-
drivers/s390/crypto/zcrypt_pcixcc.c | 201 +-
drivers/s390/kvm/Makefile | 9 +
drivers/s390/kvm/kvm_virtio.c | 339 +
drivers/s390/net/Kconfig | 84 +-
drivers/s390/net/Makefile | 12 +-
drivers/s390/net/claw.c | 344 +-
drivers/s390/net/ctcdbug.c | 80 -
drivers/s390/net/ctcdbug.h | 125 -
drivers/s390/net/ctcm_dbug.c | 67 +
drivers/s390/net/ctcm_dbug.h | 158 +
drivers/s390/net/ctcm_fsms.c | 2347 ++++
drivers/s390/net/ctcm_fsms.h | 359 +
drivers/s390/net/ctcm_main.c | 1772 +++
drivers/s390/net/ctcm_main.h | 287 +
drivers/s390/net/ctcm_mpc.c | 2472 ++++
drivers/s390/net/ctcm_mpc.h | 239 +
drivers/s390/net/ctcm_sysfs.c | 210 +
drivers/s390/net/ctcmain.c | 3062 -----
drivers/s390/net/ctcmain.h | 270 -
drivers/s390/net/cu3088.c | 20 +-
drivers/s390/net/lcs.c | 3 +-
drivers/s390/net/netiucv.c | 98 +-
drivers/s390/net/qeth.h | 1253 --
drivers/s390/net/qeth_core.h | 873 ++
drivers/s390/net/qeth_core_main.c | 4512 ++++++++
drivers/s390/net/qeth_core_mpc.c | 266 +
drivers/s390/net/qeth_core_mpc.h | 566 +
drivers/s390/net/qeth_core_offl.c | 701 ++
drivers/s390/net/qeth_core_offl.h | 76 +
drivers/s390/net/qeth_core_sys.c | 651 ++
drivers/s390/net/qeth_eddp.c | 634 --
drivers/s390/net/qeth_eddp.h | 84 -
drivers/s390/net/qeth_fs.h | 168 -
drivers/s390/net/qeth_l2_main.c | 1248 ++
drivers/s390/net/qeth_l3.h | 64 +
drivers/s390/net/qeth_l3_main.c | 3402 ++++++
drivers/s390/net/qeth_l3_sys.c | 1051 ++
drivers/s390/net/qeth_main.c | 8956 ---------------
drivers/s390/net/qeth_mpc.c | 269 -
drivers/s390/net/qeth_mpc.h | 583 -
drivers/s390/net/qeth_proc.c | 316 -
drivers/s390/net/qeth_sys.c | 1858 ---
drivers/s390/net/qeth_tso.h | 148 -
drivers/s390/s390mach.c | 8 +-
drivers/s390/s390mach.h | 4 +
drivers/s390/scsi/zfcp_aux.c | 33 +-
drivers/s390/scsi/zfcp_ccw.c | 24 +-
drivers/s390/scsi/zfcp_dbf.c | 1283 ++-
drivers/s390/scsi/zfcp_dbf.h | 228 +
drivers/s390/scsi/zfcp_def.h | 171 +-
drivers/s390/scsi/zfcp_erp.c | 688 +-
drivers/s390/scsi/zfcp_ext.h | 59 +-
drivers/s390/scsi/zfcp_fsf.c | 438 +-
drivers/s390/scsi/zfcp_fsf.h | 18 +-
drivers/s390/scsi/zfcp_qdio.c | 7 +-
drivers/s390/scsi/zfcp_scsi.c | 183 +-
drivers/s390/scsi/zfcp_sysfs_adapter.c | 11 +-
drivers/s390/scsi/zfcp_sysfs_port.c | 9 +-
drivers/s390/scsi/zfcp_sysfs_unit.c | 5 +-
drivers/s390/sysinfo.c | 116 +-
drivers/sbus/char/cpwatchdog.c | 2 +-
drivers/sbus/char/uctrl.c | 4 +-
drivers/scsi/3w-9xxx.c | 32 +-
drivers/scsi/3w-xxxx.c | 23 +-
drivers/scsi/53c700.c | 6 +-
drivers/scsi/BusLogic.c | 5 +-
drivers/scsi/BusLogic.h | 21 +-
drivers/scsi/FlashPoint.c | 8 +-
drivers/scsi/Kconfig | 28 +-
drivers/scsi/Makefile | 1 +
drivers/scsi/a100u2w.c | 2 +-
drivers/scsi/a2091.c | 3 +
drivers/scsi/a3000.c | 3 +
drivers/scsi/aacraid/aachba.c | 205 +-
drivers/scsi/aacraid/aacraid.h | 32 +-
drivers/scsi/aacraid/commctrl.c | 2 +-
drivers/scsi/aacraid/comminit.c | 3 +-
drivers/scsi/aacraid/commsup.c | 44 +-
drivers/scsi/aacraid/dpcsup.c | 2 +-
drivers/scsi/aacraid/linit.c | 116 +-
drivers/scsi/aacraid/rx.c | 1 -
drivers/scsi/aacraid/sa.c | 1 -
drivers/scsi/aha152x.c | 13 +-
drivers/scsi/aha1542.c | 26 +-
drivers/scsi/aic7xxx/aic7770_osm.c | 2 +-
drivers/scsi/aic7xxx/aic79xx.h | 23 +-
drivers/scsi/aic7xxx/aic79xx.reg | 115 +-
drivers/scsi/aic7xxx/aic79xx_core.c | 835 ++-
drivers/scsi/aic7xxx/aic79xx_inline.h | 859 +--
drivers/scsi/aic7xxx/aic79xx_osm.c | 188 +-
drivers/scsi/aic7xxx/aic79xx_osm.h | 177 +-
drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 33 +-
drivers/scsi/aic7xxx/aic79xx_pci.c | 8 +-
drivers/scsi/aic7xxx/aic79xx_proc.c | 2 +-
drivers/scsi/aic7xxx/aic79xx_reg.h_shipped | 1145 +--
drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped | 1555 +---
drivers/scsi/aic7xxx/aic79xx_seq.h_shipped | 6 +-
drivers/scsi/aic7xxx/aic7xxx.h | 55 +-
drivers/scsi/aic7xxx/aic7xxx.reg | 45 +-
drivers/scsi/aic7xxx/aic7xxx_93cx6.c | 16 +-
drivers/scsi/aic7xxx/aic7xxx_core.c | 676 +-
drivers/scsi/aic7xxx/aic7xxx_inline.h | 616 +-
drivers/scsi/aic7xxx/aic7xxx_osm.c | 105 +-
drivers/scsi/aic7xxx/aic7xxx_osm.h | 142 +-
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 77 +-
drivers/scsi/aic7xxx/aic7xxx_pci.c | 9 +-
drivers/scsi/aic7xxx/aic7xxx_proc.c | 4 +-
drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped | 233 +-
drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped | 6 +-
drivers/scsi/aic7xxx/aicasm/aicasm.c | 6 +-
drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 105 +-
drivers/scsi/aic7xxx/aicasm/aicasm_scan.l | 19 +-
drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 25 +-
drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 1 +
drivers/scsi/aic94xx/aic94xx.h | 16 -
drivers/scsi/aic94xx/aic94xx_dev.c | 8 +-
drivers/scsi/aic94xx/aic94xx_dump.c | 10 +-
drivers/scsi/aic94xx/aic94xx_dump.h | 9 -
drivers/scsi/aic94xx/aic94xx_hwi.c | 44 +-
drivers/scsi/aic94xx/aic94xx_hwi.h | 2 -
drivers/scsi/aic94xx/aic94xx_init.c | 16 +-
drivers/scsi/aic94xx/aic94xx_reg.c | 53 +-
drivers/scsi/aic94xx/aic94xx_scb.c | 33 +-
drivers/scsi/aic94xx/aic94xx_sds.c | 4 +-
drivers/scsi/aic94xx/aic94xx_seq.c | 31 +-
drivers/scsi/aic94xx/aic94xx_seq.h | 4 -
drivers/scsi/aic94xx/aic94xx_task.c | 12 +-
drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +-
drivers/scsi/arcmsr/arcmsr.h | 4 +-
drivers/scsi/arcmsr/arcmsr_attr.c | 163 +-
drivers/scsi/arm/acornscsi.c | 1 -
drivers/scsi/arm/cumana_1.c | 1 -
drivers/scsi/ch.c | 46 +-
drivers/scsi/constants.c | 10 +-
drivers/scsi/dc395x.c | 1 -
drivers/scsi/dpt/dpti_i2o.h | 1 -
drivers/scsi/dpt/dpti_ioctl.h | 16 +-
drivers/scsi/dpt/dptsig.h | 8 +-
drivers/scsi/dpt/sys_info.h | 4 +-
drivers/scsi/dpt_i2o.c | 642 +-
drivers/scsi/dpti.h | 15 +-
drivers/scsi/eata.c | 11 +-
drivers/scsi/eata_pio.c | 2 -
drivers/scsi/esp_scsi.c | 35 +-
drivers/scsi/esp_scsi.h | 13 +-
drivers/scsi/fdomain.c | 2 +-
drivers/scsi/gdth.c | 322 +-
drivers/scsi/gdth.h | 2 -
drivers/scsi/gvp11.c | 3 +
drivers/scsi/hosts.c | 66 +-
drivers/scsi/hptiop.c | 27 +-
drivers/scsi/ibmvscsi/ibmvscsi.c | 51 +-
drivers/scsi/ibmvscsi/ibmvstgt.c | 25 +-
drivers/scsi/ibmvscsi/viosrp.h | 9 +
drivers/scsi/ide-scsi.c | 230 +-
drivers/scsi/initio.c | 11 +-
drivers/scsi/ipr.c | 216 +-
drivers/scsi/ips.c | 89 +-
drivers/scsi/iscsi_tcp.c | 31 +-
drivers/scsi/jazz_esp.c | 4 +
drivers/scsi/libiscsi.c | 140 +-
drivers/scsi/libsas/sas_ata.c | 21 +-
drivers/scsi/libsas/sas_scsi_host.c | 41 +
drivers/scsi/lpfc/lpfc.h | 5 +-
drivers/scsi/lpfc/lpfc_attr.c | 494 +-
drivers/scsi/lpfc/lpfc_crtn.h | 4 +-
drivers/scsi/lpfc/lpfc_ct.c | 48 +-
drivers/scsi/lpfc/lpfc_debugfs.c | 2 +
drivers/scsi/lpfc/lpfc_els.c | 121 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 73 +-
drivers/scsi/lpfc/lpfc_init.c | 98 +-
drivers/scsi/lpfc/lpfc_nportdisc.c | 40 +-
drivers/scsi/lpfc/lpfc_scsi.c | 34 +-
drivers/scsi/lpfc/lpfc_sli.c | 112 +-
drivers/scsi/lpfc/lpfc_version.h | 2 +-
drivers/scsi/lpfc/lpfc_vport.c | 3 +-
drivers/scsi/mac_esp.c | 657 ++
drivers/scsi/mac_scsi.c | 1 -
drivers/scsi/megaraid.c | 6 +-
drivers/scsi/megaraid/mega_common.h | 1 -
drivers/scsi/megaraid/megaraid_ioctl.h | 2 +-
drivers/scsi/megaraid/megaraid_mbox.c | 30 +-
drivers/scsi/megaraid/megaraid_mbox.h | 1 +
drivers/scsi/megaraid/megaraid_sas.c | 62 +-
drivers/scsi/megaraid/megaraid_sas.h | 11 +-
drivers/scsi/mvme147.c | 3 +
drivers/scsi/mvsas.c | 4 +-
drivers/scsi/ncr53c8xx.c | 11 +-
drivers/scsi/osst.c | 76 +-
drivers/scsi/pcmcia/sym53c500_cs.c | 14 +-
drivers/scsi/ps3rom.c | 101 +-
drivers/scsi/qla1280.c | 9 +-
drivers/scsi/qla2xxx/Kconfig | 3 +-
drivers/scsi/qla2xxx/qla_attr.c | 213 +-
drivers/scsi/qla2xxx/qla_dbg.c | 518 +-
drivers/scsi/qla2xxx/qla_dbg.h | 23 +-
drivers/scsi/qla2xxx/qla_def.h | 80 +-
drivers/scsi/qla2xxx/qla_dfs.c | 2 +-
drivers/scsi/qla2xxx/qla_fw.h | 199 +-
drivers/scsi/qla2xxx/qla_gbl.h | 33 +-
drivers/scsi/qla2xxx/qla_gs.c | 20 +-
drivers/scsi/qla2xxx/qla_init.c | 194 +-
drivers/scsi/qla2xxx/qla_inline.h | 87 +-
drivers/scsi/qla2xxx/qla_iocb.c | 5 +-
drivers/scsi/qla2xxx/qla_isr.c | 227 +-
drivers/scsi/qla2xxx/qla_mbx.c | 335 +-
drivers/scsi/qla2xxx/qla_mid.c | 30 +-
drivers/scsi/qla2xxx/qla_os.c | 451 +-
drivers/scsi/qla2xxx/qla_settings.h | 16 +-
drivers/scsi/qla2xxx/qla_sup.c | 315 +-
drivers/scsi/qla2xxx/qla_version.h | 6 +-
drivers/scsi/qla4xxx/ql4_fw.h | 4 +-
drivers/scsi/qla4xxx/ql4_glbl.h | 4 +
drivers/scsi/qla4xxx/ql4_iocb.c | 14 +-
drivers/scsi/qla4xxx/ql4_isr.c | 40 +-
drivers/scsi/qla4xxx/ql4_mbx.c | 39 +
drivers/scsi/qla4xxx/ql4_os.c | 96 +-
drivers/scsi/raid_class.c | 75 +-
drivers/scsi/scsi.c | 254 +-
drivers/scsi/scsi_debug.c | 1221 +--
drivers/scsi/scsi_debug.h | 24 -
drivers/scsi/scsi_devinfo.c | 77 +-
drivers/scsi/scsi_error.c | 166 +-
drivers/scsi/scsi_lib.c | 50 +-
drivers/scsi/scsi_priv.h | 1 +
drivers/scsi/scsi_proc.c | 11 +-
drivers/scsi/scsi_sas_internal.h | 24 +-
drivers/scsi/scsi_scan.c | 86 +-
drivers/scsi/scsi_sysfs.c | 250 +-
drivers/scsi/scsi_tgt_lib.c | 6 +-
drivers/scsi/scsi_transport_fc.c | 445 +-
drivers/scsi/scsi_transport_iscsi.c | 107 +-
drivers/scsi/scsi_transport_sas.c | 182 +-
drivers/scsi/scsi_transport_spi.c | 216 +-
drivers/scsi/scsi_transport_srp.c | 26 +-
drivers/scsi/sd.c | 79 +-
drivers/scsi/ses.c | 28 +-
drivers/scsi/sg.c | 48 +-
drivers/scsi/sgiwd93.c | 11 +-
drivers/scsi/sni_53c710.c | 2 +
drivers/scsi/st.c | 161 +-
drivers/scsi/st.h | 3 +
drivers/scsi/st_options.h | 6 +-
drivers/scsi/stex.c | 83 +-
drivers/scsi/sun3_scsi_vme.c | 1 +
drivers/scsi/sun3x_esp.c | 2 +
drivers/scsi/sym53c8xx_2/sym_hipd.c | 6 +-
drivers/scsi/u14-34f.c | 15 +-
drivers/scsi/ultrastor.c | 4 +-
drivers/scsi/wd33c93.c | 3 -
drivers/serial/68328serial.c | 21 +-
drivers/serial/68360serial.c | 31 +-
drivers/serial/8250.c | 70 +-
drivers/serial/8250_au1x00.c | 100 -
drivers/serial/8250_early.c | 4 +-
drivers/serial/8250_pci.c | 16 +-
drivers/serial/Kconfig | 54 +-
drivers/serial/Makefile | 3 +-
drivers/serial/amba-pl011.c | 30 +
drivers/serial/atmel_serial.c | 1 -
drivers/serial/bfin_5xx.c | 60 +-
drivers/serial/bfin_sport_uart.c | 614 +
drivers/serial/bfin_sport_uart.h | 63 +
drivers/serial/cpm_uart/cpm_uart.h | 3 +
drivers/serial/cpm_uart/cpm_uart_core.c | 21 +-
drivers/serial/cpm_uart/cpm_uart_cpm1.c | 14 +
drivers/serial/cpm_uart/cpm_uart_cpm2.c | 52 +
drivers/serial/crisv10.c | 30 +-
drivers/serial/dz.c | 2 +-
drivers/serial/imx.c | 111 +-
drivers/serial/ioc3_serial.c | 36 +-
drivers/serial/ioc4_serial.c | 32 +-
drivers/serial/jsm/jsm.h | 1 +
drivers/serial/jsm/jsm_driver.c | 6 +-
drivers/serial/kgdboc.c | 170 +
drivers/serial/mcfserial.c | 23 +-
drivers/serial/mpc52xx_uart.c | 4 +-
drivers/serial/netx-serial.c | 1 +
drivers/serial/of_serial.c | 18 +-
drivers/serial/s3c2410.c | 13 +-
drivers/serial/sa1100.c | 4 +-
drivers/serial/serial_core.c | 145 +-
drivers/serial/sh-sci.c | 9 +-
drivers/serial/sh-sci.h | 60 +-
drivers/serial/sn_console.c | 2 +-
drivers/serial/sunhv.c | 2 +-
drivers/serial/sunsab.c | 2 +-
drivers/serial/sunsu.c | 2 +-
drivers/serial/sunzilog.c | 36 +-
drivers/serial/uartlite.c | 2 +-
drivers/serial/ucc_uart.c | 20 +-
drivers/serial/vr41xx_siu.c | 15 +-
drivers/spi/Kconfig | 13 +-
drivers/spi/atmel_spi.c | 31 +-
drivers/spi/omap_uwire.c | 4 +-
drivers/spi/pxa2xx_spi.c | 52 +-
drivers/spi/spi_bfin5xx.c | 7 +-
drivers/spi/spi_bitbang.c | 2 +-
drivers/spi/spi_imx.c | 223 +-
drivers/spi/spi_mpc83xx.c | 2 +-
drivers/spi/spi_s3c24xx.c | 8 +-
drivers/spi/xilinx_spi.c | 8 +-
drivers/ssb/Kconfig | 20 +
drivers/ssb/Makefile | 2 +
drivers/ssb/driver_chipcommon.c | 12 +-
drivers/ssb/driver_gige.c | 294 +
drivers/ssb/driver_mipscore.c | 1 +
drivers/ssb/driver_pcicore.c | 172 +-
drivers/ssb/embedded.c | 90 +
drivers/ssb/main.c | 260 +-
drivers/ssb/pci.c | 216 +-
drivers/ssb/pcihost_wrapper.c | 10 +
drivers/ssb/pcmcia.c | 699 ++-
drivers/ssb/sprom.c | 133 +
drivers/ssb/ssb_private.h | 24 +
drivers/thermal/Kconfig | 4 +-
drivers/thermal/Makefile | 2 +-
drivers/thermal/thermal.c | 736 --
drivers/thermal/thermal_sys.c | 899 ++
drivers/uio/Kconfig | 23 +-
drivers/uio/Makefile | 1 +
drivers/uio/uio.c | 36 +-
drivers/uio/uio_cif.c | 6 +-
drivers/uio/uio_smx.c | 140 +
drivers/usb/Makefile | 2 +
drivers/usb/atm/Kconfig | 4 -
drivers/usb/atm/cxacru.c | 14 +-
drivers/usb/atm/ueagle-atm.c | 60 +-
drivers/usb/atm/usbatm.c | 27 +-
drivers/usb/atm/usbatm.h | 3 +-
drivers/usb/c67x00/Makefile | 9 +
drivers/usb/c67x00/c67x00-drv.c | 243 +
drivers/usb/c67x00/c67x00-hcd.c | 412 +
drivers/usb/c67x00/c67x00-hcd.h | 133 +
drivers/usb/c67x00/c67x00-ll-hpi.c | 480 +
drivers/usb/c67x00/c67x00-sched.c | 1170 ++
drivers/usb/c67x00/c67x00.h | 294 +
drivers/usb/class/cdc-acm.c | 100 +-
drivers/usb/class/cdc-acm.h | 7 +-
drivers/usb/core/Kconfig | 42 +-
drivers/usb/core/config.c | 17 +
drivers/usb/core/devio.c | 73 +-
drivers/usb/core/driver.c | 52 +-
drivers/usb/core/hcd-pci.c | 15 +-
drivers/usb/core/hcd.c | 25 +-
drivers/usb/core/hcd.h | 9 +-
drivers/usb/core/hub.c | 397 +-
drivers/usb/core/hub.h | 9 +-
drivers/usb/core/inode.c | 8 +-
drivers/usb/core/message.c | 21 +-
drivers/usb/core/quirks.c | 14 +
drivers/usb/core/sysfs.c | 22 +-
drivers/usb/core/urb.c | 26 +-
drivers/usb/core/usb.h | 2 -
drivers/usb/gadget/Kconfig | 42 +-
drivers/usb/gadget/Makefile | 1 +
drivers/usb/gadget/amd5536udc.c | 30 +-
drivers/usb/gadget/at91_udc.c | 20 +-
drivers/usb/gadget/atmel_usba_udc.c | 156 +-
drivers/usb/gadget/atmel_usba_udc.h | 9 +
drivers/usb/gadget/dummy_hcd.c | 101 +-
drivers/usb/gadget/epautoconf.c | 12 +-
drivers/usb/gadget/ether.c | 26 +-
drivers/usb/gadget/file_storage.c | 61 +-
drivers/usb/gadget/fsl_usb2_udc.c | 4 +-
drivers/usb/gadget/fsl_usb2_udc.h | 2 +-
drivers/usb/gadget/gmidi.c | 8 +-
drivers/usb/gadget/goku_udc.c | 22 +-
drivers/usb/gadget/inode.c | 18 +-
drivers/usb/gadget/lh7a40x_udc.c | 132 +-
drivers/usb/gadget/m66592-udc.h | 4 +-
drivers/usb/gadget/net2280.h | 2 +-
drivers/usb/gadget/omap_udc.c | 27 +-
drivers/usb/gadget/printer.c | 92 +-
drivers/usb/gadget/pxa27x_udc.c | 2404 ++++
drivers/usb/gadget/pxa27x_udc.h | 487 +
drivers/usb/gadget/pxa2xx_udc.c | 26 +-
drivers/usb/gadget/rndis.c | 188 +-
drivers/usb/gadget/serial.c | 103 +-
drivers/usb/gadget/usbstring.c | 2 +-
drivers/usb/gadget/zero.c | 370 +-
drivers/usb/host/Kconfig | 49 +-
drivers/usb/host/Makefile | 4 +-
drivers/usb/host/ehci-au1xxx.c | 5 +-
drivers/usb/host/ehci-dbg.c | 6 +-
drivers/usb/host/ehci-fsl.c | 9 +-
drivers/usb/host/ehci-hcd.c | 115 +-
drivers/usb/host/ehci-hub.c | 38 +-
drivers/usb/host/ehci-ixp4xx.c | 3 +-
drivers/usb/host/ehci-orion.c | 37 +-
drivers/usb/host/ehci-pci.c | 9 +-
drivers/usb/host/ehci-ppc-soc.c | 5 +-
drivers/usb/host/ehci-ps3.c | 1 -
drivers/usb/host/ehci-q.c | 108 +-
drivers/usb/host/ehci-sched.c | 46 +-
drivers/usb/host/isp116x-hcd.c | 14 +-
drivers/usb/host/isp1760-hcd.c | 2231 ++++
drivers/usb/host/isp1760-hcd.h | 206 +
drivers/usb/host/isp1760-if.c | 298 +
drivers/usb/host/ohci-at91.c | 2 +-
drivers/usb/host/ohci-au1xxx.c | 1 -
drivers/usb/host/ohci-dbg.c | 2 +-
drivers/usb/host/ohci-ep93xx.c | 5 +-
drivers/usb/host/ohci-hub.c | 134 +-
drivers/usb/host/ohci-lh7a404.c | 1 -
drivers/usb/host/ohci-omap.c | 8 +-
drivers/usb/host/ohci-pci.c | 47 +-
drivers/usb/host/ohci-pnx4008.c | 1 -
drivers/usb/host/ohci-pnx8550.c | 1 -
drivers/usb/host/ohci-ppc-of.c | 1 -
drivers/usb/host/ohci-ppc-soc.c | 1 -
drivers/usb/host/ohci-ps3.c | 2 -
drivers/usb/host/ohci-pxa27x.c | 6 +-
drivers/usb/host/ohci-s3c2410.c | 1 -
drivers/usb/host/ohci-sa1111.c | 1 -
drivers/usb/host/ohci-sh.c | 1 -
drivers/usb/host/ohci-sm501.c | 16 +-
drivers/usb/host/ohci-ssb.c | 37 +-
drivers/usb/host/pci-quirks.c | 6 +-
drivers/usb/host/r8a66597-hcd.c | 262 +-
drivers/usb/host/r8a66597.h | 51 +-
drivers/usb/host/sl811-hcd.c | 24 +-
drivers/usb/host/u132-hcd.c | 5124 +++++-----
drivers/usb/host/uhci-hcd.c | 101 +-
drivers/usb/host/uhci-hcd.h | 5 +-
drivers/usb/host/uhci-q.c | 2 +-
drivers/usb/image/Kconfig | 4 +-
drivers/usb/image/microtek.c | 3 +-
drivers/usb/image/microtek.h | 1 -
drivers/usb/misc/Kconfig | 20 +-
drivers/usb/misc/adutux.c | 120 +-
drivers/usb/misc/appledisplay.c | 7 +-
drivers/usb/misc/auerswald.c | 135 +-
drivers/usb/misc/emi26.c | 30 +-
drivers/usb/misc/emi62.c | 32 +-
drivers/usb/misc/ftdi-elan.c | 2 +-
drivers/usb/misc/iowarrior.c | 10 +-
drivers/usb/misc/ldusb.c | 38 +-
drivers/usb/misc/legousbtower.c | 92 +-
drivers/usb/misc/phidgetkit.c | 6 +-
drivers/usb/misc/phidgetmotorcontrol.c | 2 +-
drivers/usb/misc/phidgetservo.c | 6 +-
drivers/usb/misc/usblcd.c | 8 +-
drivers/usb/misc/usbtest.c | 285 +-
drivers/usb/mon/Makefile | 2 +-
drivers/usb/mon/mon_bin.c | 9 +-
drivers/usb/mon/mon_main.c | 3 +-
drivers/usb/mon/mon_stat.c | 3 +
drivers/usb/serial/Kconfig | 76 +-
drivers/usb/serial/Makefile | 3 +-
drivers/usb/serial/aircable.c | 146 +-
drivers/usb/serial/airprime.c | 98 +-
drivers/usb/serial/ark3116.c | 64 +-
drivers/usb/serial/belkin_sa.c | 23 +-
drivers/usb/serial/ch341.c | 5 +-
drivers/usb/serial/console.c | 10 +-
drivers/usb/serial/cp2101.c | 114 +-
drivers/usb/serial/cyberjack.c | 112 +-
drivers/usb/serial/cypress_m8.c | 579 +-
drivers/usb/serial/digi_acceleport.c | 53 +-
drivers/usb/serial/empeg.c | 59 +-
drivers/usb/serial/ezusb.c | 8 +-
drivers/usb/serial/ftdi_sio.c | 181 +-
drivers/usb/serial/ftdi_sio.h | 11 +
drivers/usb/serial/funsoft.c | 3 -
drivers/usb/serial/garmin_gps.c | 115 +-
drivers/usb/serial/generic.c | 56 +-
drivers/usb/serial/hp4x.c | 3 -
drivers/usb/serial/io_edgeport.c | 328 +-
drivers/usb/serial/io_tables.h | 12 -
drivers/usb/serial/io_ti.c | 399 +-
drivers/usb/serial/ipaq.c | 53 +-
drivers/usb/serial/ipw.c | 51 +-
drivers/usb/serial/ir-usb.c | 53 +-
drivers/usb/serial/iuu_phoenix.c | 165 +-
drivers/usb/serial/keyspan.c | 281 +-
drivers/usb/serial/keyspan.h | 16 -
drivers/usb/serial/keyspan_pda.c | 42 +-
drivers/usb/serial/kl5kusb105.c | 127 +-
drivers/usb/serial/kobil_sct.c | 75 +-
drivers/usb/serial/mct_u232.c | 41 +-
drivers/usb/serial/mos7720.c | 122 +-
drivers/usb/serial/mos7840.c | 169 +-
drivers/usb/serial/navman.c | 31 +-
drivers/usb/serial/omninet.c | 42 +-
drivers/usb/serial/option.c | 92 +-
drivers/usb/serial/oti6858.c | 134 +-
drivers/usb/serial/pl2303.c | 117 +-
drivers/usb/serial/safe_serial.c | 60 +-
drivers/usb/serial/sierra.c | 129 +-
drivers/usb/serial/spcp8x5.c | 1073 ++
drivers/usb/serial/ti_usb_3410_5052.c | 212 +-
drivers/usb/serial/usb-serial.c | 198 +-
drivers/usb/serial/usb_debug.c | 3 -
drivers/usb/serial/visor.c | 103 +-
drivers/usb/serial/whiteheat.c | 122 +-
drivers/usb/storage/Kconfig | 40 +-
drivers/usb/storage/Makefile | 1 +
drivers/usb/storage/cypress_atacb.c | 200 +
drivers/usb/storage/cypress_atacb.h | 25 +
drivers/usb/storage/isd200.c | 2 +
drivers/usb/storage/libusual.c | 16 +-
drivers/usb/storage/onetouch.c | 4 +-
drivers/usb/storage/scsiglue.c | 26 +-
drivers/usb/storage/transport.c | 23 +-
drivers/usb/storage/unusual_devs.h | 36 +-
drivers/usb/storage/usb.c | 29 +-
drivers/usb/usb-skeleton.c | 8 +-
drivers/video/Kconfig | 92 +-
drivers/video/Makefile | 3 +
drivers/video/am200epd.c | 295 +
drivers/video/amifb.c | 2 +-
drivers/video/arkfb.c | 32 +-
drivers/video/atafb.c | 2 +-
drivers/video/atmel_lcdfb.c | 74 +-
drivers/video/aty/aty128fb.c | 4 +-
drivers/video/aty/atyfb_base.c | 7 +-
drivers/video/aty/mach64_ct.c | 16 +-
drivers/video/aty/radeon_base.c | 51 +-
drivers/video/aty/radeon_i2c.c | 13 +-
drivers/video/aty/radeon_monitor.c | 56 +-
drivers/video/aty/radeonfb.h | 20 +-
drivers/video/bf54x-lq043fb.c | 8 +-
drivers/video/bw2.c | 5 +-
drivers/video/cfbcopyarea.c | 23 +-
drivers/video/cfbfillrect.c | 48 +-
drivers/video/cfbimgblt.c | 54 +-
drivers/video/cg14.c | 6 +-
drivers/video/cg3.c | 2 +-
drivers/video/cg6.c | 2 +-
drivers/video/cirrusfb.c | 6 +-
drivers/video/clps711xfb.c | 2 +-
drivers/video/console/fbcon.c | 13 +-
drivers/video/console/fbcon.h | 12 +-
drivers/video/console/mdacon.c | 2 +-
drivers/video/console/sticon.c | 4 +-
drivers/video/console/vgacon.c | 4 +-
drivers/video/fb_draw.h | 31 +-
drivers/video/fbmem.c | 95 +-
drivers/video/ffb.c | 7 +-
drivers/video/fsl-diu-fb.c | 1721 +++
drivers/video/fsl-diu-fb.h | 223 +
drivers/video/geode/Kconfig | 20 -
drivers/video/geode/Makefile | 2 +-
drivers/video/geode/display_gx.c | 125 +-
drivers/video/geode/display_gx.h | 101 -
drivers/video/geode/gxfb.h | 358 +
drivers/video/geode/gxfb_core.c | 160 +-
drivers/video/geode/lxfb.h | 499 +-
drivers/video/geode/lxfb_core.c | 118 +-
drivers/video/geode/lxfb_ops.c | 699 +-
drivers/video/geode/suspend_gx.c | 267 +
drivers/video/geode/video_gx.c | 162 +-
drivers/video/geode/video_gx.h | 72 -
drivers/video/gxt4500.c | 2 +-
drivers/video/hecubafb.c | 302 +-
drivers/video/imsttfb.c | 8 +-
drivers/video/imxfb.c | 6 +-
drivers/video/intelfb/intelfb.h | 12 +-
drivers/video/intelfb/intelfb_i2c.c | 2 +
drivers/video/intelfb/intelfbdrv.c | 12 +-
drivers/video/intelfb/intelfbhw.c | 16 +-
drivers/video/leo.c | 2 +-
drivers/video/matrox/matroxfb_DAC1064.c | 36 +-
drivers/video/matrox/matroxfb_Ti3026.c | 16 +-
drivers/video/matrox/matroxfb_accel.c | 14 +-
drivers/video/matrox/matroxfb_base.c | 42 +-
drivers/video/matrox/matroxfb_crtc2.c | 2 +-
drivers/video/matrox/matroxfb_maven.c | 2 +-
drivers/video/matrox/matroxfb_misc.c | 40 +-
drivers/video/metronomefb.c | 337 +-
drivers/video/modedb.c | 26 +-
drivers/video/n411.c | 202 +
drivers/video/nvidia/nv_hw.c | 4 +-
drivers/video/nvidia/nv_setup.c | 4 +-
drivers/video/nvidia/nvidia.c | 9 +-
drivers/video/offb.c | 15 +-
drivers/video/p9100.c | 2 +-
drivers/video/pm2fb.c | 24 +-
drivers/video/pm3fb.c | 4 +-
drivers/video/pxafb.c | 1298 ++-
drivers/video/pxafb.h | 70 +-
drivers/video/riva/fbdev.c | 12 +-
drivers/video/riva/nv_driver.c | 7 +-
drivers/video/riva/riva_hw.c | 4 +-
drivers/video/s3c2410fb.c | 6 +-
drivers/video/s3fb.c | 34 +-
drivers/video/sa1100fb.h | 2 +-
drivers/video/savage/savagefb-i2c.c | 2 +-
drivers/video/sis/sis.h | 2 +-
drivers/video/sstfb.c | 10 +-
drivers/video/stifb.c | 4 +-
drivers/video/syscopyarea.c | 20 +-
drivers/video/sysfillrect.c | 49 +-
drivers/video/sysimgblt.c | 49 +-
drivers/video/tcx.c | 10 +-
drivers/video/tdfxfb.c | 2 +-
drivers/video/tridentfb.c | 14 +-
drivers/video/uvesafb.c | 9 +-
drivers/video/vermilion/vermilion.c | 5 +-
drivers/video/vt8623fb.c | 38 +-
drivers/video/w100fb.c | 6 +-
drivers/video/xen-fbfront.c | 550 +
drivers/virtio/virtio.c | 38 +-
drivers/virtio/virtio_balloon.c | 12 +-
drivers/virtio/virtio_pci.c | 34 +-
drivers/virtio/virtio_ring.c | 5 +
drivers/w1/w1_log.h | 2 +-
drivers/watchdog/sc1200wdt.c | 2 +-
drivers/xen/Kconfig | 19 +
drivers/xen/Makefile | 4 +-
drivers/xen/balloon.c | 712 ++
drivers/xen/events.c | 674 ++
drivers/xen/features.c | 29 +
drivers/xen/grant-table.c | 37 +-
drivers/xen/xenbus/xenbus_client.c | 6 +-
drivers/xen/xenbus/xenbus_probe.c | 32 +-
drivers/xen/xencomm.c | 232 +
drivers/zorro/proc.c | 81 +-
fs/9p/fid.c | 1 -
fs/9p/vfs_super.c | 7 +-
fs/Kconfig | 209 +-
fs/Kconfig.binfmt | 4 +-
fs/adfs/adfs.h | 2 +-
fs/adfs/dir_f.c | 4 +-
fs/affs/affs.h | 4 +-
fs/affs/file.c | 50 +-
fs/affs/inode.c | 34 +-
fs/affs/namei.c | 6 +-
fs/affs/super.c | 21 +-
fs/afs/afs_cm.h | 3 +-
fs/afs/cell.c | 2 +-
fs/afs/cmservice.c | 133 +-
fs/afs/dir.c | 4 +-
fs/afs/internal.h | 8 +-
fs/afs/proc.c | 33 +-
fs/aio.c | 91 +-
fs/anon_inodes.c | 13 +-
fs/autofs4/autofs_i.h | 2 +-
fs/autofs4/expire.c | 26 +-
fs/autofs4/root.c | 40 +-
fs/autofs4/waitq.c | 2 +-
fs/befs/linuxvfs.c | 6 +-
fs/bfs/bfs.h | 2 +-
fs/binfmt_aout.c | 12 +-
fs/binfmt_elf.c | 53 +-
fs/binfmt_elf_fdpic.c | 14 +-
fs/binfmt_em86.c | 2 +-
fs/binfmt_flat.c | 9 +-
fs/binfmt_misc.c | 24 +-
fs/binfmt_script.c | 2 +-
fs/binfmt_som.c | 10 -
fs/bio.c | 248 +-
fs/buffer.c | 44 +-
fs/char_dev.c | 1 -
fs/cifs/CHANGES | 3 +-
fs/cifs/README | 9 +-
fs/cifs/cifs_debug.c | 4 +-
fs/cifs/cifs_dfs_ref.c | 31 +-
fs/cifs/cifsacl.c | 14 +-
fs/cifs/cifsacl.h | 1 +
fs/cifs/cifsfs.c | 10 +-
fs/cifs/cifsfs.h | 2 -
fs/cifs/cifspdu.h | 121 +-
fs/cifs/cifsproto.h | 9 +-
fs/cifs/cifssmb.c | 32 +-
fs/cifs/connect.c | 1 +
fs/cifs/inode.c | 15 +-
fs/cifs/transport.c | 18 +
fs/coda/coda_linux.c | 2 +-
fs/coda/dir.c | 6 +-
fs/compat.c | 15 +-
fs/compat_ioctl.c | 4 +-
fs/configfs/file.c | 2 +-
fs/configfs/inode.c | 2 +-
fs/configfs/mount.c | 2 +-
fs/configfs/symlink.c | 4 +-
fs/cramfs/inode.c | 1 -
fs/dcache.c | 114 +-
fs/debugfs/file.c | 2 +-
fs/devpts/inode.c | 43 +-
fs/dlm/Makefile | 1 +
fs/dlm/config.c | 50 +-
fs/dlm/config.h | 3 +-
fs/dlm/dlm_internal.h | 9 +-
fs/dlm/lock.c | 5 +-
fs/dlm/lock.h | 1 -
fs/dlm/lockspace.c | 2 +-
fs/dlm/main.c | 7 +
fs/dlm/member.c | 34 +-
fs/dlm/plock.c | 439 +
fs/dlm/recoverd.c | 1 +
fs/dnotify.c | 11 +
fs/dquot.c | 109 +-
fs/drop_caches.c | 14 +-
fs/ecryptfs/Makefile | 2 +-
fs/ecryptfs/crypto.c | 33 +-
fs/ecryptfs/ecryptfs_kernel.h | 102 +-
fs/ecryptfs/file.c | 2 +
fs/ecryptfs/inode.c | 6 +-
fs/ecryptfs/keystore.c | 89 +-
fs/ecryptfs/main.c | 2 +-
fs/ecryptfs/messaging.c | 524 +-
fs/ecryptfs/miscdev.c | 598 +
fs/ecryptfs/mmap.c | 18 +-
fs/ecryptfs/netlink.c | 33 +-
fs/ecryptfs/read_write.c | 16 +-
fs/eventfd.c | 15 +-
fs/eventpoll.c | 57 +-
fs/exec.c | 52 +-
fs/exportfs/expfs.c | 10 +-
fs/ext2/balloc.c | 29 +-
fs/ext2/dir.c | 20 +-
fs/ext2/ialloc.c | 14 +-
fs/ext2/inode.c | 19 +-
fs/ext2/ioctl.c | 57 +-
fs/ext2/super.c | 27 +-
fs/ext2/xattr.c | 15 +-
fs/ext2/xip.c | 53 +-
fs/ext2/xip.h | 9 +-
fs/ext3/balloc.c | 30 +-
fs/ext3/ext3_jbd.c | 12 +-
fs/ext3/fsync.c | 3 +
fs/ext3/ialloc.c | 8 +-
fs/ext3/inode.c | 49 +-
fs/ext3/ioctl.c | 103 +-
fs/ext3/namei.c | 37 +-
fs/ext3/resize.c | 71 +-
fs/ext3/super.c | 53 +-
fs/ext3/xattr.c | 24 +-
fs/ext3/xattr.h | 7 -
fs/ext4/acl.c | 12 +-
fs/ext4/balloc.c | 33 +-
fs/ext4/bitmap.c | 2 +-
fs/ext4/dir.c | 4 +-
fs/ext4/ext4.h | 1205 ++
fs/ext4/ext4_extents.h | 232 +
fs/ext4/ext4_i.h | 167 +
fs/ext4/ext4_jbd2.c | 14 +-
fs/ext4/ext4_jbd2.h | 231 +
fs/ext4/ext4_sb.h | 148 +
fs/ext4/extents.c | 354 +-
fs/ext4/file.c | 6 +-
fs/ext4/fsync.c | 7 +-
fs/ext4/hash.c | 2 +-
fs/ext4/ialloc.c | 46 +-
fs/ext4/inode.c | 63 +-
fs/ext4/ioctl.c | 102 +-
fs/ext4/mballoc.c | 459 +-
fs/ext4/mballoc.h | 304 +
fs/ext4/migrate.c | 43 +-
fs/ext4/namei.c | 44 +-
fs/ext4/resize.c | 83 +-
fs/ext4/super.c | 81 +-
fs/ext4/symlink.c | 2 +-
fs/ext4/xattr.c | 40 +-
fs/ext4/xattr.h | 7 -
fs/ext4/xattr_security.c | 4 +-
fs/ext4/xattr_trusted.c | 4 +-
fs/ext4/xattr_user.c | 4 +-
fs/fat/cache.c | 6 +-
fs/fat/dir.c | 52 +-
fs/fat/fatent.c | 11 +-
fs/fat/file.c | 218 +-
fs/fat/inode.c | 46 +-
fs/fcntl.c | 41 +-
fs/file.c | 23 +-
fs/file_table.c | 43 +-
fs/freevxfs/vxfs_extern.h | 5 +
fs/freevxfs/vxfs_immed.c | 1 +
fs/freevxfs/vxfs_inode.c | 5 -
fs/fs-writeback.c | 78 +-
fs/fuse/control.c | 2 +-
fs/fuse/dev.c | 23 +-
fs/fuse/dir.c | 86 +-
fs/fuse/file.c | 633 +-
fs/fuse/fuse_i.h | 52 +-
fs/fuse/inode.c | 95 +-
fs/gfs2/Kconfig | 2 +-
fs/gfs2/Makefile | 2 +-
fs/gfs2/acl.c | 6 +-
fs/gfs2/bmap.c | 670 +-
fs/gfs2/dir.c | 84 +-
fs/gfs2/eattr.c | 58 +-
fs/gfs2/glock.c | 188 +-
fs/gfs2/glock.h | 14 +-
fs/gfs2/glops.c | 10 +-
fs/gfs2/incore.h | 40 +-
fs/gfs2/inode.c | 72 +-
fs/gfs2/inode.h | 22 +-
fs/gfs2/lm.c | 210 -
fs/gfs2/lm.h | 42 -
fs/gfs2/locking/dlm/Makefile | 2 +-
fs/gfs2/locking/dlm/lock.c | 7 +-
fs/gfs2/locking/dlm/lock_dlm.h | 13 +-
fs/gfs2/locking/dlm/main.c | 10 -
fs/gfs2/locking/dlm/mount.c | 21 +
fs/gfs2/locking/dlm/plock.c | 406 -
fs/gfs2/locking/dlm/sysfs.c | 4 +-
fs/gfs2/locking/dlm/thread.c | 10 +-
fs/gfs2/locking/nolock/main.c | 2 +-
fs/gfs2/log.c | 19 +-
fs/gfs2/lops.c | 21 +-
fs/gfs2/lops.h | 11 +-
fs/gfs2/main.c | 10 +
fs/gfs2/ops_address.c | 46 +-
fs/gfs2/ops_dentry.c | 4 +-
fs/gfs2/ops_export.c | 2 -
fs/gfs2/ops_file.c | 37 +-
fs/gfs2/ops_fstype.c | 80 +-
fs/gfs2/ops_inode.c | 42 +-
fs/gfs2/ops_inode.h | 1 -
fs/gfs2/ops_super.c | 1 -
fs/gfs2/quota.c | 74 +-
fs/gfs2/quota.h | 17 +
fs/gfs2/recovery.c | 15 +-
fs/gfs2/rgrp.c | 370 +-
fs/gfs2/rgrp.h | 8 +-
fs/gfs2/super.c | 6 +-
fs/gfs2/super.h | 1 +
fs/gfs2/sys.c | 7 -
fs/gfs2/trans.c | 25 +-
fs/gfs2/trans.h | 2 +-
fs/gfs2/util.c | 24 +-
fs/gfs2/util.h | 20 +-
fs/hfs/btree.c | 10 +-
fs/hfs/mdb.c | 2 +-
fs/hfs/super.c | 6 +-
fs/hfsplus/btree.c | 10 +-
fs/hfsplus/hfsplus_fs.h | 4 +
fs/hfsplus/inode.c | 3 -
fs/hfsplus/ioctl.c | 40 +-
fs/hfsplus/options.c | 3 +-
fs/hfsplus/super.c | 4 +-
fs/hfsplus/wrapper.c | 2 +-
fs/hugetlbfs/inode.c | 4 +-
fs/inode.c | 62 +-
fs/inotify_user.c | 2 +-
fs/internal.h | 11 +
fs/ioctl.c | 4 +-
fs/isofs/dir.c | 8 +
fs/isofs/isofs.h | 12 +-
fs/isofs/namei.c | 7 +
fs/jbd/commit.c | 19 +-
fs/jbd/journal.c | 18 +-
fs/jbd/revoke.c | 2 +-
fs/jbd/transaction.c | 38 +-
fs/jbd2/commit.c | 19 +-
fs/jbd2/journal.c | 55 +-
fs/jbd2/revoke.c | 165 +-
fs/jbd2/transaction.c | 41 +-
fs/jffs2/README.Locking | 22 +-
fs/jffs2/build.c | 32 +-
fs/jffs2/debug.c | 164 +-
fs/jffs2/debug.h | 14 +-
fs/jffs2/dir.c | 100 +-
fs/jffs2/erase.c | 89 +-
fs/jffs2/file.c | 16 +-
fs/jffs2/fs.c | 56 +-
fs/jffs2/gc.c | 50 +-
fs/jffs2/ioctl.c | 1 +
fs/jffs2/jffs2_fs_i.h | 4 +-
fs/jffs2/jffs2_fs_sb.h | 7 +-
fs/jffs2/nodelist.h | 7 +-
fs/jffs2/nodemgmt.c | 26 +-
fs/jffs2/os-linux.h | 2 +-
fs/jffs2/readinode.c | 54 +-
fs/jffs2/scan.c | 9 +-
fs/jffs2/super.c | 27 +-
fs/jffs2/wbuf.c | 30 +-
fs/jffs2/write.c | 67 +-
fs/jffs2/xattr.c | 8 +-
fs/jfs/ioctl.c | 33 +-
fs/jfs/jfs_debug.c | 4 +-
fs/jfs/jfs_dmap.c | 11 +-
fs/jfs/jfs_dmap.h | 2 +-
fs/jfs/jfs_imap.c | 15 +-
fs/jfs/jfs_xtree.c | 26 +-
fs/lockd/clntproc.c | 186 +-
fs/lockd/host.c | 93 +-
fs/lockd/mon.c | 113 +-
fs/lockd/svc.c | 162 +-
fs/lockd/svclock.c | 10 +-
fs/lockd/svcshare.c | 3 +-
fs/lockd/svcsubs.c | 69 +-
fs/locks.c | 52 +-
fs/msdos/namei.c | 4 +-
fs/namei.c | 284 +-
fs/namespace.c | 675 +-
fs/ncpfs/inode.c | 6 -
fs/ncpfs/ioctl.c | 71 +-
fs/ncpfs/ncplib_kernel.c | 39 +-
fs/ncpfs/ncpsign_kernel.c | 2 +-
fs/nfs/Makefile | 3 +-
fs/nfs/callback.c | 93 +-
fs/nfs/client.c | 43 +-
fs/nfs/dir.c | 5 +-
fs/nfs/direct.c | 88 +-
fs/nfs/file.c | 18 +-
fs/nfs/inode.c | 45 +-
fs/nfs/internal.h | 13 +-
fs/nfs/namespace.c | 2 +-
fs/nfs/nfs2xdr.c | 113 +-
fs/nfs/nfs3xdr.c | 71 +-
fs/nfs/nfs4proc.c | 39 +-
fs/nfs/nfs4state.c | 49 +-
fs/nfs/nfs4xdr.c | 147 +-
fs/nfs/read.c | 94 +-
fs/nfs/super.c | 181 +-
fs/nfs/symlink.c | 1 -
fs/nfs/unlink.c | 2 +-
fs/nfs/write.c | 207 +-
fs/nfsd/auth.c | 1 +
fs/nfsd/export.c | 9 +-
fs/nfsd/nfs4callback.c | 32 +-
fs/nfsd/nfs4idmap.c | 2 +-
fs/nfsd/nfs4proc.c | 7 +-
fs/nfsd/nfs4recover.c | 16 +-
fs/nfsd/nfs4state.c | 77 +-
fs/nfsd/nfs4xdr.c | 27 +-
fs/nfsd/nfsctl.c | 91 +-
fs/nfsd/nfsfh.c | 228 +-
fs/nfsd/nfssvc.c | 2 -
fs/nfsd/vfs.c | 107 +-
fs/ntfs/debug.h | 6 +-
fs/ntfs/mft.c | 6 +-
fs/ocfs2/Makefile | 14 +-
fs/ocfs2/alloc.c | 465 +-
fs/ocfs2/aops.c | 6 +-
fs/ocfs2/cluster/Makefile | 2 +-
fs/ocfs2/cluster/netdebug.c | 441 +
fs/ocfs2/cluster/nodemanager.c | 5 +-
fs/ocfs2/cluster/sys.c | 11 +-
fs/ocfs2/cluster/tcp.c | 164 +-
fs/ocfs2/cluster/tcp.h | 32 +
fs/ocfs2/cluster/tcp_internal.h | 26 +-
fs/ocfs2/dlm/Makefile | 2 +-
fs/ocfs2/dlm/dlmcommon.h | 49 +
fs/ocfs2/dlm/dlmdebug.c | 913 ++-
fs/ocfs2/dlm/dlmdebug.h | 86 +
fs/ocfs2/dlm/dlmdomain.c | 70 +-
fs/ocfs2/dlm/dlmfs.c | 2 +-
fs/ocfs2/dlm/dlmlock.c | 22 +-
fs/ocfs2/dlm/dlmmaster.c | 200 +-
fs/ocfs2/dlmglue.c | 645 +-
fs/ocfs2/dlmglue.h | 5 +-
fs/ocfs2/file.c | 8 +-
fs/ocfs2/heartbeat.c | 184 +-
fs/ocfs2/heartbeat.h | 17 +-
fs/ocfs2/ioctl.c | 24 +-
fs/ocfs2/ioctl.h | 3 +-
fs/ocfs2/journal.c | 211 +-
fs/ocfs2/journal.h | 4 +
fs/ocfs2/localalloc.c | 8 +-
fs/ocfs2/namei.c | 4 +-
fs/ocfs2/ocfs2.h | 77 +-
fs/ocfs2/ocfs2_fs.h | 79 +-
fs/ocfs2/ocfs2_lockid.h | 2 +-
fs/ocfs2/slot_map.c | 454 +-
fs/ocfs2/slot_map.h | 32 +-
fs/ocfs2/stack_o2cb.c | 420 +
fs/ocfs2/stack_user.c | 883 ++
fs/ocfs2/stackglue.c | 568 +
fs/ocfs2/stackglue.h | 261 +
fs/ocfs2/suballoc.c | 103 +-
fs/ocfs2/suballoc.h | 1 +
fs/ocfs2/super.c | 208 +-
fs/ocfs2/symlink.c | 2 +
fs/open.c | 152 +-
fs/partitions/check.c | 4 +
fs/partitions/ldm.c | 8 +-
fs/partitions/msdos.c | 20 +-
fs/pipe.c | 20 +
fs/pnode.c | 60 +-
fs/pnode.h | 2 +
fs/proc/array.c | 7 +-
fs/proc/base.c | 239 +-
fs/proc/generic.c | 149 +-
fs/proc/inode.c | 69 +-
fs/proc/internal.h | 4 +-
fs/proc/nommu.c | 2 +-
fs/proc/proc_misc.c | 85 +-
fs/proc/proc_net.c | 17 +-
fs/proc/proc_sysctl.c | 52 +-
fs/proc/proc_tty.c | 87 +-
fs/proc/root.c | 14 +-
fs/proc/task_mmu.c | 52 +-
fs/proc/task_nommu.c | 35 +-
fs/quota.c | 5 +-
fs/quota_v1.c | 3 +
fs/quota_v2.c | 7 +-
fs/ramfs/file-mmu.c | 3 +
fs/ramfs/inode.c | 2 +-
fs/ramfs/internal.h | 1 -
fs/read_write.c | 6 +-
fs/reiserfs/bitmap.c | 8 +-
fs/reiserfs/do_balan.c | 14 +-
fs/reiserfs/ioctl.c | 67 +-
fs/reiserfs/journal.c | 62 +-
fs/reiserfs/namei.c | 8 +-
fs/reiserfs/objectid.c | 7 +-
fs/reiserfs/procfs.c | 9 +-
fs/reiserfs/stree.c | 3 +-
fs/reiserfs/super.c | 38 +-
fs/reiserfs/xattr.c | 1 -
fs/select.c | 17 +-
fs/seq_file.c | 113 +-
fs/signalfd.c | 17 +-
fs/smbfs/smb_debug.h | 6 +-
fs/splice.c | 2 +-
fs/super.c | 37 +-
fs/sync.c | 2 +-
fs/sysfs/dir.c | 1 +
fs/sysfs/file.c | 22 +-
fs/sysfs/group.c | 83 +-
fs/sysfs/inode.c | 4 +-
fs/sysfs/mount.c | 2 +-
fs/sysfs/symlink.c | 9 +-
fs/sysfs/sysfs.h | 2 +
fs/sysv/sysv.h | 8 +-
fs/timerfd.c | 12 +-
fs/udf/Makefile | 2 +-
fs/udf/balloc.c | 13 +-
fs/udf/crc.c | 172 -
fs/udf/dir.c | 83 +-
fs/udf/ecma_167.h | 13 -
fs/udf/file.c | 47 -
fs/udf/ialloc.c | 13 +-
fs/udf/inode.c | 208 +-
fs/udf/lowlevel.c | 1 -
fs/udf/misc.c | 26 +-
fs/udf/namei.c | 226 +-
fs/udf/partition.c | 67 +-
fs/udf/super.c | 1266 ++-
fs/udf/symlink.c | 1 -
fs/udf/truncate.c | 81 +-
fs/udf/udf_i.h | 30 +-
fs/udf/udf_sb.h | 109 +-
fs/udf/udfdecl.h | 67 +-
fs/udf/udfend.h | 22 -
fs/udf/udftime.c | 35 +-
fs/udf/unicode.c | 62 +-
fs/ufs/balloc.c | 4 +-
fs/ufs/dir.c | 14 +-
fs/ufs/inode.c | 2 +-
fs/ufs/swab.h | 36 +-
fs/ufs/ufs.h | 2 +-
fs/utimes.c | 35 +-
fs/vfat/namei.c | 39 +-
fs/xattr.c | 80 +-
fs/xfs/Kconfig | 25 +-
fs/xfs/linux-2.6/kmem.c | 6 +-
fs/xfs/linux-2.6/mrlock.h | 60 +-
fs/xfs/linux-2.6/sema.h | 2 +-
fs/xfs/linux-2.6/xfs_aops.c | 12 +-
fs/xfs/linux-2.6/xfs_buf.c | 10 +-
fs/xfs/linux-2.6/xfs_buf.h | 8 +-
fs/xfs/linux-2.6/xfs_cred.h | 2 +-
fs/xfs/linux-2.6/xfs_export.c | 16 +-
fs/xfs/linux-2.6/xfs_file.c | 80 -
fs/xfs/linux-2.6/xfs_fs_subr.c | 36 +-
fs/xfs/linux-2.6/xfs_ioctl.c | 697 +-
fs/xfs/linux-2.6/xfs_iops.c | 231 +-
fs/xfs/linux-2.6/xfs_linux.h | 3 +-
fs/xfs/linux-2.6/xfs_lrw.c | 100 +-
fs/xfs/linux-2.6/xfs_lrw.h | 4 +-
fs/xfs/linux-2.6/xfs_stats.h | 4 +-
fs/xfs/linux-2.6/xfs_super.c | 29 +-
fs/xfs/linux-2.6/xfs_super.h | 8 +-
fs/xfs/linux-2.6/xfs_vfs.h | 1 -
fs/xfs/linux-2.6/xfs_vnode.h | 54 +-
fs/xfs/quota/xfs_dquot.c | 24 +-
fs/xfs/quota/xfs_dquot_item.c | 14 +-
fs/xfs/quota/xfs_qm.c | 103 +-
fs/xfs/quota/xfs_qm.h | 2 +-
fs/xfs/quota/xfs_qm_stats.h | 4 +-
fs/xfs/quota/xfs_qm_syscalls.c | 50 +-
fs/xfs/quota/xfs_quota_priv.h | 5 -
fs/xfs/quota/xfs_trans_dquot.c | 2 +-
fs/xfs/support/debug.h | 2 -
fs/xfs/support/ktrace.c | 37 +-
fs/xfs/support/ktrace.h | 3 +-
fs/xfs/xfs_acl.c | 69 +-
fs/xfs/xfs_alloc.c | 65 +-
fs/xfs/xfs_attr.c | 103 +-
fs/xfs/xfs_attr.h | 6 +-
fs/xfs/xfs_attr_leaf.c | 2 +-
fs/xfs/xfs_bmap.c | 60 +-
fs/xfs/xfs_bmap.h | 2 +-
fs/xfs/xfs_bmap_btree.c | 54 +-
fs/xfs/xfs_buf_item.c | 7 +-
fs/xfs/xfs_dfrag.c | 4 +-
fs/xfs/xfs_dir2.c | 62 +-
fs/xfs/xfs_dir2.h | 12 +-
fs/xfs/xfs_filestream.c | 2 +-
fs/xfs/xfs_fsops.c | 8 +-
fs/xfs/xfs_ialloc.c | 54 +-
fs/xfs/xfs_iget.c | 189 +-
fs/xfs/xfs_inode.c | 848 +-
fs/xfs/xfs_inode.h | 39 +-
fs/xfs/xfs_inode_item.c | 20 +-
fs/xfs/xfs_inode_item.h | 8 +
fs/xfs/xfs_iomap.c | 26 +-
fs/xfs/xfs_itable.c | 13 +-
fs/xfs/xfs_log.c | 259 +-
fs/xfs/xfs_log.h | 5 +-
fs/xfs/xfs_log_priv.h | 93 +-
fs/xfs/xfs_log_recover.c | 123 +-
fs/xfs/xfs_mount.c | 149 +-
fs/xfs/xfs_mount.h | 37 +-
fs/xfs/xfs_rename.c | 349 +-
fs/xfs/xfs_rtalloc.c | 41 +-
fs/xfs/xfs_rw.c | 8 +-
fs/xfs/xfs_trans.h | 8 +-
fs/xfs/xfs_trans_ail.c | 151 +-
fs/xfs/xfs_trans_buf.c | 15 +-
fs/xfs/xfs_trans_inode.c | 12 +-
fs/xfs/xfs_types.h | 5 +
fs/xfs/xfs_utils.c | 67 +-
fs/xfs/xfs_utils.h | 13 +-
fs/xfs/xfs_vfsops.c | 77 +-
fs/xfs/xfs_vnodeops.c | 771 +-
fs/xfs/xfs_vnodeops.h | 39 +-
include/acpi/acconfig.h | 15 +-
include/acpi/acdebug.h | 2 +-
include/acpi/acdisasm.h | 38 +-
include/acpi/acdispat.h | 31 +-
include/acpi/acevents.h | 2 +-
include/acpi/acexcep.h | 2 +-
include/acpi/acglobal.h | 38 +-
include/acpi/achware.h | 2 +-
include/acpi/acinterp.h | 15 +-
include/acpi/aclocal.h | 10 +-
include/acpi/acmacros.h | 71 +-
include/acpi/acnames.h | 2 +-
include/acpi/acnamesp.h | 5 +-
include/acpi/acobject.h | 5 +-
include/acpi/acopcode.h | 6 +-
include/acpi/acoutput.h | 2 +-
include/acpi/acparser.h | 4 +-
include/acpi/acpi.h | 2 +-
include/acpi/acpiosxf.h | 2 +-
include/acpi/acpixf.h | 7 +-
include/acpi/acresrc.h | 3 +-
include/acpi/acstruct.h | 5 +-
include/acpi/actables.h | 2 +-
include/acpi/actbl.h | 2 +-
include/acpi/actbl1.h | 561 +-
include/acpi/actypes.h | 93 +-
include/acpi/acutils.h | 4 +-
include/acpi/amlcode.h | 2 +-
include/acpi/amlresrc.h | 2 +-
include/acpi/platform/acenv.h | 2 +-
include/acpi/platform/acgcc.h | 2 +-
include/acpi/platform/aclinux.h | 2 +-
include/asm-alpha/bitops.h | 5 +
include/asm-alpha/bug.h | 16 +-
include/asm-alpha/byteorder.h | 2 +-
include/asm-alpha/ide.h | 11 -
include/asm-alpha/pgtable.h | 2 +
include/asm-alpha/semaphore.h | 150 +-
include/asm-alpha/topology.h | 3 +-
include/asm-alpha/types.h | 30 +-
include/asm-alpha/unaligned.h | 13 +-
include/asm-arm/arch-at91/at91_ecc.h | 10 +-
include/asm-arm/arch-at91/at91_pmc.h | 15 +-
include/asm-arm/arch-at91/at91_shdwc.h | 2 +
include/asm-arm/arch-at91/at91cap9_ddrsdr.h | 100 +
include/asm-arm/arch-at91/at91sam926x_mc.h | 141 -
include/asm-arm/arch-at91/at91sam9_sdramc.h | 83 +
include/asm-arm/arch-at91/at91sam9_smc.h | 73 +
include/asm-arm/arch-ep93xx/gpio.h | 21 +-
include/asm-arm/arch-iop13xx/adma.h | 5 -
include/asm-arm/arch-ks8695/devices.h | 5 +
include/asm-arm/arch-mxc/board-mx31ads.h | 124 +-
include/asm-arm/arch-mxc/dma.h | 7 -
include/asm-arm/arch-mxc/hardware.h | 33 +-
include/asm-arm/arch-mxc/io.h | 15 +-
include/asm-arm/arch-mxc/irqs.h | 21 +-
include/asm-arm/arch-mxc/memory.h | 13 +-
include/asm-arm/arch-mxc/mx31.h | 30 +-
include/asm-arm/arch-mxc/mxc.h | 11 +-
include/asm-arm/arch-mxc/system.h | 18 +-
include/asm-arm/arch-mxc/vmalloc.h | 14 +-
include/asm-arm/arch-ns9xxx/board.h | 28 +-
include/asm-arm/arch-ns9xxx/clock.h | 71 -
include/asm-arm/arch-ns9xxx/entry-macro.S | 6 +-
include/asm-arm/arch-ns9xxx/irqs.h | 67 +-
include/asm-arm/arch-ns9xxx/module.h | 60 +
include/asm-arm/arch-ns9xxx/processor-ns9360.h | 32 +
include/asm-arm/arch-ns9xxx/processor.h | 31 +-
include/asm-arm/arch-ns9xxx/regs-sys-common.h | 31 +
include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h | 148 +
include/asm-arm/arch-ns9xxx/regs-sys.h | 163 -
include/asm-arm/arch-ns9xxx/system.h | 17 +-
include/asm-arm/arch-ns9xxx/uncompress.h | 143 +-
include/asm-arm/arch-omap/board-osk.h | 11 +
include/asm-arm/arch-omap/clock.h | 75 +-
include/asm-arm/arch-omap/control.h | 191 +
include/asm-arm/arch-omap/entry-macro.S | 2 +-
include/asm-arm/arch-omap/gpio.h | 57 +-
include/asm-arm/arch-omap/io.h | 70 +-
include/asm-arm/arch-omap/mmc.h | 2 +
include/asm-arm/arch-omap/mux.h | 66 +-
include/asm-arm/arch-omap/omap24xx.h | 96 +-
include/asm-arm/arch-omap/sdrc.h | 75 +
include/asm-arm/arch-omap/usb.h | 5 +-
include/asm-arm/arch-orion/debug-macro.S | 22 -
include/asm-arm/arch-orion/dma.h | 1 -
include/asm-arm/arch-orion/entry-macro.S | 31 -
include/asm-arm/arch-orion/gpio.h | 28 -
include/asm-arm/arch-orion/hardware.h | 21 -
include/asm-arm/arch-orion/io.h | 27 -
include/asm-arm/arch-orion/irqs.h | 61 -
include/asm-arm/arch-orion/memory.h | 15 -
include/asm-arm/arch-orion/orion.h | 165 -
include/asm-arm/arch-orion/platform.h | 25 -
include/asm-arm/arch-orion/system.h | 31 -
include/asm-arm/arch-orion/timex.h | 12 -
include/asm-arm/arch-orion/uncompress.h | 34 -
include/asm-arm/arch-orion/vmalloc.h | 5 -
include/asm-arm/arch-orion5x/debug-macro.S | 22 +
include/asm-arm/arch-orion5x/dma.h | 1 +
include/asm-arm/arch-orion5x/entry-macro.S | 31 +
include/asm-arm/arch-orion5x/gpio.h | 28 +
include/asm-arm/arch-orion5x/hardware.h | 21 +
include/asm-arm/arch-orion5x/io.h | 67 +
include/asm-arm/arch-orion5x/irqs.h | 62 +
include/asm-arm/arch-orion5x/memory.h | 16 +
include/asm-arm/arch-orion5x/orion5x.h | 159 +
include/asm-arm/arch-orion5x/system.h | 32 +
include/asm-arm/arch-orion5x/timex.h | 13 +
include/asm-arm/arch-orion5x/uncompress.h | 34 +
include/asm-arm/arch-orion5x/vmalloc.h | 5 +
include/asm-arm/arch-pxa/camera.h | 48 +
include/asm-arm/arch-pxa/gumstix.h | 96 +
include/asm-arm/arch-pxa/irda.h | 2 +
include/asm-arm/arch-pxa/irqs.h | 8 +-
include/asm-arm/arch-pxa/magician.h | 94 +-
include/asm-arm/arch-pxa/mfp-pxa25x.h | 161 +
include/asm-arm/arch-pxa/mfp-pxa27x.h | 432 +
include/asm-arm/arch-pxa/mfp-pxa2xx.h | 132 +
include/asm-arm/arch-pxa/pxa-regs.h | 526 +-
include/asm-arm/arch-pxa/pxa27x_keypad.h | 2 +
include/asm-arm/arch-pxa/pxa2xx-gpio.h | 357 +
include/asm-arm/arch-pxa/pxa3xx-regs.h | 9 +
include/asm-arm/arch-pxa/pxa3xx_nand.h | 18 +
include/asm-arm/arch-pxa/pxafb.h | 71 +-
include/asm-arm/arch-pxa/regs-lcd.h | 171 +
include/asm-arm/arch-pxa/system.h | 2 +
include/asm-arm/arch-pxa/tosa.h | 40 +-
include/asm-arm/arch-pxa/zylonite.h | 2 +
include/asm-arm/arch-realview/board-eb.h | 20 +
include/asm-arm/arch-realview/board-pb1176.h | 152 +
include/asm-arm/arch-realview/board-pb11mp.h | 186 +
include/asm-arm/arch-realview/debug-macro.S | 2 +-
include/asm-arm/arch-realview/hardware.h | 2 +-
include/asm-arm/arch-realview/irqs.h | 2 +
include/asm-arm/arch-realview/platform.h | 27 +-
include/asm-arm/arch-realview/scu.h | 11 +-
include/asm-arm/arch-realview/uncompress.h | 38 +-
include/asm-arm/arch-s3c2410/regs-clock.h | 2 +-
include/asm-arm/arch-s3c2410/regs-gpio.h | 4 +
include/asm-arm/arch-s3c2410/regs-s3c2412-mem.h | 29 +
include/asm-arm/arch-s3c2410/system-reset.h | 64 +
include/asm-arm/arch-s3c2410/system.h | 46 +-
include/asm-arm/arch-sa1100/gpio.h | 31 +-
include/asm-arm/arch-sa1100/ide.h | 6 +-
include/asm-arm/cpu-multi32.h | 4 +
include/asm-arm/div64.h | 2 -
include/asm-arm/glue.h | 87 +-
include/asm-arm/hardware/arm_scu.h | 15 -
include/asm-arm/hardware/iop3xx-adma.h | 12 +-
include/asm-arm/hardware/iop3xx.h | 9 +-
include/asm-arm/hardware/iop_adma.h | 2 -
include/asm-arm/hardware/scoop.h | 5 +-
include/asm-arm/hwcap.h | 1 +
include/asm-arm/ide.h | 8 -
include/asm-arm/mach/pci.h | 1 +
include/asm-arm/memory.h | 3 +
include/asm-arm/page.h | 8 +
include/asm-arm/pgtable.h | 3 +
include/asm-arm/plat-orion/ehci-orion.h | 19 +
include/asm-arm/plat-orion/irq.h | 17 +
include/asm-arm/plat-orion/orion_nand.h | 24 +
include/asm-arm/plat-orion/pcie.h | 31 +
include/asm-arm/plat-orion/time.h | 17 +
include/asm-arm/plat-s3c/nand.h | 5 +
include/asm-arm/semaphore-helper.h | 84 -
include/asm-arm/semaphore.h | 99 +-
include/asm-arm/sparsemem.h | 10 +
include/asm-arm/thread_info.h | 3 +
include/asm-arm/types.h | 33 +-
include/asm-arm/unaligned.h | 174 +-
include/asm-arm/unistd.h | 4 +-
include/asm-avr32/arch-at32ap/board.h | 9 +-
include/asm-avr32/arch-at32ap/pm.h | 48 +
include/asm-avr32/arch-at32ap/time.h | 112 -
include/asm-avr32/asm.h | 8 +-
include/asm-avr32/intc.h | 128 -
include/asm-avr32/irq.h | 5 +
include/asm-avr32/page.h | 8 +-
include/asm-avr32/pgtable.h | 8 +
include/asm-avr32/semaphore.h | 109 +-
include/asm-avr32/serial.h | 13 +
include/asm-avr32/types.h | 32 +-
include/asm-avr32/unaligned.h | 13 +-
include/asm-avr32/xor.h | 6 +
include/asm-blackfin/.gitignore | 1 +
include/asm-blackfin/bfin-global.h | 10 -
include/asm-blackfin/bug.h | 13 +
include/asm-blackfin/cplb.h | 26 -
include/asm-blackfin/dma-mapping.h | 15 +
include/asm-blackfin/dma.h | 4 +-
include/asm-blackfin/gptimers.h | 150 +-
include/asm-blackfin/ide.h | 4 -
include/asm-blackfin/mach-bf527/anomaly.h | 80 +-
include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 48 +-
include/asm-blackfin/mach-bf527/bfin_sir.h | 133 +
include/asm-blackfin/mach-bf527/blackfin.h | 15 +
include/asm-blackfin/mach-bf527/cdefBF52x_base.h | 90 +-
include/asm-blackfin/mach-bf527/dma.h | 3 -
include/asm-blackfin/mach-bf533/anomaly.h | 10 +-
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 50 +-
include/asm-blackfin/mach-bf533/bfin_sir.h | 120 +
include/asm-blackfin/mach-bf533/blackfin.h | 15 +
include/asm-blackfin/mach-bf533/cdefBF532.h | 31 +-
include/asm-blackfin/mach-bf533/defBF532.h | 29 +-
include/asm-blackfin/mach-bf533/dma.h | 3 -
include/asm-blackfin/mach-bf533/mem_init.h | 10 +-
include/asm-blackfin/mach-bf537/anomaly.h | 17 +-
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 48 +-
include/asm-blackfin/mach-bf537/bfin_sir.h | 133 +
include/asm-blackfin/mach-bf537/blackfin.h | 39 +-
include/asm-blackfin/mach-bf537/cdefBF534.h | 65 +-
include/asm-blackfin/mach-bf537/dma.h | 3 -
include/asm-blackfin/mach-bf548/anomaly.h | 1 +
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 48 +-
include/asm-blackfin/mach-bf548/bfin_sir.h | 149 +
include/asm-blackfin/mach-bf548/blackfin.h | 38 +-
include/asm-blackfin/mach-bf548/cdefBF542.h | 12 +-
include/asm-blackfin/mach-bf548/cdefBF544.h | 33 -
include/asm-blackfin/mach-bf548/cdefBF547.h | 33 -
include/asm-blackfin/mach-bf548/cdefBF548.h | 33 -
include/asm-blackfin/mach-bf548/cdefBF549.h | 35 +-
include/asm-blackfin/mach-bf548/cdefBF54x_base.h | 418 +-
include/asm-blackfin/mach-bf548/dma.h | 2 -
include/asm-blackfin/mach-bf548/mem_init.h | 20 +-
include/asm-blackfin/mach-bf561/anomaly.h | 6 +-
include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 50 +-
include/asm-blackfin/mach-bf561/bfin_sir.h | 120 +
include/asm-blackfin/mach-bf561/blackfin.h | 14 +
include/asm-blackfin/mach-bf561/cdefBF561.h | 34 +-
include/asm-blackfin/mach-bf561/defBF561.h | 31 +-
include/asm-blackfin/mach-bf561/dma.h | 3 -
include/asm-blackfin/portmux.h | 4 +-
include/asm-blackfin/processor.h | 5 +-
include/asm-blackfin/semaphore-helper.h | 82 -
include/asm-blackfin/semaphore.h | 106 +-
include/asm-blackfin/signal.h | 2 +-
include/asm-blackfin/thread_info.h | 11 +-
include/asm-blackfin/time.h | 36 +
include/asm-blackfin/timex.h | 17 +-
include/asm-blackfin/trace.h | 4 +-
include/asm-blackfin/types.h | 34 +-
include/asm-blackfin/uaccess.h | 4 +-
include/asm-blackfin/unaligned.h | 13 +-
include/asm-blackfin/unistd.h | 26 +-
include/asm-cris/arch-v10/ide.h | 11 +-
include/asm-cris/pgtable.h | 4 +-
include/asm-cris/semaphore-helper.h | 78 -
include/asm-cris/semaphore.h | 134 +-
include/asm-cris/types.h | 33 +-
include/asm-cris/unaligned.h | 17 +-
include/asm-frv/pgtable.h | 2 +
include/asm-frv/semaphore.h | 156 +-
include/asm-frv/system.h | 5 -
include/asm-frv/topology.h | 4 +-
include/asm-frv/types.h | 34 +-
include/asm-frv/unaligned.h | 192 +-
include/asm-generic/Kbuild | 2 +
include/asm-generic/bitops.h | 4 -
include/asm-generic/bitops/__fls.h | 43 +
include/asm-generic/bitops/find.h | 2 +
include/asm-generic/bitops/fls64.h | 22 +
include/asm-generic/div64.h | 7 -
include/asm-generic/futex.h | 5 +-
include/asm-generic/gpio.h | 15 +
include/asm-generic/int-l64.h | 71 +
include/asm-generic/int-ll64.h | 76 +
include/asm-generic/ioctl.h | 33 +-
include/asm-generic/iomap.h | 4 +
include/asm-generic/memory_model.h | 2 -
include/asm-generic/page.h | 2 -
include/asm-generic/rtc.h | 3 -
include/asm-generic/topology.h | 14 +
include/asm-generic/unaligned.h | 124 -
include/asm-h8300/semaphore-helper.h | 85 -
include/asm-h8300/semaphore.h | 191 +-
include/asm-h8300/types.h | 33 +-
include/asm-h8300/unaligned.h | 20 +-
include/asm-ia64/acpi.h | 33 +
include/asm-ia64/bitops.h | 16 +
include/asm-ia64/cpu.h | 2 +-
include/asm-ia64/cputime.h | 104 +
include/asm-ia64/dma-mapping.h | 28 +-
include/asm-ia64/dmi.h | 5 +
include/asm-ia64/elf.h | 31 +-
include/asm-ia64/futex.h | 2 +-
include/asm-ia64/gcc_intrin.h | 12 +
include/asm-ia64/hugetlb.h | 79 +
include/asm-ia64/ide.h | 10 -
include/asm-ia64/io.h | 5 -
include/asm-ia64/kprobes.h | 7 +-
include/asm-ia64/kregs.h | 3 +
include/asm-ia64/kvm.h | 205 +-
include/asm-ia64/kvm_host.h | 524 +
include/asm-ia64/kvm_para.h | 29 +
include/asm-ia64/machvec.h | 50 +-
include/asm-ia64/machvec_hpzx1.h | 16 +-
include/asm-ia64/machvec_hpzx1_swiotlb.h | 16 +-
include/asm-ia64/machvec_sn2.h | 16 +-
include/asm-ia64/mca.h | 1 +
include/asm-ia64/meminit.h | 3 +-
include/asm-ia64/numa.h | 2 +
include/asm-ia64/page.h | 6 -
include/asm-ia64/pal.h | 72 +-
include/asm-ia64/pgtable.h | 5 +-
include/asm-ia64/processor.h | 63 +
include/asm-ia64/sal.h | 21 +
include/asm-ia64/semaphore.h | 100 +-
include/asm-ia64/smp.h | 3 +
include/asm-ia64/sn/nodepda.h | 1 -
include/asm-ia64/sn/xp.h | 485 -
include/asm-ia64/sn/xpc.h | 1267 ---
include/asm-ia64/system.h | 30 +-
include/asm-ia64/thread_info.h | 30 +-
include/asm-ia64/tlb.h | 26 +
include/asm-ia64/tlbflush.h | 1 +
include/asm-ia64/topology.h | 9 +-
include/asm-ia64/types.h | 31 +-
include/asm-ia64/unaligned.h | 7 +-
include/asm-ia64/uncached.h | 6 +-
include/asm-m32r/ide.h | 10 -
include/asm-m32r/pgtable.h | 10 +
include/asm-m32r/semaphore.h | 145 +-
include/asm-m32r/types.h | 32 +-
include/asm-m32r/unaligned.h | 27 +-
include/asm-m68k/div64.h | 1 -
include/asm-m68k/machw.h | 30 -
include/asm-m68k/motorola_pgtable.h | 2 +
include/asm-m68k/semaphore-helper.h | 142 -
include/asm-m68k/semaphore.h | 164 +-
include/asm-m68k/sun3_pgtable.h | 2 +
include/asm-m68k/types.h | 32 +-
include/asm-m68k/unaligned.h | 17 +-
include/asm-m68knommu/dma.h | 3 +-
include/asm-m68knommu/param.h | 7 +-
include/asm-m68knommu/semaphore-helper.h | 82 -
include/asm-m68knommu/semaphore.h | 154 +-
include/asm-m68knommu/unaligned.h | 22 +-
include/asm-mips/bitops.h | 5 +
include/asm-mips/cmp.h | 18 +
include/asm-mips/cpu.h | 9 +-
include/asm-mips/dec/ioasic.h | 2 +
include/asm-mips/div64.h | 6 -
include/asm-mips/ds1287.h | 27 +
include/asm-mips/futex.h | 2 +-
include/asm-mips/gcmpregs.h | 117 +
include/asm-mips/gic.h | 487 +
include/asm-mips/io.h | 2 +-
include/asm-mips/jmr3927/jmr3927.h | 4 +-
include/asm-mips/jmr3927/tx3927.h | 2 +-
include/asm-mips/jmr3927/txx927.h | 12 -
include/asm-mips/mach-au1x00/au1000.h | 26 +-
include/asm-mips/mach-au1x00/au1xxx_ide.h | 42 -
include/asm-mips/mach-db1x00/db1200.h | 18 +-
include/asm-mips/mach-generic/gpio.h | 6 +
include/asm-mips/mach-generic/ide.h | 10 -
include/asm-mips/mach-ip27/topology.h | 2 +
include/asm-mips/mach-pb1x00/pb1200.h | 18 +-
include/asm-mips/mips-boards/generic.h | 1 +
include/asm-mips/mips-boards/launch.h | 35 +
include/asm-mips/mips-boards/malta.h | 23 +
include/asm-mips/mips-boards/maltaint.h | 27 +
include/asm-mips/mips-boards/maltasmp.h | 36 +
include/asm-mips/mipsmtregs.h | 8 +-
include/asm-mips/pgtable-32.h | 4 +-
include/asm-mips/pgtable-bits.h | 91 +-
include/asm-mips/pgtable.h | 59 +-
include/asm-mips/r4k-timer.h | 30 +
include/asm-mips/semaphore.h | 109 +-
include/asm-mips/smp-ops.h | 1 +
include/asm-mips/smtc.h | 1 +
include/asm-mips/smvp.h | 19 +
include/asm-mips/traps.h | 2 +
include/asm-mips/tx4938/rbtx4938.h | 58 +-
include/asm-mips/tx4938/tx4938.h | 38 +-
include/asm-mips/tx4938/tx4938_mips.h | 54 -
include/asm-mips/txx9pio.h | 29 +
include/asm-mips/types.h | 58 +-
include/asm-mips/unaligned.h | 37 +-
include/asm-mips/vr41xx/siu.h | 8 +-
include/asm-mips/vr41xx/vr41xx.h | 8 +-
include/asm-mn10300/div64.h | 3 -
include/asm-mn10300/pgtable.h | 3 +
include/asm-mn10300/semaphore.h | 170 +-
include/asm-mn10300/types.h | 33 +-
include/asm-mn10300/unaligned.h | 130 +-
include/asm-parisc/bitops.h | 1 +
include/asm-parisc/futex.h | 2 +-
include/asm-parisc/ide.h | 2 -
include/asm-parisc/pgtable.h | 2 +
include/asm-parisc/semaphore-helper.h | 89 -
include/asm-parisc/semaphore.h | 146 +-
include/asm-parisc/types.h | 33 +-
include/asm-parisc/unaligned.h | 12 +-
include/asm-powerpc/Kbuild | 2 +-
include/asm-powerpc/abs_addr.h | 3 +-
include/asm-powerpc/bitops.h | 37 +-
include/asm-powerpc/cpm.h | 14 +
include/asm-powerpc/cpm1.h | 13 -
include/asm-powerpc/cpm2.h | 11 +-
include/asm-powerpc/cputhreads.h | 2 +-
include/asm-powerpc/dcr-native.h | 17 +
include/asm-powerpc/dcr-regs.h | 78 +
include/asm-powerpc/exception.h | 6 +-
include/asm-powerpc/fixmap.h | 106 +
include/asm-powerpc/fsl_lbc.h | 311 +
include/asm-powerpc/futex.h | 2 +-
include/asm-powerpc/gpio.h | 56 +
include/asm-powerpc/highmem.h | 41 +-
include/asm-powerpc/hugetlb.h | 79 +
include/asm-powerpc/hw_irq.h | 13 +-
include/asm-powerpc/ide.h | 57 +-
include/asm-powerpc/immap_qe.h | 3 +-
include/asm-powerpc/io-defs.h | 101 +-
include/asm-powerpc/io.h | 16 +-
include/asm-powerpc/irq.h | 2 -
include/asm-powerpc/irqflags.h | 37 +-
include/asm-powerpc/iseries/alpaca.h | 31 +
include/asm-powerpc/iseries/it_lp_reg_save.h | 85 -
include/asm-powerpc/kdump.h | 5 -
include/asm-powerpc/kvm.h | 53 +-
include/asm-powerpc/kvm_asm.h | 55 +
include/asm-powerpc/kvm_host.h | 153 +
include/asm-powerpc/kvm_para.h | 37 +
include/asm-powerpc/kvm_ppc.h | 93 +
include/asm-powerpc/lmb.h | 82 +-
include/asm-powerpc/machdep.h | 5 +-
include/asm-powerpc/macio.h | 2 +-
include/asm-powerpc/mediabay.h | 6 +-
include/asm-powerpc/mmu-40x.h | 2 -
include/asm-powerpc/mmu-44x.h | 2 +-
include/asm-powerpc/mmu-8xx.h | 2 -
include/asm-powerpc/mmu-fsl-booke.h | 6 -
include/asm-powerpc/mmu-hash32.h | 2 -
include/asm-powerpc/mmu-hash64.h | 3 -
include/asm-powerpc/paca.h | 13 +-
include/asm-powerpc/page.h | 44 +-
include/asm-powerpc/page_32.h | 8 +-
include/asm-powerpc/page_64.h | 7 -
include/asm-powerpc/pasemi_dma.h | 77 +-
include/asm-powerpc/pci-bridge.h | 4 +-
include/asm-powerpc/pgtable-ppc32.h | 11 +-
include/asm-powerpc/pgtable-ppc64.h | 3 +
include/asm-powerpc/phyp_dump.h | 47 +
include/asm-powerpc/pmi.h | 2 -
include/asm-powerpc/ppc4xx.h | 18 +
include/asm-powerpc/processor.h | 6 +
include/asm-powerpc/ps3.h | 10 +-
include/asm-powerpc/ptrace.h | 9 +
include/asm-powerpc/qe.h | 12 +-
include/asm-powerpc/rio.h | 18 +
include/asm-powerpc/rwsem.h | 35 +-
include/asm-powerpc/semaphore.h | 95 +-
include/asm-powerpc/sparsemem.h | 1 +
include/asm-powerpc/spinlock.h | 1 +
include/asm-powerpc/string.h | 2 +
include/asm-powerpc/syscalls.h | 2 +-
include/asm-powerpc/system.h | 25 +-
include/asm-powerpc/thread_info.h | 8 +-
include/asm-powerpc/topology.h | 3 +-
include/asm-powerpc/types.h | 51 +-
include/asm-powerpc/unaligned.h | 11 +-
include/asm-ppc/mmu.h | 2 -
include/asm-ppc/mpc8260.h | 4 -
include/asm-ppc/mpc8xx.h | 4 -
include/asm-ppc/ocp.h | 1 -
include/asm-ppc/pgtable.h | 3 +
include/asm-ppc/rio.h | 18 -
include/asm-s390/Kbuild | 1 +
include/asm-s390/bitops.h | 1 +
include/asm-s390/ccwgroup.h | 7 +-
include/asm-s390/cio.h | 4 +
include/asm-s390/cpu.h | 8 +
include/asm-s390/debug.h | 5 +
include/asm-s390/extmem.h | 11 +-
include/asm-s390/hardirq.h | 2 +-
include/asm-s390/hugetlb.h | 183 +
include/asm-s390/kvm.h | 41 +-
include/asm-s390/kvm_host.h | 234 +
include/asm-s390/kvm_para.h | 150 +
include/asm-s390/kvm_virtio.h | 53 +
include/asm-s390/lowcore.h | 26 +-
include/asm-s390/mmu.h | 1 +
include/asm-s390/mmu_context.h | 8 +-
include/asm-s390/page.h | 49 +-
include/asm-s390/pgtable.h | 127 +-
include/asm-s390/processor.h | 2 -
include/asm-s390/ptrace.h | 2 -
include/asm-s390/qdio.h | 1 +
include/asm-s390/semaphore.h | 108 +-
include/asm-s390/setup.h | 38 +-
include/asm-s390/smp.h | 15 +-
include/asm-s390/sparsemem.h | 18 +
include/asm-s390/sysinfo.h | 121 +
include/asm-s390/system.h | 20 +
include/asm-s390/thread_info.h | 2 +-
include/asm-s390/timex.h | 13 +-
include/asm-s390/tlbflush.h | 37 +-
include/asm-s390/topology.h | 27 +
include/asm-s390/types.h | 48 +-
include/asm-s390/unaligned.h | 25 +-
include/asm-sh/bitops.h | 1 +
include/asm-sh/bugs.h | 2 +-
include/asm-sh/cpu-sh4/freq.h | 6 +-
include/asm-sh/cpu-sh4/rtc.h | 5 +
include/asm-sh/futex.h | 2 +-
include/asm-sh/hugetlb.h | 91 +
include/asm-sh/i2c-sh7760.h | 22 +
include/asm-sh/ide.h | 3 -
include/asm-sh/migor.h | 58 +
include/asm-sh/mpc1211/pci.h | 2 -
include/asm-sh/pgtable_32.h | 3 +
include/asm-sh/pgtable_64.h | 10 +-
include/asm-sh/processor.h | 5 +-
include/asm-sh/r7780rp.h | 22 +-
include/asm-sh/se7721.h | 70 +
include/asm-sh/se7722.h | 2 +
include/asm-sh/semaphore-helper.h | 89 -
include/asm-sh/semaphore.h | 116 +-
include/asm-sh/sh_keysc.h | 13 +
include/asm-sh/system.h | 2 +
include/asm-sh/topology.h | 2 +-
include/asm-sh/types.h | 34 +-
include/asm-sh/uaccess_32.h | 5 +-
include/asm-sh/unaligned.h | 20 +-
include/asm-sparc/Kbuild | 1 -
include/asm-sparc/a.out-core.h | 52 -
include/asm-sparc/a.out.h | 97 -
include/asm-sparc/device.h | 2 +
include/asm-sparc/floppy.h | 2 +-
include/asm-sparc/head.h | 42 +-
include/asm-sparc/ide.h | 2 -
include/asm-sparc/ioctls.h | 2 -
include/asm-sparc/kgdb.h | 116 +-
include/asm-sparc/mman.h | 13 -
include/asm-sparc/namei.h | 15 +-
include/asm-sparc/oplib.h | 17 -
include/asm-sparc/page.h | 5 +-
include/asm-sparc/pconf.h | 25 -
include/asm-sparc/pgtable.h | 7 +
include/asm-sparc/processor.h | 7 +-
include/asm-sparc/prom.h | 5 +
include/asm-sparc/semaphore.h | 193 +-
include/asm-sparc/smp.h | 2 -
include/asm-sparc/socket.h | 3 -
include/asm-sparc/solerrno.h | 132 -
include/asm-sparc/svr4.h | 119 -
include/asm-sparc/system.h | 2 +
include/asm-sparc/termios.h | 5 -
include/asm-sparc/types.h | 30 +-
include/asm-sparc/unaligned.h | 10 +-
include/asm-sparc/user.h | 56 +-
include/asm-sparc64/Kbuild | 1 -
include/asm-sparc64/a.out-core.h | 31 -
include/asm-sparc64/a.out.h | 1 -
include/asm-sparc64/bitops.h | 1 +
include/asm-sparc64/floppy.h | 84 +-
include/asm-sparc64/futex.h | 2 +-
include/asm-sparc64/hugetlb.h | 84 +
include/asm-sparc64/ide.h | 2 -
include/asm-sparc64/ioctls.h | 2 -
include/asm-sparc64/iommu.h | 3 +-
include/asm-sparc64/isa.h | 47 -
include/asm-sparc64/kgdb.h | 1 +
include/asm-sparc64/lmb.h | 10 +
include/asm-sparc64/mman.h | 13 -
include/asm-sparc64/mmzone.h | 17 +
include/asm-sparc64/namei.h | 15 +-
include/asm-sparc64/numnodes.h | 6 -
include/asm-sparc64/page.h | 2 -
include/asm-sparc64/pconf.h | 25 -
include/asm-sparc64/pgtable.h | 10 +
include/asm-sparc64/pil.h | 7 -
include/asm-sparc64/ptrace.h | 41 +-
include/asm-sparc64/semaphore.h | 54 +-
include/asm-sparc64/socket.h | 3 -
include/asm-sparc64/solerrno.h | 132 -
include/asm-sparc64/sparsemem.h | 2 +-
include/asm-sparc64/svr4.h | 120 -
include/asm-sparc64/system.h | 5 +-
include/asm-sparc64/termios.h | 5 -
include/asm-sparc64/thread_info.h | 6 +-
include/asm-sparc64/topology.h | 73 +-
include/asm-sparc64/ttable.h | 38 +-
include/asm-sparc64/types.h | 30 +-
include/asm-sparc64/unaligned.h | 10 +-
include/asm-sparc64/unistd.h | 10 -
include/asm-sparc64/user.h | 61 +-
include/asm-um/div64.h | 1 -
include/asm-um/pgtable.h | 10 +
include/asm-um/semaphore.h | 7 +-
include/asm-um/unaligned.h | 6 +-
include/asm-v850/semaphore.h | 85 +-
include/asm-v850/types.h | 32 +-
include/asm-v850/unaligned.h | 124 +-
include/asm-x86/Kbuild | 1 +
include/asm-x86/a.out-core.h | 12 +-
include/asm-x86/acpi.h | 8 +-
include/asm-x86/alternative.h | 32 +-
include/asm-x86/apic.h | 7 +-
include/asm-x86/apicdef.h | 69 +-
include/asm-x86/atomic_32.h | 143 +-
include/asm-x86/atomic_64.h | 251 +-
include/asm-x86/bios_ebda.h | 17 +
include/asm-x86/bitops.h | 201 +-
include/asm-x86/bitops_32.h | 164 -
include/asm-x86/bitops_64.h | 162 -
include/asm-x86/boot.h | 8 +
include/asm-x86/bootparam.h | 14 +
include/asm-x86/bug.h | 34 +-
include/asm-x86/byteorder.h | 39 +-
include/asm-x86/cacheflush.h | 80 +-
include/asm-x86/checksum_32.h | 152 +-
include/asm-x86/checksum_64.h | 118 +-
include/asm-x86/cmpxchg_32.h | 253 +-
include/asm-x86/cmpxchg_64.h | 134 +-
include/asm-x86/compat.h | 2 +-
include/asm-x86/cpufeature.h | 8 +-
include/asm-x86/current_32.h | 2 +-
include/asm-x86/current_64.h | 12 +-
include/asm-x86/desc.h | 61 +-
include/asm-x86/desc_defs.h | 15 +-
include/asm-x86/div64.h | 61 +-
include/asm-x86/dma-mapping.h | 238 +-
include/asm-x86/dma-mapping_32.h | 187 -
include/asm-x86/dma-mapping_64.h | 202 -
include/asm-x86/dma.h | 45 +-
include/asm-x86/dmi.h | 1 +
include/asm-x86/dwarf2_64.h | 9 +-
include/asm-x86/e820_32.h | 6 +-
include/asm-x86/e820_64.h | 27 +-
include/asm-x86/edac.h | 4 +-
include/asm-x86/efi.h | 2 +-
include/asm-x86/elf.h | 112 +-
include/asm-x86/fixmap.h | 8 +
include/asm-x86/fixmap_32.h | 24 +-
include/asm-x86/fixmap_64.h | 24 +-
include/asm-x86/floppy.h | 93 +-
include/asm-x86/futex.h | 103 +-
include/asm-x86/genapic_32.h | 106 +-
include/asm-x86/genapic_64.h | 10 +
include/asm-x86/geode.h | 40 +-
include/asm-x86/highmem.h | 2 +-
include/asm-x86/hugetlb.h | 91 +
include/asm-x86/hw_irq_64.h | 15 +-
include/asm-x86/hypertransport.h | 15 +-
include/asm-x86/i387.h | 60 +-
include/asm-x86/i8259.h | 29 +-
include/asm-x86/ia32.h | 62 +-
include/asm-x86/ide.h | 10 -
include/asm-x86/io.h | 14 +
include/asm-x86/io_32.h | 148 +-
include/asm-x86/io_64.h | 116 +-
include/asm-x86/io_apic.h | 12 +-
include/asm-x86/ioctls.h | 13 +-
include/asm-x86/ipcbuf.h | 3 +-
include/asm-x86/ipi.h | 11 +-
include/asm-x86/irq_32.h | 2 +-
include/asm-x86/irq_64.h | 4 +-
include/asm-x86/irqflags.h | 59 +-
include/asm-x86/kdebug.h | 5 +-
include/asm-x86/kexec.h | 71 +-
include/asm-x86/kgdb.h | 81 +
include/asm-x86/kprobes.h | 12 +-
include/asm-x86/kvm.h | 41 +
include/asm-x86/kvm_host.h | 133 +-
include/asm-x86/kvm_para.h | 55 +
include/asm-x86/kvm_x86_emulate.h | 28 +-
include/asm-x86/lguest.h | 11 +-
include/asm-x86/lguest_hcall.h | 5 +-
include/asm-x86/linkage.h | 3 +
include/asm-x86/local.h | 105 +-
include/asm-x86/mach-bigsmp/mach_apic.h | 18 +-
include/asm-x86/mach-default/bios_ebda.h | 15 -
include/asm-x86/mach-default/mach_apic.h | 94 +-
include/asm-x86/mach-default/mach_apicdef.h | 9 +-
include/asm-x86/mach-default/mach_ipi.h | 10 +
include/asm-x86/mach-default/mach_mpparse.h | 11 -
include/asm-x86/mach-default/mach_reboot.h | 61 -
include/asm-x86/mach-default/smpboot_hooks.h | 9 +-
include/asm-x86/mach-es7000/mach_apic.h | 20 +-
include/asm-x86/mach-es7000/mach_mpparse.h | 11 -
include/asm-x86/mach-generic/mach_apic.h | 1 -
include/asm-x86/mach-generic/mach_mpparse.h | 5 -
include/asm-x86/mach-numaq/mach_apic.h | 10 +
include/asm-x86/mach-numaq/mach_mpparse.h | 23 +-
include/asm-x86/mach-summit/mach_apic.h | 14 +-
include/asm-x86/mach-summit/mach_mpparse.h | 11 -
include/asm-x86/mach-visws/mach_apic.h | 2 +-
include/asm-x86/mach-visws/smpboot_hooks.h | 4 +
include/asm-x86/mach_apic.h | 29 -
include/asm-x86/mc146818rtc.h | 16 +-
include/asm-x86/mca_dma.h | 34 +-
include/asm-x86/mmu.h | 4 +-
include/asm-x86/mmu_context_32.h | 12 +-
include/asm-x86/mmu_context_64.h | 21 +-
include/asm-x86/mmx.h | 2 +-
include/asm-x86/mmzone_32.h | 4 +-
include/asm-x86/mmzone_64.h | 24 +-
include/asm-x86/mpspec.h | 47 +-
include/asm-x86/mpspec_def.h | 46 +-
include/asm-x86/msidef.h | 12 +-
include/asm-x86/msr-index.h | 4 +
include/asm-x86/msr.h | 89 +-
include/asm-x86/mtrr.h | 73 +-
include/asm-x86/mutex_32.h | 66 +-
include/asm-x86/mutex_64.h | 73 +-
include/asm-x86/nmi.h | 94 +-
include/asm-x86/nmi_32.h | 61 -
include/asm-x86/nmi_64.h | 90 -
include/asm-x86/nops.h | 2 +
include/asm-x86/numa_64.h | 8 +-
include/asm-x86/numaq.h | 9 +-
include/asm-x86/olpc.h | 132 +
include/asm-x86/page.h | 5 +-
include/asm-x86/page_32.h | 9 +-
include/asm-x86/page_64.h | 10 +-
include/asm-x86/param.h | 4 +-
include/asm-x86/paravirt.h | 97 +-
include/asm-x86/parport.h | 6 +-
include/asm-x86/pat.h | 16 +
include/asm-x86/pci-direct.h | 2 +-
include/asm-x86/pci.h | 10 +-
include/asm-x86/pci_64.h | 15 +-
include/asm-x86/pda.h | 81 +-
include/asm-x86/percpu.h | 104 +-
include/asm-x86/pgalloc.h | 111 +-
include/asm-x86/pgalloc_32.h | 95 -
include/asm-x86/pgalloc_64.h | 133 -
include/asm-x86/pgtable-2level.h | 18 +-
include/asm-x86/pgtable-3level.h | 48 +-
include/asm-x86/pgtable.h | 251 +-
include/asm-x86/pgtable_32.h | 121 +-
include/asm-x86/pgtable_64.h | 147 +-
include/asm-x86/posix_types_32.h | 47 +-
include/asm-x86/posix_types_64.h | 54 +-
include/asm-x86/processor.h | 744 +-
include/asm-x86/proto.h | 10 +-
include/asm-x86/ptrace.h | 48 +-
include/asm-x86/reboot.h | 5 +-
include/asm-x86/resume-trace.h | 15 +-
include/asm-x86/rio.h | 87 +-
include/asm-x86/rwsem.h | 169 +-
include/asm-x86/scatterlist.h | 2 -
include/asm-x86/segment.h | 3 +-
include/asm-x86/semaphore.h | 6 +-
include/asm-x86/semaphore_32.h | 175 -
include/asm-x86/semaphore_64.h | 180 -
include/asm-x86/setup.h | 8 +-
include/asm-x86/sigcontext.h | 7 +-
include/asm-x86/sigcontext32.h | 4 +-
include/asm-x86/signal.h | 48 +-
include/asm-x86/smp.h | 209 +-
include/asm-x86/smp_32.h | 165 -
include/asm-x86/smp_64.h | 101 -
include/asm-x86/sparsemem.h | 6 +-
include/asm-x86/spinlock.h | 117 +-
include/asm-x86/srat.h | 2 +-
include/asm-x86/string_32.h | 2 +-
include/asm-x86/string_64.h | 66 +-
include/asm-x86/suspend_32.h | 12 +-
include/asm-x86/suspend_64.h | 5 +-
include/asm-x86/swiotlb.h | 28 +-
include/asm-x86/sync_bitops.h | 77 +-
include/asm-x86/system.h | 115 +-
include/asm-x86/tce.h | 2 +-
include/asm-x86/thread_info.h | 9 +
include/asm-x86/thread_info_32.h | 101 +-
include/asm-x86/thread_info_64.h | 95 +-
include/asm-x86/time.h | 1 -
include/asm-x86/tlbflush.h | 5 +-
include/asm-x86/topology.h | 65 +-
include/asm-x86/trampoline.h | 21 +
include/asm-x86/tsc.h | 4 +-
include/asm-x86/types.h | 38 +-
include/asm-x86/uaccess_32.h | 316 +-
include/asm-x86/uaccess_64.h | 376 +-
include/asm-x86/unaligned.h | 31 +-
include/asm-x86/unistd_32.h | 2 +-
include/asm-x86/unistd_64.h | 2 +-
include/asm-x86/user32.h | 7 +-
include/asm-x86/user_32.h | 6 +-
include/asm-x86/user_64.h | 16 +-
include/asm-x86/uv/uv_hub.h | 284 +
include/asm-x86/uv/uv_mmrs.h | 373 +
include/asm-x86/vdso.h | 23 +-
include/asm-x86/vga.h | 4 +-
include/asm-x86/vm86.h | 23 +-
include/asm-x86/vmi.h | 88 +-
include/asm-x86/voyager.h | 51 +-
include/asm-x86/xen/events.h | 22 +
include/asm-x86/xen/grant_table.h | 7 +
include/asm-x86/xen/hypercall.h | 6 +
include/asm-x86/xen/interface.h | 28 +
include/asm-x86/xen/page.h | 168 +
include/asm-x86/xor_32.h | 494 +-
include/asm-x86/xor_64.h | 294 +-
include/asm-xtensa/pgtable.h | 4 +
include/asm-xtensa/semaphore.h | 100 +-
include/asm-xtensa/types.h | 33 +-
include/asm-xtensa/unaligned.h | 35 +-
include/crypto/aes.h | 8 +-
include/crypto/scatterwalk.h | 4 +
include/keys/rxrpc-type.h | 2 +-
include/linux/Kbuild | 26 +-
include/linux/acpi.h | 5 +
include/linux/aer.h | 5 -
include/linux/agp_backend.h | 3 -
include/linux/aio.h | 19 -
include/linux/anon_inodes.h | 3 +-
include/linux/arcdevice.h | 4 +-
include/linux/ata_platform.h | 3 +
include/linux/atalk.h | 2 -
include/linux/atmel_tc.h | 252 +
include/linux/attribute_container.h | 30 +-
include/linux/audit.h | 57 +-
include/linux/backing-dev.h | 102 +-
include/linux/binfmts.h | 4 +-
include/linux/bio.h | 4 +
include/linux/bitmap.h | 7 +
include/linux/bitops.h | 51 +-
include/linux/blkdev.h | 60 +-
include/linux/bootmem.h | 2 +
include/linux/bsg.h | 16 +-
include/linux/buffer_head.h | 1 -
include/linux/byteorder/Kbuild | 6 +-
include/linux/byteorder/big_endian.h | 2 +
include/linux/byteorder/generic.h | 8 -
include/linux/byteorder/little_endian.h | 2 +
include/linux/cache.h | 4 +
include/linux/calc64.h | 49 -
include/linux/capability.h | 15 +-
include/linux/cdev.h | 2 -
include/linux/cdrom.h | 5 +-
include/linux/cgroup.h | 80 +-
include/linux/cgroup_subsys.h | 6 +
include/linux/clocksource.h | 3 +
include/linux/coda_fs_i.h | 2 -
include/linux/coda_linux.h | 3 -
include/linux/compat.h | 3 +-
include/linux/compiler-gcc.h | 14 +-
include/linux/concap.h | 3 +-
include/linux/configfs.h | 4 -
include/linux/console.h | 4 +
include/linux/console_struct.h | 1 +
include/linux/cpu.h | 3 +-
include/linux/cpufreq.h | 6 +-
include/linux/cpumask.h | 47 +-
include/linux/cpuset.h | 17 +-
include/linux/crc-ccitt.h | 2 -
include/linux/crypto.h | 7 -
include/linux/dcache.h | 7 +-
include/linux/debugobjects.h | 90 +
include/linux/device-mapper.h | 97 +-
include/linux/device.h | 142 +-
include/linux/device_cgroup.h | 12 +
include/linux/devpts_fs.h | 4 +
include/linux/dlm.h | 7 +-
include/linux/dlm_device.h | 11 +-
include/linux/dlm_plock.h | 50 +
include/linux/dlmconstants.h | 4 +
include/linux/dm-dirty-log.h | 131 +
include/linux/dm-io.h | 85 +
include/linux/dm-kcopyd.h | 47 +
include/linux/dma-attrs.h | 74 +
include/linux/dma-mapping.h | 17 +
include/linux/dmaengine.h | 38 +-
include/linux/dmi.h | 1 +
include/linux/dvb/dmx.h | 3 +-
include/linux/edac.h | 14 +-
include/linux/efi.h | 7 +
include/linux/elf.h | 2 +-
include/linux/enclosure.h | 11 +-
include/linux/eventfd.h | 5 -
include/linux/exportfs.h | 2 +-
include/linux/ext4_fs.h | 1207 --
include/linux/ext4_fs_extents.h | 232 -
include/linux/ext4_fs_i.h | 167 -
include/linux/ext4_fs_sb.h | 148 -
include/linux/ext4_jbd2.h | 231 -
include/linux/fb.h | 44 +-
include/linux/fdtable.h | 99 +
include/linux/file.h | 86 +-
include/linux/filter.h | 35 +-
include/linux/fs.h | 80 +-
include/linux/fsl_devices.h | 4 +-
include/linux/fsnotify.h | 4 -
include/linux/generic_serial.h | 2 +-
include/linux/gfp.h | 50 +-
include/linux/hdreg.h | 4 +-
include/linux/hdsmart.h | 126 -
include/linux/hid.h | 21 +-
include/linux/hidraw.h | 1 +
include/linux/hil_mlc.h | 2 +-
include/linux/hrtimer.h | 26 +-
include/linux/hugetlb.h | 46 +-
include/linux/hw_random.h | 14 +-
include/linux/i2c-algo-pca.h | 37 +-
include/linux/i2c-id.h | 4 +-
include/linux/i2c-pca-platform.h | 12 +
include/linux/i2c.h | 17 +-
include/linux/i2c/tps65010.h | 30 +
include/linux/i2o.h | 10 +-
include/linux/icmpv6.h | 11 +-
include/linux/ide.h | 393 +-
include/linux/idr.h | 3 +
include/linux/ieee80211.h | 41 +
include/linux/if_arp.h | 6 +
include/linux/if_bridge.h | 4 +-
include/linux/if_macvlan.h | 3 -
include/linux/if_pppox.h | 1 -
include/linux/if_tunnel.h | 22 +-
include/linux/if_vlan.h | 6 +-
include/linux/if_wanpipe.h | 124 -
include/linux/igmp.h | 38 +-
include/linux/in6.h | 34 +
include/linux/inet.h | 2 -
include/linux/inetdevice.h | 8 +-
include/linux/init.h | 2 +
include/linux/init_task.h | 8 +-
include/linux/input.h | 8 +-
include/linux/interrupt.h | 20 +
include/linux/io.h | 5 +-
include/linux/ioport.h | 5 +-
include/linux/ipc_namespace.h | 24 +-
include/linux/ipmi.h | 85 +-
include/linux/ipmi_smi.h | 10 +-
include/linux/ipv6.h | 48 +-
include/linux/irq.h | 11 +-
include/linux/irqflags.h | 6 +-
include/linux/isapnp.h | 10 -
include/linux/iscsi_ibft.h | 50 +
include/linux/isdn.h | 6 -
include/linux/isicom.h | 7 -
include/linux/jbd.h | 2 -
include/linux/jbd2.h | 2 -
include/linux/jiffies.h | 20 +-
include/linux/kbuild.h | 15 +
include/linux/kernel.h | 102 +-
include/linux/kernelcapi.h | 1 -
include/linux/key.h | 30 +-
include/linux/keyboard.h | 1 +
include/linux/keyctl.h | 1 +
include/linux/kfifo.h | 5 -
include/linux/kgdb.h | 283 +
include/linux/klist.h | 40 +-
include/linux/kobj_map.h | 4 -
include/linux/kobject.h | 3 -
include/linux/kprobes.h | 34 +
include/linux/kref.h | 3 -
include/linux/ktime.h | 6 +
include/linux/kvm.h | 130 +-
include/linux/kvm_host.h | 59 +-
include/linux/kvm_para.h | 11 +-
include/linux/kvm_types.h | 2 +
include/linux/leds.h | 16 +-
include/linux/libata.h | 749 +-
include/linux/list.h | 67 +-
include/linux/lm_interface.h | 10 +
include/linux/lmb.h | 87 +
include/linux/lock_dlm_plock.h | 41 -
include/linux/lockd/lockd.h | 26 +-
include/linux/lockd/sm_inter.h | 1 +
include/linux/math64.h | 84 +
include/linux/mbus.h | 36 +
include/linux/mca-legacy.h | 1 -
include/linux/memcontrol.h | 16 +-
include/linux/memory.h | 12 +-
include/linux/memory_hotplug.h | 33 +-
include/linux/mempolicy.h | 156 +-
include/linux/memstick.h | 2 +-
include/linux/meye.h | 2 +-
include/linux/mfd/htc-egpio.h | 57 +
include/linux/mfd/htc-pasic3.h | 55 +
include/linux/miscdevice.h | 10 +-
include/linux/mlx4/cmd.h | 2 +-
include/linux/mlx4/cq.h | 19 +-
include/linux/mlx4/device.h | 44 +-
include/linux/mlx4/driver.h | 3 +-
include/linux/mlx4/qp.h | 19 +-
include/linux/mm.h | 73 +-
include/linux/mm_types.h | 20 +-
include/linux/mmzone.h | 187 +-
include/linux/mnt_namespace.h | 12 +
include/linux/mod_devicetable.h | 11 +
include/linux/module.h | 19 +-
include/linux/mount.h | 17 +-
include/linux/mroute.h | 25 +-
include/linux/mroute6.h | 228 +
include/linux/msdos_fs.h | 10 +-
include/linux/msg.h | 14 +-
include/linux/msi.h | 1 +
include/linux/mtd/inftl.h | 5 +
include/linux/mtd/jedec.h | 66 -
include/linux/mtd/mtd.h | 6 +-
include/linux/mtd/nftl.h | 5 +
include/linux/mtd/onenand.h | 3 +
include/linux/mtd/plat-ram.h | 5 +-
include/linux/mtd/pmc551.h | 5 +-
include/linux/mtio.h | 1 +
include/linux/nbd.h | 10 +-
include/linux/ncp_fs.h | 7 +
include/linux/ncp_fs_i.h | 4 -
include/linux/net.h | 3 +-
include/linux/netdevice.h | 36 +-
include/linux/netfilter.h | 85 +-
include/linux/netfilter/nf_conntrack_dccp.h | 40 +
include/linux/netfilter/nf_conntrack_sip.h | 185 +-
include/linux/netfilter/nfnetlink_conntrack.h | 8 +
include/linux/netfilter/x_tables.h | 4 +-
include/linux/netfilter/xt_sctp.h | 84 +-
include/linux/netfilter_arp/arp_tables.h | 17 +-
include/linux/netfilter_bridge/ebt_nflog.h | 21 +
include/linux/netfilter_ipv4.h | 2 -
include/linux/netlink.h | 1 +
include/linux/nfs3.h | 2 +-
include/linux/nfs_fs.h | 5 +-
include/linux/nfs_fs_sb.h | 10 +
include/linux/nfs_xdr.h | 10 +-
include/linux/nfsd/Kbuild | 4 +-
include/linux/nfsd/cache.h | 2 -
include/linux/nfsd/nfsd.h | 13 +-
include/linux/nl80211.h | 218 +-
include/linux/nodemask.h | 22 +-
include/linux/notifier.h | 5 +
include/linux/of.h | 1 +
include/linux/of_device.h | 2 -
include/linux/of_gpio.h | 69 +
include/linux/of_i2c.h | 24 +
include/linux/oom.h | 4 +-
include/linux/page-flags.h | 319 +-
include/linux/parport.h | 2 +-
include/linux/pci-aspm.h | 56 +
include/linux/pci.h | 50 +-
include/linux/pci_ids.h | 3 +
include/linux/pci_regs.h | 8 +
include/linux/pcounter.h | 74 -
include/linux/pda_power.h | 4 +
include/linux/percpu.h | 1 -
include/linux/personality.h | 4 -
include/linux/phantom.h | 11 +-
include/linux/phy.h | 85 +-
include/linux/pid.h | 8 +-
include/linux/pid_namespace.h | 2 +-
include/linux/pim.h | 45 +
include/linux/pm.h | 47 +-
include/linux/pm_wakeup.h | 90 +
include/linux/pnp.h | 212 +-
include/linux/pnpbios.h | 151 -
include/linux/poison.h | 7 +
include/linux/poll.h | 2 +
include/linux/prctl.h | 15 +-
include/linux/proc_fs.h | 61 +-
include/linux/profile.h | 4 -
include/linux/proportions.h | 13 +
include/linux/ptrace.h | 4 +
include/linux/quota.h | 32 +-
include/linux/quotaops.h | 137 +-
include/linux/raid/md.h | 2 +-
include/linux/raid/md_k.h | 4 +
include/linux/raid/raid5.h | 7 +
include/linux/raid_class.h | 12 +-
include/linux/rcuclassic.h | 3 -
include/linux/rcupdate.h | 3 -
include/linux/rcupreempt.h | 3 -
include/linux/rcupreempt_trace.h | 2 -
include/linux/reiserfs_fs.h | 1 +
include/linux/reiserfs_fs_sb.h | 1 -
include/linux/res_counter.h | 29 +-
include/linux/resource.h | 1 +
include/linux/rio.h | 43 +-
include/linux/rio_drv.h | 3 -
include/linux/rtnetlink.h | 4 +-
include/linux/rwsem.h | 3 -
include/linux/scatterlist.h | 5 +
include/linux/sched.h | 133 +-
include/linux/securebits.h | 25 +-
include/linux/security.h | 1149 ++-
include/linux/selinux.h | 134 -
include/linux/semaphore.h | 51 +
include/linux/seq_file.h | 21 +-
include/linux/seq_file_net.h | 27 +
include/linux/seqlock.h | 46 +-
include/linux/serial_8250.h | 1 +
include/linux/serial_core.h | 10 +-
include/linux/serio.h | 1 +
include/linux/shmem_fs.h | 3 +-
include/linux/signal.h | 2 -
include/linux/skbuff.h | 207 +-
include/linux/slab.h | 10 +-
include/linux/slub_def.h | 18 +-
include/linux/smb.h | 1 +
include/linux/smb_fs_i.h | 2 -
include/linux/smb_fs_sb.h | 4 -
include/linux/smc91x.h | 13 +
include/linux/spi/ads7846.h | 3 +-
include/linux/spinlock.h | 37 -
include/linux/ssb/ssb.h | 50 +-
include/linux/ssb/ssb_driver_chipcommon.h | 7 +-
include/linux/ssb/ssb_driver_gige.h | 174 +
include/linux/ssb/ssb_driver_pci.h | 19 +
include/linux/string.h | 2 +
include/linux/sunrpc/auth.h | 17 +-
include/linux/sunrpc/auth_gss.h | 1 +
include/linux/sunrpc/cache.h | 1 -
include/linux/sunrpc/clnt.h | 9 +-
include/linux/sunrpc/gss_krb5.h | 6 +-
include/linux/sunrpc/sched.h | 41 +-
include/linux/sunrpc/svc.h | 1 -
include/linux/sunrpc/svcauth.h | 5 +-
include/linux/sunrpc/svcsock.h | 4 +-
include/linux/sunrpc/xprt.h | 10 +-
include/linux/suspend.h | 15 +-
include/linux/svga.h | 3 -
include/linux/swap.h | 4 +-
include/linux/synclink.h | 4 -
include/linux/syscalls.h | 31 +-
include/linux/sysctl.h | 14 +-
include/linux/sysdev.h | 17 +-
include/linux/sysfs.h | 19 +-
include/linux/sysv_fs.h | 6 +-
include/linux/tcp.h | 7 +
include/linux/textsearch.h | 4 -
include/linux/thermal.h | 39 +-
include/linux/thread_info.h | 39 +-
include/linux/timer.h | 23 +-
include/linux/timex.h | 46 +-
include/linux/topology.h | 46 +-
include/linux/transport_class.h | 11 +-
include/linux/tty.h | 34 +-
include/linux/tty_driver.h | 108 +-
include/linux/uaccess.h | 22 +
include/linux/udf_fs.h | 51 -
include/linux/udf_fs_i.h | 31 -
include/linux/udf_fs_sb.h | 117 -
include/linux/udp.h | 19 +-
include/linux/unaligned/access_ok.h | 67 +
include/linux/unaligned/be_byteshift.h | 70 +
include/linux/unaligned/be_memmove.h | 36 +
include/linux/unaligned/be_struct.h | 36 +
include/linux/unaligned/generic.h | 68 +
include/linux/unaligned/le_byteshift.h | 70 +
include/linux/unaligned/le_memmove.h | 36 +
include/linux/unaligned/le_struct.h | 36 +
include/linux/unaligned/memmove.h | 45 +
include/linux/unaligned/packed_struct.h | 46 +
include/linux/usb.h | 196 +-
include/linux/usb/atmel_usba_udc.h | 22 +
include/linux/usb/audio.h | 2 +-
include/linux/usb/c67x00.h | 48 +
include/linux/usb/cdc.h | 4 +
include/linux/usb/ch9.h | 29 +-
include/linux/usb/g_printer.h | 4 +
include/linux/usb/gadget.h | 23 +-
include/linux/usb/gadgetfs.h | 16 +-
include/linux/usb/input.h | 8 +-
include/linux/usb/iowarrior.h | 6 +-
include/linux/usb/isp116x.h | 6 +-
include/linux/usb/midi.h | 2 +-
include/linux/usb/net2280.h | 9 +-
include/linux/usb/otg.h | 6 +-
include/linux/usb/quirks.h | 5 +
include/linux/usb/rndis_host.h | 9 +-
include/linux/usb/serial.h | 21 +-
include/linux/usb/sl811.h | 5 +-
include/linux/usb/usbnet.h | 8 +-
include/linux/usb_usual.h | 1 +
include/linux/usbdevice_fs.h | 7 +-
include/linux/videodev2.h | 55 +-
include/linux/virtio.h | 7 +
include/linux/virtio_blk.h | 14 +-
include/linux/virtio_config.h | 81 +-
include/linux/virtio_net.h | 13 +-
include/linux/vmalloc.h | 5 +
include/linux/vmstat.h | 6 +-
include/linux/wireless.h | 8 +-
include/linux/wm97xx.h | 314 +
include/linux/writeback.h | 3 +
include/linux/xattr.h | 6 +-
include/linux/xfrm.h | 11 +-
include/media/ir-common.h | 3 +
include/media/soc_camera.h | 179 +
include/media/tuner-types.h | 17 +-
include/media/tuner.h | 2 +-
include/media/v4l2-chip-ident.h | 7 +
include/media/v4l2-common.h | 4 +-
include/media/v4l2-dev.h | 4 +
include/media/v4l2-i2c-drv-legacy.h | 2 +-
include/media/v4l2-i2c-drv.h | 2 +-
include/media/videobuf-core.h | 24 +-
include/media/videobuf-dma-sg.h | 17 +-
include/media/videobuf-dvb.h | 3 +-
include/media/videobuf-vmalloc.h | 4 +
include/mtd/Kbuild | 1 -
include/mtd/ubi-header.h | 372 -
include/net/addrconf.h | 122 +-
include/net/cfg80211.h | 159 +-
include/net/compat.h | 6 +
include/net/dst.h | 10 +-
include/net/fib_rules.h | 1 +
include/net/icmp.h | 9 +-
include/net/ieee80211.h | 1 -
include/net/ieee80211softmac.h | 373 -
include/net/ieee80211softmac_wx.h | 99 -
include/net/inet_common.h | 11 +
include/net/inet_connection_sock.h | 5 -
include/net/inet_frag.h | 6 +-
include/net/inet_hashtables.h | 29 +-
include/net/inet_sock.h | 7 +-
include/net/inet_timewait_sock.h | 18 +
include/net/ip.h | 12 +-
include/net/ip6_fib.h | 18 +-
include/net/ip6_route.h | 56 +-
include/net/ip_vs.h | 3 +-
include/net/ipip.h | 10 +
include/net/ipv6.h | 93 +-
include/net/irda/irlan_eth.h | 1 -
include/net/llc_if.h | 5 -
include/net/mac80211.h | 560 +-
include/net/mip6.h | 3 -
include/net/ndisc.h | 31 +-
include/net/neighbour.h | 31 +-
include/net/net_namespace.h | 75 +-
include/net/netfilter/nf_conntrack.h | 39 +-
include/net/netfilter/nf_conntrack_core.h | 4 +-
include/net/netfilter/nf_conntrack_expect.h | 22 +-
include/net/netfilter/nf_conntrack_helper.h | 5 +-
include/net/netfilter/nf_conntrack_l3proto.h | 19 +-
include/net/netfilter/nf_conntrack_l4proto.h | 13 +-
include/net/netfilter/nf_conntrack_tuple.h | 106 +-
include/net/netfilter/nf_nat_helper.h | 3 +
include/net/netfilter/nf_nat_protocol.h | 46 +-
include/net/netfilter/nf_nat_rule.h | 3 -
include/net/netlabel.h | 15 +-
include/net/netns/core.h | 16 +
include/net/netns/dccp.h | 11 +
include/net/netns/generic.h | 49 +
include/net/netns/ipv4.h | 11 +
include/net/netns/ipv6.h | 18 +
include/net/pkt_cls.h | 2 +-
include/net/protocol.h | 3 +-
include/net/raw.h | 4 +-
include/net/request_sock.h | 9 +-
include/net/route.h | 7 +-
include/net/rtnetlink.h | 1 +
include/net/sctp/command.h | 3 +-
include/net/sctp/sctp.h | 5 -
include/net/sctp/sm.h | 8 -
include/net/sctp/structs.h | 10 +-
include/net/sock.h | 118 +-
include/net/tcp.h | 35 +-
include/net/tipc/tipc_bearer.h | 9 +
include/net/tipc/tipc_port.h | 13 +-
include/net/udp.h | 15 +-
include/net/wireless.h | 186 +
include/net/xfrm.h | 135 +-
include/rdma/ib_umem.h | 4 +-
include/rdma/ib_user_verbs.h | 5 +-
include/rdma/ib_verbs.h | 70 +-
include/scsi/iscsi_proto.h | 6 +-
include/scsi/libiscsi.h | 1 +
include/scsi/libsas.h | 3 +-
include/scsi/sas_ata.h | 4 +-
include/scsi/scsi.h | 40 +-
include/scsi/scsi_cmnd.h | 40 +-
include/scsi/scsi_device.h | 13 +-
include/scsi/scsi_eh.h | 9 +-
include/scsi/scsi_host.h | 16 +-
include/scsi/scsi_transport.h | 2 +-
include/scsi/scsi_transport_fc.h | 14 +-
include/scsi/scsi_transport_sas.h | 12 +-
include/scsi/sd.h | 4 +-
include/sound/ac97_codec.h | 1 +
include/sound/ak4114.h | 1 +
include/sound/ak4xxx-adda.h | 2 +-
include/sound/asoundef.h | 8 +
include/sound/control.h | 7 +
include/sound/core.h | 10 +-
include/sound/mpu401.h | 16 +
include/sound/version.h | 4 +-
include/video/atmel_lcdc.h | 11 +
include/video/hecubafb.h | 51 +
include/video/metronomefb.h | 62 +
include/xen/balloon.h | 61 +
include/xen/events.h | 9 +-
include/xen/grant_table.h | 7 +
include/xen/interface/callback.h | 102 +
include/xen/interface/grant_table.h | 11 +-
include/xen/interface/io/fbif.h | 124 +
include/xen/interface/io/kbdif.h | 114 +
include/xen/interface/io/protocols.h | 21 +
include/xen/interface/memory.h | 12 +-
include/xen/interface/vcpu.h | 5 +
include/xen/interface/xen.h | 22 +-
include/xen/interface/xencomm.h | 41 +
include/xen/page.h | 181 +-
include/xen/xen-ops.h | 8 +
include/xen/xenbus.h | 1 +
include/xen/xencomm.h | 77 +
init/Kconfig | 80 +-
init/do_mounts_md.c | 2 +-
init/do_mounts_rd.c | 2 +-
init/initramfs.c | 20 +-
init/main.c | 62 +-
ipc/Makefile | 2 +-
ipc/ipc_sysctl.c | 68 +-
ipc/ipcns_notifier.c | 82 +
ipc/mqueue.c | 28 +-
ipc/msg.c | 239 +-
ipc/namespace.c | 26 +
ipc/sem.c | 159 +-
ipc/shm.c | 192 +-
ipc/util.c | 131 +-
ipc/util.h | 6 +-
kernel/Makefile | 7 +-
kernel/audit.c | 273 +-
kernel/audit.h | 38 +-
kernel/auditfilter.c | 154 +-
kernel/auditsc.c | 114 +-
kernel/bounds.c | 19 +
kernel/cgroup.c | 340 +-
kernel/cgroup_debug.c | 20 +-
kernel/compat.c | 23 +-
kernel/configs.c | 7 +-
kernel/cpu.c | 50 +-
kernel/cpuset.c | 444 +-
kernel/dma.c | 7 +-
kernel/exit.c | 181 +-
kernel/fork.c | 152 +-
kernel/futex.c | 193 +-
kernel/hrtimer.c | 303 +-
kernel/irq/chip.c | 2 +-
kernel/irq/devres.c | 1 +
kernel/irq/manage.c | 50 +-
kernel/irq/spurious.c | 4 +-
kernel/kallsyms.c | 6 +-
kernel/kexec.c | 6 +-
kernel/kgdb.c | 1700 +++
kernel/kmod.c | 3 +-
kernel/kprobes.c | 349 +-
kernel/kthread.c | 6 +-
kernel/latencytop.c | 36 +-
kernel/lockdep_proc.c | 16 +-
kernel/marker.c | 3 +-
kernel/module.c | 366 +-
kernel/notifier.c | 38 +
kernel/ns_cgroup.c | 2 +
kernel/nsproxy.c | 12 +
kernel/panic.c | 8 +-
kernel/pid.c | 41 +-
kernel/pid_namespace.c | 4 +-
kernel/posix-cpu-timers.c | 41 +-
kernel/posix-timers.c | 7 +-
kernel/power/Kconfig | 10 -
kernel/power/Makefile | 1 -
kernel/power/console.c | 27 +-
kernel/power/pm.c | 205 -
kernel/printk.c | 122 +-
kernel/profile.c | 5 +-
kernel/ptrace.c | 70 +-
kernel/rcupreempt.c | 4 +-
kernel/rcutorture.c | 16 +-
kernel/relay.c | 37 +-
kernel/res_counter.c | 10 +
kernel/resource.c | 28 +-
kernel/sched.c | 2140 +++-
kernel/sched_clock.c | 236 +
kernel/sched_debug.c | 52 +-
kernel/sched_fair.c | 565 +-
kernel/sched_features.h | 10 +
kernel/sched_idletask.c | 2 +-
kernel/sched_rt.c | 236 +-
kernel/sched_stats.h | 8 +-
kernel/semaphore.c | 264 +
kernel/signal.c | 719 +-
kernel/softirq.c | 67 +-
kernel/stop_machine.c | 6 +-
kernel/sys.c | 150 +-
kernel/sysctl.c | 191 +-
kernel/taskstats.c | 6 +-
kernel/time.c | 64 +-
kernel/time/clocksource.c | 34 +-
kernel/time/ntp.c | 398 +-
kernel/time/tick-broadcast.c | 4 +-
kernel/time/tick-common.c | 4 +-
kernel/time/tick-oneshot.c | 2 +-
kernel/time/tick-sched.c | 12 +-
kernel/time/timekeeping.c | 19 +-
kernel/time/timer_list.c | 5 +-
kernel/time/timer_stats.c | 5 +-
kernel/timeconst.pl | 120 +-
kernel/timer.c | 169 +-
kernel/user.c | 57 +-
kernel/user_namespace.c | 2 +
kernel/utsname.c | 1 +
kernel/workqueue.c | 30 +-
lib/Kconfig | 9 +
lib/Kconfig.debug | 79 +-
lib/Kconfig.kgdb | 60 +
lib/Makefile | 8 +-
lib/bitmap.c | 174 +
lib/debugobjects.c | 890 ++
lib/devres.c | 6 +-
lib/div64.c | 35 +-
lib/find_next_bit.c | 69 +-
lib/idr.c | 12 +-
lib/inflate.c | 3 +
lib/iomap.c | 2 +-
lib/kernel_lock.c | 1 +
lib/klist.c | 235 +-
lib/kobject.c | 63 +-
lib/kobject_uevent.c | 16 +-
lib/lmb.c | 509 +
lib/pcounter.c | 58 -
lib/percpu_counter.c | 1 +
lib/proportions.c | 38 +-
lib/radix-tree.c | 9 +-
lib/ratelimit.c | 51 +
lib/reed_solomon/reed_solomon.c | 1 -
lib/scatterlist.c | 102 +
lib/semaphore-sleepers.c | 176 -
lib/string.c | 27 +
lib/swiotlb.c | 149 +-
mm/Kconfig | 12 +
mm/Makefile | 2 +-
mm/allocpercpu.c | 3 +-
mm/backing-dev.c | 219 +
mm/bootmem.c | 196 +-
mm/dmapool.c | 12 +-
mm/fadvise.c | 2 +-
mm/filemap.c | 10 +-
mm/filemap_xip.c | 200 +-
mm/hugetlb.c | 84 +-
mm/internal.h | 3 +-
mm/maccess.c | 55 +
mm/madvise.c | 2 +-
mm/memcontrol.c | 190 +-
mm/memory.c | 233 +-
mm/memory_hotplug.c | 188 +-
mm/mempolicy.c | 1051 ++-
mm/migrate.c | 9 +-
mm/mincore.c | 2 +-
mm/mmap.c | 57 +-
mm/mmzone.c | 30 +
mm/nommu.c | 29 +-
mm/oom_kill.c | 58 +-
mm/page-writeback.c | 77 +-
mm/page_alloc.c | 327 +-
mm/pagewalk.c | 8 +-
mm/pdflush.c | 8 +-
mm/readahead.c | 8 +-
mm/rmap.c | 8 +-
mm/shmem.c | 146 +-
mm/slab.c | 36 +-
mm/slob.c | 3 +-
mm/slub.c | 630 +-
mm/sparse.c | 134 +-
mm/swap.c | 37 +-
mm/swap_state.c | 2 +-
mm/swapfile.c | 14 +-
mm/truncate.c | 11 +-
mm/vmalloc.c | 144 +-
mm/vmscan.c | 75 +-
mm/vmstat.c | 16 +-
net/8021q/vlan.c | 147 +-
net/8021q/vlan.h | 15 +-
net/8021q/vlan_dev.c | 15 +-
net/8021q/vlan_netlink.c | 2 +-
net/8021q/vlanproc.c | 75 +-
net/8021q/vlanproc.h | 10 +-
net/9p/error.c | 2 +-
net/Kconfig | 2 +-
net/appletalk/aarp.c | 25 +-
net/appletalk/ddp.c | 6 +-
net/atm/br2684.c | 4 +-
net/atm/clip.c | 6 +-
net/atm/lec.c | 37 +-
net/atm/mpc.c | 2 +-
net/atm/proc.c | 54 +-
net/atm/resources.c | 5 +-
net/atm/svc.c | 2 +-
net/ax25/af_ax25.c | 4 +-
net/ax25/ax25_in.c | 2 +-
net/bluetooth/bnep/core.c | 8 +-
net/bluetooth/hci_event.c | 9 +-
net/bluetooth/hci_sock.c | 2 +-
net/bluetooth/l2cap.c | 4 +-
net/bluetooth/rfcomm/sock.c | 2 +-
net/bluetooth/sco.c | 2 +-
net/bridge/br.c | 2 +-
net/bridge/br_fdb.c | 4 +
net/bridge/br_if.c | 17 +-
net/bridge/br_netfilter.c | 16 +-
net/bridge/br_netlink.c | 4 +-
net/bridge/br_notify.c | 2 +-
net/bridge/br_stp_bpdu.c | 6 +-
net/bridge/br_sysfs_br.c | 6 +-
net/bridge/netfilter/Kconfig | 14 +
net/bridge/netfilter/Makefile | 1 +
net/bridge/netfilter/ebt_nflog.c | 74 +
net/bridge/netfilter/ebtable_broute.c | 2 +-
net/bridge/netfilter/ebtable_filter.c | 2 +-
net/bridge/netfilter/ebtable_nat.c | 2 +-
net/can/af_can.c | 4 +-
net/can/bcm.c | 247 +-
net/can/raw.c | 26 +-
net/compat.c | 199 +
net/core/dev.c | 65 +-
net/core/dev_mcast.c | 37 +-
net/core/dst.c | 15 +-
net/core/ethtool.c | 65 +-
net/core/fib_rules.c | 13 +-
net/core/filter.c | 61 +-
net/core/flow.c | 1 -
net/core/neighbour.c | 176 +-
net/core/net-sysfs.c | 9 +-
net/core/net-sysfs.h | 2 +-
net/core/net_namespace.c | 104 +
net/core/netpoll.c | 6 +-
net/core/pktgen.c | 14 +-
net/core/rtnetlink.c | 51 +-
net/core/skbuff.c | 100 +-
net/core/sock.c | 164 +-
net/core/sysctl_net_core.c | 12 +-
net/dccp/ccids/ccid2.c | 2 +-
net/dccp/ccids/ccid3.c | 4 +-
net/dccp/dccp.h | 8 +-
net/dccp/feat.c | 2 +-
net/dccp/ipv4.c | 79 +-
net/dccp/ipv6.c | 93 +-
net/dccp/minisocks.c | 2 +-
net/dccp/output.c | 6 +-
net/dccp/probe.c | 19 +-
net/dccp/proto.c | 28 +-
net/decnet/af_decnet.c | 25 +-
net/decnet/dn_dev.c | 6 +-
net/decnet/dn_fib.c | 4 +-
net/decnet/dn_route.c | 18 +-
net/decnet/dn_table.c | 2 +-
net/econet/af_econet.c | 4 +-
net/ieee80211/Kconfig | 1 -
net/ieee80211/Makefile | 1 -
net/ieee80211/softmac/Kconfig | 12 -
net/ieee80211/softmac/Makefile | 9 -
net/ieee80211/softmac/ieee80211softmac_assoc.c | 489 -
net/ieee80211/softmac/ieee80211softmac_auth.c | 413 -
net/ieee80211/softmac/ieee80211softmac_event.c | 189 -
net/ieee80211/softmac/ieee80211softmac_io.c | 488 -
net/ieee80211/softmac/ieee80211softmac_module.c | 568 -
net/ieee80211/softmac/ieee80211softmac_priv.h | 244 -
net/ieee80211/softmac/ieee80211softmac_scan.c | 254 -
net/ieee80211/softmac/ieee80211softmac_wx.c | 508 -
net/ipv4/af_inet.c | 72 +-
net/ipv4/arp.c | 62 +-
net/ipv4/cipso_ipv4.c | 19 +-
net/ipv4/devinet.c | 35 +-
net/ipv4/fib_frontend.c | 20 +-
net/ipv4/fib_hash.c | 22 +-
net/ipv4/fib_rules.c | 2 +-
net/ipv4/fib_semantics.c | 3 +-
net/ipv4/fib_trie.c | 258 +-
net/ipv4/icmp.c | 214 +-
net/ipv4/igmp.c | 45 +-
net/ipv4/inet_connection_sock.c | 45 +-
net/ipv4/inet_fragment.c | 10 +-
net/ipv4/inet_hashtables.c | 43 +-
net/ipv4/inet_timewait_sock.c | 5 +-
net/ipv4/ip_forward.c | 2 +-
net/ipv4/ip_fragment.c | 26 +-
net/ipv4/ip_gre.c | 228 +-
net/ipv4/ip_input.c | 21 +-
net/ipv4/ip_options.c | 75 +-
net/ipv4/ip_output.c | 50 +-
net/ipv4/ip_sockglue.c | 27 +-
net/ipv4/ipcomp.c | 3 +-
net/ipv4/ipconfig.c | 47 +-
net/ipv4/ipip.c | 220 +-
net/ipv4/ipmr.c | 12 +-
net/ipv4/ipvs/ip_vs_proto.c | 2 +-
net/ipv4/ipvs/ip_vs_proto_ah.c | 1 +
net/ipv4/ipvs/ip_vs_proto_esp.c | 1 +
net/ipv4/ipvs/ip_vs_proto_tcp.c | 3 +-
net/ipv4/ipvs/ip_vs_proto_udp.c | 3 +-
net/ipv4/ipvs/ip_vs_sync.c | 84 +-
net/ipv4/netfilter.c | 37 +-
net/ipv4/netfilter/Kconfig | 16 +
net/ipv4/netfilter/Makefile | 5 +-
net/ipv4/netfilter/arp_tables.c | 89 +-
net/ipv4/netfilter/arpt_mangle.c | 12 +-
net/ipv4/netfilter/arptable_filter.c | 7 +-
net/ipv4/netfilter/ip_queue.c | 7 +-
net/ipv4/netfilter/ip_tables.c | 53 +-
net/ipv4/netfilter/ipt_CLUSTERIP.c | 20 +-
net/ipv4/netfilter/ipt_ECN.c | 2 +-
net/ipv4/netfilter/ipt_LOG.c | 9 +-
net/ipv4/netfilter/ipt_MASQUERADE.c | 18 +-
net/ipv4/netfilter/ipt_REJECT.c | 6 +-
net/ipv4/netfilter/ipt_recent.c | 6 +-
net/ipv4/netfilter/iptable_filter.c | 21 +-
net/ipv4/netfilter/iptable_mangle.c | 51 +-
net/ipv4/netfilter/iptable_raw.c | 8 +-
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 72 +-
.../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 15 +-
net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 27 +-
net/ipv4/netfilter/nf_nat_core.c | 61 +-
net/ipv4/netfilter/nf_nat_helper.c | 5 +-
net/ipv4/netfilter/nf_nat_pptp.c | 2 +-
net/ipv4/netfilter/nf_nat_proto_common.c | 120 +
net/ipv4/netfilter/nf_nat_proto_dccp.c | 108 +
net/ipv4/netfilter/nf_nat_proto_gre.c | 45 +-
net/ipv4/netfilter/nf_nat_proto_icmp.c | 19 +-
net/ipv4/netfilter/nf_nat_proto_sctp.c | 96 +
net/ipv4/netfilter/nf_nat_proto_tcp.c | 80 +-
net/ipv4/netfilter/nf_nat_proto_udp.c | 77 +-
net/ipv4/netfilter/nf_nat_proto_udplite.c | 99 +
net/ipv4/netfilter/nf_nat_proto_unknown.c | 25 +-
net/ipv4/netfilter/nf_nat_rule.c | 25 +-
net/ipv4/netfilter/nf_nat_sip.c | 556 +-
net/ipv4/netfilter/nf_nat_snmp_basic.c | 29 +-
net/ipv4/netfilter/nf_nat_standalone.c | 76 +-
net/ipv4/proc.c | 71 +-
net/ipv4/raw.c | 47 +-
net/ipv4/route.c | 343 +-
net/ipv4/syncookies.c | 102 +-
net/ipv4/sysctl_net_ipv4.c | 162 +-
net/ipv4/tcp.c | 20 +-
net/ipv4/tcp_cong.c | 12 +-
net/ipv4/tcp_cubic.c | 39 +-
net/ipv4/tcp_hybla.c | 6 +-
net/ipv4/tcp_input.c | 110 +-
net/ipv4/tcp_ipv4.c | 237 +-
net/ipv4/tcp_minisocks.c | 36 +-
net/ipv4/tcp_output.c | 13 +-
net/ipv4/tcp_probe.c | 11 +-
net/ipv4/tcp_timer.c | 19 +-
net/ipv4/tcp_vegas.c | 16 +-
net/ipv4/tcp_veno.c | 14 +-
net/ipv4/tunnel4.c | 2 +
net/ipv4/udp.c | 160 +-
net/ipv4/udp_impl.h | 6 +-
net/ipv4/udplite.c | 62 +-
net/ipv4/xfrm4_policy.c | 2 +-
net/ipv6/Kconfig | 41 +-
net/ipv6/Makefile | 3 +
net/ipv6/addrconf.c | 758 +-
net/ipv6/addrlabel.c | 25 +-
net/ipv6/af_inet6.c | 227 +-
net/ipv6/anycast.c | 63 +-
net/ipv6/fib6_rules.c | 113 +-
net/ipv6/icmp.c | 145 +-
net/ipv6/inet6_connection_sock.c | 4 +
net/ipv6/inet6_hashtables.c | 10 +-
net/ipv6/ip6_fib.c | 298 +-
net/ipv6/ip6_flowlabel.c | 101 +-
net/ipv6/ip6_input.c | 98 +-
net/ipv6/ip6_output.c | 40 +-
net/ipv6/ip6_tunnel.c | 228 +-
net/ipv6/ip6mr.c | 1643 +++
net/ipv6/ipcomp6.c | 1 -
net/ipv6/ipv6_sockglue.c | 374 +-
net/ipv6/mcast.c | 272 +-
net/ipv6/mip6.c | 24 +-
net/ipv6/ndisc.c | 237 +-
net/ipv6/netfilter.c | 46 +-
net/ipv6/netfilter/ip6_queue.c | 7 +-
net/ipv6/netfilter/ip6_tables.c | 51 +-
net/ipv6/netfilter/ip6t_LOG.c | 6 +-
net/ipv6/netfilter/ip6t_REJECT.c | 7 +-
net/ipv6/netfilter/ip6t_ipv6header.c | 3 +-
net/ipv6/netfilter/ip6t_rt.c | 3 +-
net/ipv6/netfilter/ip6table_filter.c | 2 +-
net/ipv6/netfilter/ip6table_mangle.c | 2 +-
net/ipv6/netfilter/ip6table_raw.c | 2 +-
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 14 +-
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 29 +-
net/ipv6/netfilter/nf_conntrack_reasm.c | 23 +-
net/ipv6/proc.c | 79 +-
net/ipv6/raw.c | 87 +-
net/ipv6/reassembly.c | 23 +-
net/ipv6/route.c | 645 +-
net/ipv6/sit.c | 456 +-
net/ipv6/syncookies.c | 279 +
net/ipv6/sysctl_net_ipv6.c | 15 +-
net/ipv6/tcp_ipv6.c | 199 +-
net/ipv6/udp.c | 44 +-
net/ipv6/udp_impl.h | 2 +
net/ipv6/udplite.c | 40 +-
net/ipv6/xfrm6_input.c | 55 +-
net/ipv6/xfrm6_policy.c | 9 +-
net/ipv6/xfrm6_state.c | 171 +-
net/ipv6/xfrm6_tunnel.c | 45 +-
net/ipx/af_ipx.c | 4 +-
net/irda/af_irda.c | 180 +-
net/irda/discovery.c | 4 +-
net/irda/ircomm/ircomm_core.c | 46 +-
net/irda/ircomm/ircomm_event.c | 12 +-
net/irda/ircomm/ircomm_lmp.c | 30 +-
net/irda/ircomm/ircomm_param.c | 32 +-
net/irda/ircomm/ircomm_ttp.c | 26 +-
net/irda/ircomm/ircomm_tty.c | 96 +-
net/irda/ircomm/ircomm_tty_attach.c | 78 +-
net/irda/ircomm/ircomm_tty_ioctl.c | 18 +-
net/irda/irda_device.c | 18 +-
net/irda/iriap.c | 84 +-
net/irda/iriap_event.c | 38 +-
net/irda/irias_object.c | 44 +-
net/irda/irlan/irlan_client.c | 48 +-
net/irda/irlan/irlan_client_event.c | 64 +-
net/irda/irlan/irlan_common.c | 82 +-
net/irda/irlan/irlan_eth.c | 51 +-
net/irda/irlan/irlan_event.c | 4 +-
net/irda/irlan/irlan_filter.c | 4 +-
net/irda/irlan/irlan_provider.c | 30 +-
net/irda/irlan/irlan_provider_event.c | 16 +-
net/irda/irlap.c | 56 +-
net/irda/irlap_event.c | 122 +-
net/irda/irlap_frame.c | 76 +-
net/irda/irlmp.c | 112 +-
net/irda/irlmp_event.c | 94 +-
net/irda/irlmp_frame.c | 36 +-
net/irda/irmod.c | 2 +-
net/irda/irnet/irnet.h | 10 +-
net/irda/irnet/irnet_irda.c | 65 +-
net/irda/irnet/irnet_irda.h | 8 -
net/irda/irnetlink.c | 4 +-
net/irda/irqueue.c | 8 +-
net/irda/irttp.c | 108 +-
net/irda/parameters.c | 42 +-
net/irda/qos.c | 24 +-
net/irda/wrapper.c | 18 +-
net/iucv/af_iucv.c | 2 +-
net/iucv/iucv.c | 17 +-
net/key/af_key.c | 159 +-
net/llc/af_llc.c | 16 +-
net/llc/llc_c_ac.c | 2 +-
net/llc/llc_c_ev.c | 8 +-
net/llc/llc_conn.c | 26 +-
net/llc/llc_input.c | 6 +-
net/mac80211/Kconfig | 37 +-
net/mac80211/Makefile | 21 +-
net/mac80211/aes_ccm.c | 2 +-
net/mac80211/cfg.c | 458 +-
net/mac80211/debugfs.c | 53 +-
net/mac80211/debugfs_key.c | 42 +-
net/mac80211/debugfs_key.h | 11 +-
net/mac80211/debugfs_netdev.c | 218 +-
net/mac80211/debugfs_sta.c | 181 +-
net/mac80211/debugfs_sta.h | 2 +
net/mac80211/ieee80211.c | 1402 ---
net/mac80211/ieee80211_i.h | 525 +-
net/mac80211/ieee80211_iface.c | 298 -
net/mac80211/ieee80211_ioctl.c | 1138 --
net/mac80211/ieee80211_key.h | 127 -
net/mac80211/ieee80211_led.c | 161 -
net/mac80211/ieee80211_led.h | 44 -
net/mac80211/ieee80211_rate.c | 246 -
net/mac80211/ieee80211_rate.h | 199 -
net/mac80211/ieee80211_sta.c | 3632 ------
net/mac80211/iface.c | 314 +
net/mac80211/key.c | 393 +-
net/mac80211/key.h | 161 +
net/mac80211/led.c | 161 +
net/mac80211/led.h | 44 +
net/mac80211/main.c | 1905 ++++
net/mac80211/mesh.c | 442 +
net/mac80211/mesh.h | 291 +
net/mac80211/mesh_hwmp.c | 854 ++
net/mac80211/mesh_pathtbl.c | 516 +
net/mac80211/mesh_plink.c | 762 ++
net/mac80211/mlme.c | 4321 +++++++
net/mac80211/rate.c | 249 +
net/mac80211/rate.h | 189 +
net/mac80211/rc80211_pid_algo.c | 124 +-
net/mac80211/rc80211_pid_debugfs.c | 2 +-
net/mac80211/rc80211_simple.c | 400 -
net/mac80211/regdomain.c | 152 -
net/mac80211/rx.c | 869 +-
net/mac80211/sta_info.c | 698 +-
net/mac80211/sta_info.h | 357 +-
net/mac80211/tkip.c | 68 +-
net/mac80211/tkip.h | 4 +-
net/mac80211/tx.c | 732 +-
net/mac80211/util.c | 172 +-
net/mac80211/wep.c | 40 +-
net/mac80211/wep.h | 10 +-
net/mac80211/wext.c | 1152 ++
net/mac80211/wme.c | 139 +-
net/mac80211/wme.h | 23 +-
net/mac80211/wpa.c | 152 +-
net/mac80211/wpa.h | 24 +-
net/netfilter/Kconfig | 10 +
net/netfilter/Makefile | 1 +
net/netfilter/core.c | 8 +
net/netfilter/nf_conntrack_amanda.c | 18 +-
net/netfilter/nf_conntrack_core.c | 33 +-
net/netfilter/nf_conntrack_expect.c | 81 +-
net/netfilter/nf_conntrack_extend.c | 3 +
net/netfilter/nf_conntrack_ftp.c | 19 +-
net/netfilter/nf_conntrack_h323_main.c | 95 +-
net/netfilter/nf_conntrack_helper.c | 5 +-
net/netfilter/nf_conntrack_irc.c | 24 +-
net/netfilter/nf_conntrack_l3proto_generic.c | 12 +-
net/netfilter/nf_conntrack_netbios_ns.c | 11 +-
net/netfilter/nf_conntrack_netlink.c | 34 +-
net/netfilter/nf_conntrack_pptp.c | 18 +-
net/netfilter/nf_conntrack_proto.c | 9 +-
net/netfilter/nf_conntrack_proto_dccp.c | 815 ++
net/netfilter/nf_conntrack_proto_generic.c | 20 +-
net/netfilter/nf_conntrack_proto_gre.c | 31 +-
net/netfilter/nf_conntrack_proto_sctp.c | 50 +-
net/netfilter/nf_conntrack_proto_tcp.c | 64 +-
net/netfilter/nf_conntrack_proto_udp.c | 18 +-
net/netfilter/nf_conntrack_proto_udplite.c | 55 +-
net/netfilter/nf_conntrack_sane.c | 14 +-
net/netfilter/nf_conntrack_sip.c | 1392 ++-
net/netfilter/nf_conntrack_standalone.c | 133 +-
net/netfilter/nf_conntrack_tftp.c | 19 +-
net/netfilter/nf_queue.c | 2 +-
net/netfilter/nf_sockopt.c | 2 +-
net/netfilter/nfnetlink_queue.c | 7 +-
net/netfilter/x_tables.c | 37 +-
net/netfilter/xt_CONNSECMARK.c | 2 +-
net/netfilter/xt_RATEEST.c | 2 +-
net/netfilter/xt_TCPOPTSTRIP.c | 2 +-
net/netfilter/xt_connbytes.c | 5 +-
net/netfilter/xt_connlimit.c | 10 +-
net/netfilter/xt_conntrack.c | 4 +-
net/netfilter/xt_dccp.c | 3 +-
net/netfilter/xt_esp.c | 3 +-
net/netfilter/xt_hashlimit.c | 12 +-
net/netfilter/xt_multiport.c | 6 +-
net/netfilter/xt_policy.c | 2 +-
net/netfilter/xt_rateest.c | 4 +-
net/netfilter/xt_sctp.c | 6 +-
net/netfilter/xt_tcpmss.c | 6 +-
net/netfilter/xt_tcpudp.c | 9 +-
net/netfilter/xt_time.c | 2 +-
net/netlabel/netlabel_unlabeled.c | 7 +-
net/netlabel/netlabel_user.c | 4 +-
net/netlabel/netlabel_user.h | 1 +
net/netlink/af_netlink.c | 87 +-
net/netrom/af_netrom.c | 4 +-
net/packet/af_packet.c | 33 +-
net/rose/af_rose.c | 10 +-
net/rose/rose_route.c | 10 +-
net/rxrpc/ar-internal.h | 8 +-
net/rxrpc/ar-proc.c | 4 +-
net/rxrpc/ar-transport.c | 3 +-
net/rxrpc/rxkad.c | 2 +-
net/sched/act_api.c | 4 +-
net/sched/act_simple.c | 45 +-
net/sched/cls_api.c | 4 +-
net/sched/em_meta.c | 4 +-
net/sched/sch_api.c | 10 +-
net/sched/sch_generic.c | 1 +
net/sched/sch_htb.c | 8 +-
net/sched/sch_sfq.c | 3 +-
net/sctp/associola.c | 42 +-
net/sctp/bind_addr.c | 15 +-
net/sctp/chunk.c | 23 +-
net/sctp/command.c | 10 +-
net/sctp/input.c | 3 +-
net/sctp/ipv6.c | 17 +-
net/sctp/objcnt.c | 9 +-
net/sctp/output.c | 14 +-
net/sctp/outqueue.c | 68 +-
net/sctp/proc.c | 27 +-
net/sctp/protocol.c | 50 +-
net/sctp/sm_make_chunk.c | 12 +-
net/sctp/sm_sideeffect.c | 29 +-
net/sctp/sm_statefuns.c | 38 +-
net/sctp/socket.c | 81 +-
net/sctp/transport.c | 10 +-
net/socket.c | 7 +-
net/sunrpc/Makefile | 2 +-
net/sunrpc/auth.c | 71 +-
net/sunrpc/auth_generic.c | 177 +
net/sunrpc/auth_gss/auth_gss.c | 107 +-
net/sunrpc/auth_gss/gss_generic_token.c | 4 +-
net/sunrpc/auth_gss/gss_krb5_crypto.c | 6 +-
net/sunrpc/auth_gss/gss_krb5_seal.c | 9 +-
net/sunrpc/auth_gss/gss_krb5_seqnum.c | 4 +-
net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_wrap.c | 8 +-
net/sunrpc/auth_gss/gss_spkm3_seal.c | 4 +-
net/sunrpc/auth_gss/svcauth_gss.c | 9 +-
net/sunrpc/auth_null.c | 3 +-
net/sunrpc/auth_unix.c | 59 +-
net/sunrpc/cache.c | 16 +-
net/sunrpc/clnt.c | 94 +-
net/sunrpc/rpc_pipe.c | 12 +-
net/sunrpc/rpcb_clnt.c | 22 +-
net/sunrpc/sched.c | 264 +-
net/sunrpc/stats.c | 8 +-
net/sunrpc/svc.c | 41 +-
net/sunrpc/svc_xprt.c | 30 +-
net/sunrpc/svcauth_unix.c | 118 +-
net/sunrpc/svcsock.c | 29 +-
net/sunrpc/xprt.c | 82 +-
net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +
net/sunrpc/xprtrdma/verbs.c | 1 -
net/sunrpc/xprtsock.c | 84 +-
net/sysctl_net.c | 2 +-
net/tipc/core.c | 11 +-
net/tipc/core.h | 23 +-
net/tipc/eth_media.c | 4 +-
net/tipc/link.c | 111 +-
net/tipc/msg.c | 16 +-
net/tipc/msg.h | 47 +-
net/tipc/port.c | 43 +-
net/tipc/ref.c | 211 +-
net/tipc/ref.h | 89 +-
net/tipc/socket.c | 1192 ++-
net/unix/af_unix.c | 42 +-
net/wireless/Makefile | 2 +-
net/wireless/core.c | 41 +
net/wireless/core.h | 3 +
net/wireless/nl80211.c | 552 +-
net/wireless/reg.c | 162 +
net/wireless/util.c | 121 +
net/wireless/wext.c | 2 +-
net/x25/af_x25.c | 4 +-
net/x25/x25_dev.c | 2 +-
net/xfrm/xfrm_algo.c | 3 +-
net/xfrm/xfrm_output.c | 2 +-
net/xfrm/xfrm_policy.c | 170 +-
net/xfrm/xfrm_state.c | 68 +-
net/xfrm/xfrm_user.c | 143 +-
samples/firmware_class/firmware_sample_driver.c | 121 +
.../firmware_sample_firmware_class.c | 204 +
samples/markers/marker-example.c | 6 +-
scripts/Lindent | 18 +-
scripts/Makefile.build | 6 +-
scripts/Makefile.clean | 2 +-
scripts/Makefile.host | 12 +-
scripts/Makefile.modpost | 8 +
scripts/checkpatch.pl | 157 +-
scripts/gen_initramfs_list.sh | 2 +-
scripts/kallsyms.c | 6 -
scripts/kconfig/Makefile | 4 +-
scripts/kconfig/lex.zconf.c_shipped | 25 +-
scripts/kconfig/lkc.h | 6 +-
scripts/kconfig/lkc_proto.h | 2 +-
scripts/kconfig/lxdialog/check-lxdialog.sh | 6 +-
scripts/kconfig/lxdialog/inputbox.c | 2 +-
scripts/kconfig/mconf.c | 3 +-
scripts/kconfig/menu.c | 64 +-
scripts/kconfig/symbol.c | 118 +-
scripts/kconfig/zconf.tab.c_shipped | 301 +-
scripts/kconfig/zconf.y | 13 +-
scripts/kernel-doc | 25 +-
scripts/mod/file2alias.c | 105 +-
scripts/mod/modpost.c | 27 +-
security/Kconfig | 10 +-
security/Makefile | 1 +
security/capability.c | 1 +
security/commoncap.c | 113 +-
security/device_cgroup.c | 575 +
security/dummy.c | 100 +-
security/keys/Makefile | 1 +
security/keys/compat.c | 3 +
security/keys/internal.h | 38 +-
security/keys/key.c | 86 +-
security/keys/keyctl.c | 126 +-
security/keys/keyring.c | 54 +-
security/keys/proc.c | 17 +-
security/keys/process_keys.c | 142 +-
security/keys/request_key.c | 50 +-
security/keys/request_key_auth.c | 13 +-
security/keys/sysctl.c | 50 +
security/root_plug.c | 3 +-
security/security.c | 145 +-
security/selinux/Kconfig | 2 +-
security/selinux/Makefile | 1 +
security/selinux/avc.c | 82 +-
security/selinux/exports.c | 42 -
security/selinux/hooks.c | 770 +-
security/selinux/include/audit.h | 65 +
security/selinux/include/av_perm_to_string.h | 5 +
security/selinux/include/av_permissions.h | 5 +
security/selinux/include/avc_ss.h | 9 +-
security/selinux/include/netlabel.h | 18 +-
security/selinux/include/netport.h | 31 +
security/selinux/include/objsec.h | 75 +-
security/selinux/include/security.h | 23 +-
security/selinux/include/xfrm.h | 13 +-
security/selinux/netif.c | 23 +-
security/selinux/netlabel.c | 84 +-
security/selinux/netlink.c | 22 +-
security/selinux/netnode.c | 106 +-
security/selinux/netport.c | 282 +
security/selinux/nlmsgtab.c | 5 +-
security/selinux/selinuxfs.c | 131 +-
security/selinux/ss/avtab.c | 66 +-
security/selinux/ss/conditional.c | 76 +-
security/selinux/ss/conditional.h | 6 +-
security/selinux/ss/context.h | 4 +-
security/selinux/ss/ebitmap.c | 19 +-
security/selinux/ss/hashtab.c | 4 +-
security/selinux/ss/hashtab.h | 6 +-
security/selinux/ss/mls.c | 27 +-
security/selinux/ss/mls.h | 6 +-
security/selinux/ss/mls_types.h | 4 +-
security/selinux/ss/policydb.c | 213 +-
security/selinux/ss/policydb.h | 12 +-
security/selinux/ss/services.c | 300 +-
security/selinux/ss/sidtab.c | 6 +-
security/selinux/xfrm.c | 49 +-
security/smack/smack.h | 2 +
security/smack/smack_lsm.c | 194 +-
security/smack/smackfs.c | 17 +-
sound/arm/pxa2xx-ac97.c | 83 +-
sound/core/Kconfig | 4 +
sound/core/Makefile | 1 +
sound/core/info.c | 4 +-
sound/core/init.c | 38 +-
sound/core/memalloc.c | 5 +-
sound/core/misc.c | 4 +-
sound/core/oss/mixer_oss.c | 2 +
sound/core/seq/oss/seq_oss_synth.c | 9 +-
sound/core/vmaster.c | 371 +
sound/drivers/Kconfig | 20 +
sound/drivers/Makefile | 2 +-
sound/drivers/dummy.c | 37 +-
sound/drivers/ml403-ac97cr.c | 6 +-
sound/drivers/mpu401/mpu401_uart.c | 25 +-
sound/drivers/pcsp/Makefile | 2 +
sound/drivers/pcsp/pcsp.c | 239 +
sound/drivers/pcsp/pcsp.h | 82 +
sound/drivers/pcsp/pcsp_input.c | 116 +
sound/drivers/pcsp/pcsp_input.h | 14 +
sound/drivers/pcsp/pcsp_lib.c | 338 +
sound/drivers/pcsp/pcsp_mixer.c | 143 +
sound/i2c/other/ak4114.c | 24 +-
sound/i2c/other/ak4xxx-adda.c | 16 +-
sound/isa/sb/sb16_csp.c | 28 +-
sound/isa/sb/sb_common.c | 6 +-
sound/oss/dmabuf.c | 4 +-
sound/oss/trident.c | 12 +-
sound/oss/trident.h | 2 +-
sound/oss/vwsnd.c | 6 +-
sound/pci/Kconfig | 27 +-
sound/pci/Makefile | 1 +
sound/pci/ac97/ac97_patch.c | 55 +-
sound/pci/ac97/ac97_pcm.c | 1 -
sound/pci/ad1889.c | 6 +-
sound/pci/ali5451/ali5451.c | 32 +-
sound/pci/als300.c | 4 +-
sound/pci/atiixp.c | 2 +-
sound/pci/atiixp_modem.c | 2 +-
sound/pci/au88x0/au88x0.c | 2 -
sound/pci/au88x0/au88x0_pcm.c | 10 +-
sound/pci/aw2/Makefile | 3 +
sound/pci/aw2/aw2-alsa.c | 794 ++
sound/pci/aw2/aw2-saa7146.c | 465 +
sound/pci/aw2/aw2-saa7146.h | 105 +
sound/pci/aw2/aw2-tsl.c | 110 +
sound/pci/aw2/saa7146.h | 168 +
sound/pci/azt3328.c | 7 +-
sound/pci/ca0106/ca0106_main.c | 21 +-
sound/pci/ca0106/ca0106_mixer.c | 59 +-
sound/pci/cmipci.c | 13 +-
sound/pci/cs46xx/cs46xx_lib.c | 6 +-
sound/pci/echoaudio/echoaudio.c | 7 +-
sound/pci/emu10k1/emu10k1_main.c | 15 +-
sound/pci/emu10k1/emu10k1x.c | 30 +-
sound/pci/emu10k1/emuproc.c | 2 +-
sound/pci/ens1370.c | 9 +-
sound/pci/es1938.c | 5 +-
sound/pci/es1968.c | 42 +-
sound/pci/fm801.c | 8 +-
sound/pci/hda/Makefile | 2 +-
sound/pci/hda/hda_codec.c | 201 +-
sound/pci/hda/hda_codec.h | 13 +-
sound/pci/hda/hda_generic.c | 4 +-
sound/pci/hda/hda_intel.c | 459 +-
sound/pci/hda/hda_local.h | 20 +-
sound/pci/hda/hda_patch.h | 28 -
sound/pci/hda/patch_analog.c | 581 +-
sound/pci/hda/patch_atihdmi.c | 8 +
sound/pci/hda/patch_cmedia.c | 13 +-
sound/pci/hda/patch_conexant.c | 68 +-
sound/pci/hda/patch_realtek.c | 1329 ++-
sound/pci/hda/patch_si3054.c | 4 +-
sound/pci/hda/patch_sigmatel.c | 393 +-
sound/pci/hda/patch_via.c | 14 +-
sound/pci/hda/vmaster.c | 364 -
sound/pci/ice1712/delta.c | 22 +-
sound/pci/ice1712/delta.h | 2 +
sound/pci/ice1712/ews.c | 15 +
sound/pci/ice1712/ews.h | 4 +-
sound/pci/ice1712/hoontech.c | 21 +-
sound/pci/ice1712/ice1712.c | 45 +-
sound/pci/ice1712/ice1712.h | 17 +-
sound/pci/ice1712/ice1724.c | 430 +-
sound/pci/ice1712/juli.c | 486 +-
sound/pci/ice1712/pontis.c | 4 +-
sound/pci/ice1712/prodigy192.c | 37 +-
sound/pci/ice1712/revo.c | 55 +-
sound/pci/intel8x0.c | 33 +-
sound/pci/intel8x0m.c | 9 +-
sound/pci/korg1212/korg1212.c | 1 -
sound/pci/maestro3.c | 38 +-
sound/pci/nm256/nm256.c | 4 +-
sound/pci/oxygen/cs4362a.h | 69 +
sound/pci/oxygen/cs4398.h | 69 +
sound/pci/oxygen/hifier.c | 36 +-
sound/pci/oxygen/oxygen.c | 129 +-
sound/pci/oxygen/oxygen.h | 23 +-
sound/pci/oxygen/oxygen_io.c | 23 +-
sound/pci/oxygen/oxygen_lib.c | 113 +-
sound/pci/oxygen/oxygen_mixer.c | 217 +-
sound/pci/oxygen/oxygen_pcm.c | 78 +-
sound/pci/oxygen/pcm1796.h | 58 +
sound/pci/oxygen/virtuoso.c | 594 +-
sound/pci/oxygen/wm8785.h | 45 +
sound/pci/pcxhr/pcxhr.c | 7 +-
sound/pci/pcxhr/pcxhr_core.c | 33 +-
sound/pci/riptide/riptide.c | 14 +-
sound/pci/rme32.c | 3 +-
sound/pci/rme96.c | 3 +-
sound/pci/rme9652/hdsp.c | 54 +-
sound/pci/rme9652/hdspm.c | 19 +-
sound/pci/sis7019.c | 7 +-
sound/pci/trident/trident_main.c | 4 +-
sound/pci/via82xx.c | 2 +-
sound/pci/via82xx_modem.c | 2 +-
sound/pci/ymfpci/ymfpci_main.c | 4 +-
sound/ppc/awacs.c | 265 +-
sound/ppc/awacs.h | 21 +-
sound/ppc/burgundy.c | 465 +-
sound/ppc/burgundy.h | 31 +-
sound/ppc/pmac.c | 10 +-
sound/ppc/snd_ps3.c | 2 +-
sound/sh/aica.c | 2 +-
sound/soc/Kconfig | 2 +
sound/soc/Makefile | 2 +-
sound/soc/at91/eti_b1_wm8731.c | 30 +-
sound/soc/codecs/Kconfig | 4 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/ac97.c | 16 +-
sound/soc/codecs/cs4270.c | 2 +-
sound/soc/codecs/tlv320aic3x.c | 22 +
sound/soc/codecs/wm8731.c | 23 +-
sound/soc/codecs/wm8750.c | 27 +-
sound/soc/codecs/wm8753.c | 39 +-
sound/soc/codecs/wm9712.c | 70 +-
sound/soc/codecs/wm9713.c | 1300 +++
sound/soc/codecs/wm9713.h | 53 +
sound/soc/davinci/Kconfig | 19 +
sound/soc/davinci/Makefile | 11 +
sound/soc/davinci/davinci-evm.c | 208 +
sound/soc/davinci/davinci-i2s.c | 407 +
sound/soc/davinci/davinci-i2s.h | 17 +
sound/soc/davinci/davinci-pcm.c | 389 +
sound/soc/davinci/davinci-pcm.h | 29 +
sound/soc/fsl/fsl_dma.c | 1 -
sound/soc/fsl/fsl_ssi.c | 1 -
sound/soc/omap/Kconfig | 19 +
sound/soc/omap/Makefile | 11 +
sound/soc/omap/n810.c | 336 +
sound/soc/omap/omap-mcbsp.c | 414 +
sound/soc/omap/omap-mcbsp.h | 49 +
sound/soc/omap/omap-pcm.c | 357 +
sound/soc/omap/omap-pcm.h | 35 +
sound/soc/pxa/corgi.c | 11 +-
sound/soc/pxa/poodle.c | 8 +-
sound/soc/pxa/pxa2xx-ac97.c | 88 +-
sound/soc/pxa/pxa2xx-i2s.c | 1 +
sound/soc/pxa/pxa2xx-pcm.c | 9 +-
sound/soc/pxa/spitz.c | 6 +-
sound/soc/s3c24xx/ln2440sbc_alc650.c | 4 +-
sound/soc/s3c24xx/neo1973_wm8753.c | 59 +-
sound/soc/s3c24xx/s3c2443-ac97.c | 9 +-
sound/soc/s3c24xx/s3c24xx-i2s.c | 43 +-
sound/soc/s3c24xx/s3c24xx-pcm.c | 65 +-
sound/soc/sh/Kconfig | 1 +
sound/soc/soc-core.c | 2 +
sound/soc/soc-dapm.c | 7 +-
sound/spi/at73c213.c | 44 +-
sound/usb/caiaq/caiaq-audio.c | 81 +-
sound/usb/caiaq/caiaq-device.c | 4 +-
sound/usb/usbaudio.c | 98 +-
sound/usb/usbquirks.h | 75 +-
virt/kvm/kvm_main.c | 248 +-
virt/kvm/kvm_trace.c | 276 +
7623 files changed, 533543 insertions(+), 391271 deletions(-)
New commits:
commit c0a18111e571138747a98af18b3a2124df56a0d1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 17:09:27 2008 -0700
Revert "uml: fix gcc problem"
This reverts commit 22eecde2f9034764a3fd095eecfa3adfb8ec9a98. Uli
reports that it breaks UML on x86-64 with the Fedora 8 gcc (gcc 4.1.2),
causing a crash on startup. See
http://marc.info/?l=linux-kernel&m=121011722806093&w=2
for a trace.
Reported-by: Ulrich Drepper <drepper at redhat.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit db176c6ed8974fae94328ad5ac9e70b094ff22fd
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Wed May 7 04:02:53 2008 +0900
Fix bogus warning in sysdev_driver_register()
if ((drv->entry.next != drv->entry.prev) ||
(drv->entry.next != NULL)) {
warns list_empty(&drv->entry).
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Cc: Greg KH <gregkh at suse.de>
Cc: Len Brown <lenb at kernel.org>
[ Version 2 totally redone based on suggestions from Linus & Greg ]
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6ce07c7b61e74af35a05060a2d6341f68fd92c9e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 13:13:37 2008 -0700
VFS: fix unused variable warning
Commit 33dcdac2df54e66c447ae03f58c95c7251aa5649 ("kill ->put_inode")
removed the final use of i_op->put_inode, but left the now totally
unused "op" variable in iput().
Get rid of it.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aeed5fce37196e09b4dac3a1c00d8b7122e040ce
Author: Hugh Dickins <hugh at veritas.com>
Date: Tue May 6 20:49:23 2008 +0100
x86: fix PAE pmd_bad bootup warning
Fix warning from pmd_bad() at bootup on a HIGHMEM64G HIGHPTE x86_32.
That came from 9fc34113f6880b215cbea4e7017fc818700384c2 x86: debug pmd_bad();
but we understand now that the typecasting was wrong for PAE in the previous
version: pagetable pages above 4GB looked bad and stopped Arjan from booting.
And revert that cded932b75ab0a5f9181ee3da34a0a488d1a14fd x86: fix pmd_bad
and pud_bad to support huge pages. It was the wrong way round: we shouldn't
weaken every pmd_bad and pud_bad check to let huge pages slip through - in
part they check that we _don't_ have a huge page where it's not expected.
Put the x86 pmd_bad() and pud_bad() definitions back to what they have long
been: they can be improved (x86_32 should use PTE_MASK, to stop PAE thinking
junk in the upper word is good; and x86_64 should follow x86_32's stricter
comparison, to stop thinking any subset of required bits is good); but that
should be a later patch.
Fix Hans' good observation that follow_page() will never find pmd_huge()
because that would have already failed the pmd_bad test: test pmd_huge in
between the pmd_none and pmd_bad tests. Tighten x86's pmd_huge() check?
No, once it's a hugepage entry, it can get quite far from a good pmd: for
example, PROT_NONE leaves it with only ACCESSED of the KERN_PGTABLE bits.
However... though follow_page() contains this and another test for huge
pages, so it's nice to keep it working on them, where does it actually get
called on a huge page? get_user_pages() checks is_vm_hugetlb_page(vma) to
to call alternative hugetlb processing, as does unmap_vmas() and others.
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Earlier-version-tested-by: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Jeff Chua <jeff.chua.linux at gmail.com>
Cc: Hans Rosenfeld <hans.rosenfeld at amd.com>
Cc: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bb78be8397d3b0900af3d717672218ee3ea07985
Merge: 31d9168d27fac127d449cb9fa252d880de872c7f 0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 11:39:57 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] fix SMP ordering hole in fcntl_setlk()
[PATCH] kill ->put_inode
[PATCH] fix reservation discarding in affs
commit 0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Tue May 6 13:58:34 2008 -0400
[PATCH] fix SMP ordering hole in fcntl_setlk()
fcntl_setlk()/close() race prevention has a subtle hole - we need to
make sure that if we *do* have an fcntl/close race on SMP box, the
access to descriptor table and inode->i_flock won't get reordered.
As it is, we get STORE inode->i_flock, LOAD descriptor table entry vs.
STORE descriptor table entry, LOAD inode->i_flock with not a single
lock in common on both sides. We do have BKL around the first STORE,
but check in locks_remove_posix() is outside of BKL and for a good
reason - we don't want BKL on common path of close(2).
Solution is to hold ->file_lock around fcheck() in there; that orders
us wrt removal from descriptor table that preceded locks_remove_posix()
on close path and we either come first (in which case eviction will be
handled by the close side) or we'll see the effect of close and do
eviction ourselves. Note that even though it's read-only access,
we do need ->file_lock here - rcu_read_lock() won't be enough to
order the things.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 33dcdac2df54e66c447ae03f58c95c7251aa5649
Author: Christoph Hellwig <hch at lst.de>
Date: Tue Apr 29 17:46:26 2008 +0200
[PATCH] kill ->put_inode
And with that last patch to affs killing the last put_inode instance we
can finally, after many years of transition kill this racy and awkward
interface.
(It's kinda funny that even the description in
Documentation/filesystems/vfs.txt was entirely wrong..)
Also remove a very misleading comment above the defintion of
struct super_operations.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit dca3c33652e437ed02c30ed3eca3cecd0cc00838
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Tue Apr 29 17:02:20 2008 +0200
[PATCH] fix reservation discarding in affs
- remove affs_put_inode, so preallocations aren't discared unnecessarily
often.
- remove affs_drop_inode, it's called with a spinlock held, so it can't
use a mutex.
- make i_opencnt atomic
- avoid direct b_count manipulations
- a few allocation failure fixes, so that these are more gracefully
handled now.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 31d9168d27fac127d449cb9fa252d880de872c7f
Merge: 4880d10927c93d858d40e297361fff375ee98492 05177f178efe1459d2d0ac05430027ba201889a4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 09:17:03 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (27 commits)
pata_atiixp: Don't disable
sata_inic162x: update intro comment, up the version and drop EXPERIMENTAL
sata_inic162x: add cardbus support
sata_inic162x: kill now unused SFF related stuff
sata_inic162x: use IDMA for ATAPI commands
sata_inic162x: use IDMA for non DMA ATA commands
sata_inic162x: kill now unused bmdma related stuff
sata_inic162x: use IDMA for ATA_PROT_DMA
sata_inic162x: update TF read handling
sata_inic162x: add / update constants
sata_inic162x: misc clean ups
sata_mv use hweight16() for bit counting (V2)
sata_mv NCQ-EH for FIS-based switching
sata_mv delayed eh handling
libata: export ata_eh_analyze_ncq_error
sata_mv new mv_port_intr function
sata_mv fix mv_host_intr bug for hc_irq_cause
sata_mv NCQ and SError fixes for mv_err_intr
sata_mv rearrange mv_config_fbs
sata_mv errata workaround for sata25 part 1
...
commit 05177f178efe1459d2d0ac05430027ba201889a4
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Fri May 2 15:13:39 2008 -0700
pata_atiixp: Don't disable
A couple of distributions (Fedora, Ubuntu) were having weird problems with the
ATI IXP series PATA controllers being reported as simplex. At the heart of
the problem is that both distros ignored the recommendations to load pata_acpi
and ata_generic *AFTER* specific host drivers.
The underlying cause however is that if you D3 and then D0 an ATI IXP it
helpfully throws away some configuration and won't let you rewrite it.
Add checks to ata_generic and pata_acpi to pin ATIIXP devices. Possibly the
real answer here is to quirk them and pin them, but right now we can't do that
before they've been pcim_enable()'d by a driver.
I'm indebted to David Gero for this. His bug report not only reported the
problem but identified the cause correctly and he had tested the right values
to prove what was going on
[If you backport this for 2.6.24 you will need to pull in the 2.6.25
removal of the bogus WARN_ON() in pcim_enagle]
Signed-off-by: Alan Cox <alan at redhat.com>
Tested-by: David Gero <davidg at havidave.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 22bfc6d5e19b72d50535ce32fd6dee2ce2e75775
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:17 2008 +0900
sata_inic162x: update intro comment, up the version and drop EXPERIMENTAL
sata_inic162x is now ready for production use. Bump the version,
explain what's working and what's not and drop EXPERIMENTAL.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ba66b242b1c3432b44d893c64124522b3bdce71e
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:16 2008 +0900
sata_inic162x: add cardbus support
When attached to cardbus, mmio region is at BAR 1. Other than that,
everything else is the same. Add support for it.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f8b0685a8ea8e3974f8953378ede2111f8d49d22
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:15 2008 +0900
sata_inic162x: kill now unused SFF related stuff
sata_inic162x now doesn't use any SFF features. Remove all SFF
related stuff.
* Mask unsolicited ATA interrupts. This removes our primary source of
spurious interrupts and spurious interrupt handling can be tightened
up. There's no need to clear ATA interrupts by reading status
register either.
* Don't dance with IDMA_CTL_ATA_NIEN and simplify accesses to
IDMA_CTL.
* Inherit from sata_port_ops instead of ata_sff_port_ops.
* Don't initialize or use ioaddr. There's no need to map BAR0-4
anymore.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b3f677e501a494aa1582d4ff35fb3ac6f0a59b08
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:14 2008 +0900
sata_inic162x: use IDMA for ATAPI commands
Use IDMA for ATAPI commands. Write and some misc commands time out
when executed using ATAPI_PROT_DMA but ATAPI_PROT_PIO works fine. As
PIO is driven by DMA too, it doesn't make any noticeable difference
for native SATA devices. inic_check_atapi_dma() is implemented to
force PIO for those ATAPI commands.
After this change, sata_inic162x issues all commands using IDMA.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 049e8e04986bde66df9648d88d0960ab4cbd6992
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:13 2008 +0900
sata_inic162x: use IDMA for non DMA ATA commands
Use IDMA for PIO and non-data commands. This allows sata_inic162x to
safely drive LBA48 devices. Kill inic_dev_config() which contains
code to reject LBA48 devices.
With this change, status checking in inic_qc_issue() to avoid hard
lock up after hotplug can go away too.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ab5b0235c4e819c9bc45fa62c99f9fe49e73e701
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:12 2008 +0900
sata_inic162x: kill now unused bmdma related stuff
sata_inic162x doesn't use BMDMA anymore. Kill bmdma related stuff.
* prdctl manipulation
* port IRQ mask manipulation
* inherit ATA_BASE_SHT instead of ATA_BMDMA_SHT
* BMDMA methods
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3ad400a92e9c7d2f7caa6c6f811dad9b7d3f333c
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:11 2008 +0900
sata_inic162x: use IDMA for ATA_PROT_DMA
The modified driver on initio site has enough clue on how to use IDMA.
Use IDMA for ATA_PROT_DMA.
* LBA48 now works as long as it uses DMA (LBA48 devices still aren't
allowed as it can destroy data if PIO is used for any reason).
* No need to mask IRQs for read DMAs as IDMA_DONE is properly raised
after transfer to memory is actually completed. There will be some
spurious interrupts but host_intr will handle it correctly and
manipulating port IRQ mask interacts badly with the other port for
some reason, so command type dependent port IRQ masking is not used
anymore.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 364fac0e56b9bd379330ef9e39d3761f0b491e2c
Author: Tejun Heo <htejun at gmail.com>
Date: Thu May 1 23:55:58 2008 +0900
sata_inic162x: update TF read handling
inic162x can't reliably read back TF or at least we don't know how to
do it yet. The only values which seem reliable are status and error.
This patch updates access to TF.
* implement inic_tf_read() which reads the TF area in mmio area
* implement custom inic_qc_fill_rtf() which only returns true if
status indicates device error. it'll be returning bogus addresses
for device errors but it'll be able to report why it failed at
least.
* implement custom inic_check_ready() and use ata_wait_after_reset()
instead of the SFF version.
* use inic_tf_read() for classification.
This is not perfect but it fixes hotplug detection failure and at
least makes the driver report 0's instead of random garbages while
reporting valid status and error for device errors.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b0dd9b8ef985291a8b40118c5f33b7935e273dcb
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:09 2008 +0900
sata_inic162x: add / update constants
* add a bunch of constants, most are from the datasheet, a few
undocumented ones are from initio's modified driver
* HCTL_PWRDWN is bit 12 not 13
This is in preparation of further inic162x updates.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 36f674d9a65264d3826ca7300bed441e22a624b2
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 30 16:35:08 2008 +0900
sata_inic162x: misc clean ups
* use larger indents for structure member definitions
* kill unused variable @addr in inic_scr_write()
* kill unnecessary flushes in inic_freeze/thaw()
* kill buggy explicit kfree() on devres managed port private data
This is in preparation of further inic162x updates.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c46938ccfe35a58a0873715ee4c26fc9eb8d87b3
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 14:02:28 2008 -0400
sata_mv use hweight16() for bit counting (V2)
Some tidying as suggested by Grant Grundler.
Nuke local bit-counting function from sata_mv in favour of using hweight16().
Also add a short explanation for the 15msec timeout used when waiting for empty/idle.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4c299ca3649ccf666819e7d4a27a68c39fa174f1
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:16:20 2008 -0400
sata_mv NCQ-EH for FIS-based switching
Convert sata_mv's EH for FIS-based switching (FBS) over to the
sequence recommended by Marvell. This enables us to catch/analyze
multiple failed links on a port-multiplier when using NCQ.
To do this, we clear the ERR_DEV bit in the EDMA Halt-Conditions register,
so that the EDMA engine doesn't self-disable on the first NCQ error.
Our EH code sets the MV_PP_FLAG_DELAYED_EH flag to prevent new commands
being queued while we await completion of all outstanding NCQ commands
on all links of the failed PM.
The SATA Test Control register tells us which links have failed,
so we must only wait for any other active links to finish up
before we stop the EDMA and run the .error_handler afterward.
The patch also includes skeleton code for handling of non-NCQ FBS operation.
This is more for documentation purposes right now, as that mode is not yet
enabled in sata_mv.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 29d187bb1e30682e228ce461c487d78d945c3e4f
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:15:37 2008 -0400
sata_mv delayed eh handling
Introduce a new "delayed error handling" mechanism in sata_mv,
to enable us to eventually deal with multiple simultaneous NCQ
failures on a single host link when a PM is present.
This involves a port flag (MV_PP_FLAG_DELAYED_EH) to prevent new
commands being queued, and a pmp bitmap to indicate which pmp links
had NCQ errors.
The new mv_pmp_error_handler() uses those values to invoke
ata_eh_analyze_ncq_error() on each failed link, prior to freezing
the port and passing control to sata_pmp_error_handler().
This is based upon a strategy suggested by Tejun.
For now, we just implement the delayed mechanism.
The next patch in this series will add the multiple-NCQ EH code
to take advantage of it.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 10acf3b0d3b46c6ef5d6f0722f72ad9b743ea848
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:14:53 2008 -0400
libata: export ata_eh_analyze_ncq_error
Export ata_eh_analyze_ncq_error() for subsequent use by sata_mv,
as suggested by Tejun.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a90103298fd5ccd9a9df6d47bde9a3f371707037
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:14:02 2008 -0400
sata_mv new mv_port_intr function
Separate out the inner loop body of mv_host_intr()
into it's own function called mv_port_intr().
This should help maintainabilty.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit eabd5eb1cb59bfb162e7aa23007248f2bb480816
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:13:27 2008 -0400
sata_mv fix mv_host_intr bug for hc_irq_cause
Remove the unwanted reads of hc_irq_cause from mv_host_intr(),
thereby removing a bug whereby we were not always reading it when needed..
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 37b9046a3e433a0b0c39ad1e81ec187d5be800ba
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:12:34 2008 -0400
sata_mv NCQ and SError fixes for mv_err_intr
Sigh. Undo some earlier changes to mv_port_intr(),
so that we now read/clear SError again in all cases.
Arrange the top of the function to be as close as possible
to what we need for a later update (in this series) for ERR_DEV handling.
Fix things so that libata-eh can attempt a READ_LOG_EXT_10H
in response to a failed NCQ command, by just doing a local
mv_eh_freeze() rather than ata_port_freeze().
This will now fully handle NCQ errors much of the time,
but more fixes are needed for FBS/PMP, and for certain chip errata.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 00f42eabb204c68fa64ef72de834e74aca15c81f
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:11:45 2008 -0400
sata_mv rearrange mv_config_fbs
Rearrange mv_config_fbs() to more closely follow the (corrected) datasheet
recommendations for NCQ and FIS-based switching (FBS).
Also, maintain a port flag to let us know when FBS is enabled.
We will make more use of that flag later in this patch series.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit dd2890f60f8e15f14c8eb132779b2f15c49d1203
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:10:56 2008 -0400
sata_mv errata workaround for sata25 part 1
Part 1 of workaround for errata "sata#25" for the 60x1 series
(the second half of this errata workaround is still in development.
Bit22 of the GPIO port has to be set "on" when in NCQ mode.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3e4a139107e497a741c26f8a377a10f214d63ec1
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:10:02 2008 -0400
sata_mv new mv_qc_defer method
The EDMA engine cannot tolerate a mix of NCQ/non-NCQ commands,
and cannot be used for PIO at all. So we need to prevent libata
from trying to feed us such mixtures.
Introduce mv_qc_defer() for this purpose, and use it for all chip versions.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9b2c4e0bae854fb5e88c9cacc0dacf21631c5cb0
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:09:14 2008 -0400
sata_mv wait for empty+idle
When performing EH, it is recommended to wait for the EDMA engine
to empty out requests-in-progress before disabling EDMA.
Introduce code to poll the EDMA_STATUS register for idle/empty bits
before disabling EDMA. For non-EH operation, this will normally exit
without delay, other than the register read.
A later series of patches may focus on eliminating this and various
other register reads (when possible) throughout the driver,
but for now we're focussing on solid reliablity.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 616d4a98ad8749ebe17a8fcac67df65c321350ac
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:08:32 2008 -0400
sata_mv pci features
Some of the GenIIe EDMA optimizations should not be used
for non-PCI (SOC) devices, and nor for certain configurations
of conventional PCI (non PCI-X, PCIe) buses.
Logic taken/simplified from that in the Marvell proprietary driver.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8e7decdb8b132ee970a2636931b7653dec6af472
Author: Mark Lord <liml at rtr.ca>
Date: Fri May 2 02:07:51 2008 -0400
sata_mv more cosmetic changes
More cosmetic changes; no code changes.
-- try and improve consistency of naming.
-- add missing _OFS to tails of register offset definitions.
-- rename mv_setup_ifctl() to mv_setup_ifcfg(), since that's what it really does.
-- remove/move some dead comments
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 07ab85de4d960b6f39395e51c1853485ad120de5
Author: Alek Du <alek.du at intel.com>
Date: Tue May 6 21:31:41 2008 +0800
libata: Add Intel SCH PATA driver
This patch adds Intel SCH chipsets (AF82US15W, AF82US15L, AF82UL11L)
PATA controller support.
Signed-off-by: Alek Du <alek.du at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit cb6716c879ecf49e2af344926c6a476821812061
Author: Tejun Heo <htejun at gmail.com>
Date: Thu May 1 10:03:08 2008 +0900
ata_piix: verify SIDPR access before enabling it
On certain configurations (certain macbooks), even though all the
conditions for SIDPR access described in the datasheet are met,
actually reading those registers just returns 0 and have no effect on
write. Verify SIDPR is actually working before enabling it.
This is reported by Ryan Roth in bz#10512.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Ryan Roth <ryan.roth at ch2m.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 78ab88f04f44bed566d51dce0c7cbfeff6449a06
Author: Tejun Heo <htejun at gmail.com>
Date: Thu May 1 23:41:41 2008 +0900
libata: improve post-reset device ready test
Some controllers (jmb and inic162x) use 0x77 and 0x7f to indicate that
the device isn't ready yet. It looks like they use 0xff if device
presence is detected but connection isn't established. 0x77 or 0x7f
after connection is established and use the value from signature FIS
after receiving it.
This patch implements ata_check_ready(), which takes TF status value
and determines whether the port is ready or not considering the above
and other conditions, and use it in @check_ready() functions. This is
safe as both 0x77 and 0x7f aren't valid ready status value even though
they have BSY bit cleared.
This fixes hot plug detection failures which can be triggered with
certain drives if they aren't already spun up when the data connector
is hot plugged.
Tested on sil, sil24, ahci (jmb/ich), piix and inic162x combined with
eight drives from all major vendors.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4880d10927c93d858d40e297361fff375ee98492
Merge: a15306365a16380f3bafee9e181ba01231d4acd7 9d1045ad68fcccfaf1393cc463ab6357693e8d1d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 6 07:49:20 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net_cls_act: act_simple dont ignore realloc code
iwlwifi: make IWLWIFI a tristate
Revert "atm: Do not free already unregistered net device."
dccp: return -EINVAL on invalid feature length
irda: fix !PNP support for drivers/net/irda/smsc-ircc2.c
irda: fix !PNP support in drivers/net/irda/nsc-ircc.c
net_cls_act: Make act_simple use of netlink policy.
ip: Use inline function dst_metric() instead of direct access to dst->metric[]
ip: Make use of the inline function dst_metric_locked()
atm: Bad locking on br2684_devs modifications.
atm: Do not free already unregistered net device.
mac80211: Do not free net device after it is unregistered.
bridge: Consolidate error paths in br_add_bridge().
bridge: Net device leak in br_add_bridge().
niu: Fix probing regression for maramba on-board chips.
lapbeth: Release ->ethdev when unregistering device.
xfrm: convert empty xfrm_audit_* macros to functions
net: Fix useless comment reference loop.
sch_htb: remove from event queue in htb_parent_to_leaf()
commit 9d1045ad68fcccfaf1393cc463ab6357693e8d1d
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date: Tue May 6 00:10:24 2008 -0700
net_cls_act: act_simple dont ignore realloc code
reallocation of the policy data was being ignored. It could fail.
Simplify so that there is no need for reallocating.
Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1da5ea1a8bf4ddb82831528223c853821cb1c9ab
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue May 6 00:04:47 2008 -0700
iwlwifi: make IWLWIFI a tristate
IWLWIFI should be a tristate so that if IWLCORE and/or IWL3945 are m
and none of them is y kbuild doesn't create an empty
drivers/net/wireless/built-in.o
This patch also removes the pointless "default n".
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5f6b1ea41b46bc63f667f9b30d939b49734c20b0
Author: David S. Miller <davem at davemloft.net>
Date: Tue May 6 00:00:16 2008 -0700
Revert "atm: Do not free already unregistered net device."
This reverts commit 65e4113684e50cee75357ce10dc9026b0929e4e9.
Unlike the other cases Pavel fixed, this case did not
setup a netdev->destructor of free_netdev, therefore this
change was not correct.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a15306365a16380f3bafee9e181ba01231d4acd7
Merge: bb896afe2089575ca1bb1fbf3f07b934e1ba999b c5057ddccbcb4bf363af628d7963a7475f4114a7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 17:31:41 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
mlx4_core: Support creation of FMRs with pages smaller than 4K
IB/ehca: Fix function return types
RDMA/cxgb3: Bump up the MPA connection setup timeout.
RDMA/cxgb3: Silently ignore close reply after abort.
RDMA/cxgb3: QP flush fixes
IB/ipoib: Fix transmit queue stalling forever
IB/mlx4: Fix off-by-one errors in calls to mlx4_ib_free_cq_buf()
commit bb896afe2089575ca1bb1fbf3f07b934e1ba999b
Merge: 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c aac6abca858386438d9a7233c3471d2ecfa2f704
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 17:31:14 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
sched: default to n for GROUP_SCHED and FAIR_GROUP_SCHED
sched: add optional support for CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
sched, x86: add HAVE_UNSTABLE_SCHED_CLOCK
sched: fix cpu clock
sched: fair-group: fix a Div0 error of the fair group scheduler
sched: fix missing locking in sched_domains code
sched: make clock sync tunable by architecture code
sched: fix debugging
sched: fix sched_info_switch not being called according to documentation
sched: fix hrtick_start_fair and CPU-Hotplug
sched: fix SCHED_FAIR wake-idle logic error
sched: fix RT task-wakeup logic
sched: add statics, don't return void expressions
sched: add debug checks to idle functions
sched: remove old sched doc
sched: make rt_sched_class, idle_sched_class static
sched: optimize calc_delta_mine()
sched: fix normalized sleeper
commit c5057ddccbcb4bf363af628d7963a7475f4114a7
Author: Oren Duer <oren at mellanox.co.il>
Date: Mon May 5 15:56:52 2008 -0700
mlx4_core: Support creation of FMRs with pages smaller than 4K
Don't hard code a test against a minimum page shift of 12, since the
device may support smaller pages. Test against the actual smallest
page size from the device capabilities.
Signed-off-by: Oren Duer <oren at mellanox.co.il>
Signed-off-by: Jack Morgenstein <jackm at dev.mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit cf04690885972eaba830ee761de545a6956197e6
Author: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Mon May 5 15:51:49 2008 -0700
IB/ehca: Fix function return types
Also remove duplicate assignment of local_ca_ack_delay and change
min_t check for local_ca_ack_delay to u8 instead of int.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c
Merge: 17aa7e034416e3080bc57a786d09ba0a4a044561 9185ef6787f1c8f1c06aa0cb3c7746fb4f101f50
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 15:48:53 2008 -0700
Merge branch 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Assign PDE->data before gluing PDE into /proc tree
[POWERPC] devres: Add devm_ioremap_prot()
[POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex
[POWERPC] macintosh: windfarm_smu_sat: semaphore to mutex
[POWERPC] macintosh: therm_pm72: driver_lock semaphore to mutex
commit 17aa7e034416e3080bc57a786d09ba0a4a044561
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Mon May 5 13:54:19 2008 +1000
dev_name introduction fall out fix
Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 ("driver-core: add
dev_name() to help transition away from using bus_id") added a static
inline dev_name() and used it in dev_printk.
Unfortunately, drivers/edac/edac_core.h defines a macro called
dev_name(). Rename the latter.
Diagnosis by Tony Breeds and Michael Ellerman.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Acked-by: Doug Thompson <dougthompson at xmission.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aac6abca858386438d9a7233c3471d2ecfa2f704
Author: Parag Warudkar <parag.warudkar at gmail.com>
Date: Sat May 3 20:42:34 2008 -0400
sched: default to n for GROUP_SCHED and FAIR_GROUP_SCHED
GROUP_SCHED is confirmed to cause unacceptable latencies, see:
http://lkml.org/lkml/2008/5/2/370.
Mark it EXPERIMENTAL and default to no for now.
Signed-off-by: Parag Warudkar <parag.warudkar at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 3e51f33fcc7f55e6df25d15b55ed10c8b4da84cd
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat May 3 18:29:28 2008 +0200
sched: add optional support for CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
this replaces the rq->clock stuff (and possibly cpu_clock()).
- architectures that have an 'imperfect' hardware clock can set
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
- the 'jiffie' window might be superfulous when we update tick_gtod
before the __update_sched_clock() call in sched_clock_tick()
- cpu_clock() might be implemented as:
sched_clock_cpu(smp_processor_id())
if the accuracy proves good enough - how far can TSC drift in a
single jiffie when considering the filtering and idle hooks?
[ mingo at elte.hu: various fixes and cleanups ]
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit a5574cf65b5f03ce9ade3918764fe22e5e2371e3
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon May 5 23:19:50 2008 +0200
sched, x86: add HAVE_UNSTABLE_SCHED_CLOCK
add the HAVE_UNSTABLE_SCHED_CLOCK, for architectures to select.
the next change utilizes it.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit dfbf4a1bc319f0f9a31e39b2da1fa5c55e85af89
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 23 09:24:06 2008 +0200
sched: fix cpu clock
David Miller pointed it out that nothing in cpu_clock() sets
prev_cpu_time. This caused __sync_cpu_clock() to be called
all the time - against the intention of this code.
The result was that in practice we hit a global spinlock every
time cpu_clock() is called - which - even though cpu_clock()
is used for tracing and debugging, is suboptimal.
While at it, also:
- move the irq disabling to the outest layer,
this should make cpu_clock() warp-free when called with irqs
enabled.
- use long long instead of cycles_t - for platforms where cycles_t
is 32-bit.
Reported-by: David Miller <davem at davemloft.net>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit cb4ad1ffc7c0d8ea7dc8cd8ba303d83551716d46
Author: Miao Xie <miaox at cn.fujitsu.com>
Date: Mon Apr 28 12:54:56 2008 +0800
sched: fair-group: fix a Div0 error of the fair group scheduler
When I echoed 0 into the "cpu.shares" file, a Div0 error occured.
We found it is caused by the following calling.
sched_group_set_shares(tg, shares)
set_se_shares(tg->se[i], shares/nr_cpu_ids)
__set_se_shares(se, shares)
div64_64((1ULL<<32), shares)
When the echoed value was less than the number of processores, the result of the
sentence "shares/nr_cpu_ids" was 0, and then the system called div64() to divide
the result, the Div0 error occured.
It is unnecessary that the shares value is divided by nr_cpu_ids, I think.
Because in the function __update_group_shares_cpu() and init_tg_cfs_entry(),
the shares value isn't divided by nr_cpu_ids when setting shares of the sched
entity.
This patch fixes this bug. And echoing ULONG_MAX value into cpu.shares also
causes Div0 error, so we set a macro MAX_SHARES to limit the max value of
shares.
Signed-off-by: Miao Xie <miaox at cn.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 712555ee4f873515612f89554ad1a3fda5fa887e
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Mon Apr 28 11:33:07 2008 +0200
sched: fix missing locking in sched_domains code
Concurrent calls to detach_destroy_domains and arch_init_sched_domains
were prevented by the old scheduler subsystem cpu hotplug mutex. When
this got converted to get_online_cpus() the locking got broken.
Unlike before now several processes can concurrently enter the critical
sections that were protected by the old lock.
So use the already present doms_cur_mutex to protect these sections again.
Cc: Gautham R Shenoy <ego at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 690229a0912ca2fef8b542fe4d8b73acfcdc6e24
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 23 09:31:35 2008 +0200
sched: make clock sync tunable by architecture code
make time_sync_thresh tunable to architecture code.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d7dcdc11cfa6a8860a29b09f985467b89224699d
Author: Mike Galbraith <efault at gmx.de>
Date: Tue Apr 29 12:23:09 2008 +0200
sched: fix debugging
Revert debugging commit 7ba2e74ab5a0518bc953042952dd165724bc70c9.
print_cfs_rq_tasks() can induce live-lock if a task is dequeued
during list traversal.
Signed-off-by: Mike Galbraith <efault at gmx.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 673a90a1e05c8127886f7659d1a457169378371f
Author: David Simner <djs203 at srcf.ucam.org>
Date: Tue Apr 29 10:08:59 2008 +0100
sched: fix sched_info_switch not being called according to documentation
http://bugzilla.kernel.org/show_bug.cgi?id=10545
sched_stats.h says that __sched_info_switch is "called when prev !=
next" in the comment. sched.c should therefore do that.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b328ca182f01c2a04b85e0ee8a410720b104fbcc
Author: Peter Zijlstra <peterz at infradead.org>
Date: Tue Apr 29 10:02:46 2008 +0200
sched: fix hrtick_start_fair and CPU-Hotplug
Gautham R Shenoy reported:
> While running the usual CPU-Hotplug stress tests on linux-2.6.25,
> I noticed the following in the console logs.
>
> This is a wee bit difficult to reproduce. In the past 10 runs I hit this
> only once.
>
> ------------[ cut here ]------------
>
> WARNING: at kernel/sched.c:962 hrtick+0x2e/0x65()
>
> Just wondering if we are doing a good job at handling the cancellation
> of any per-cpu scheduler timers during CPU-Hotplug.
This looks like its indeed not cancelled at all and migrates the it to
another cpu. Fix it via a proper hotplug notifier mechanism.
Reported-by: Gautham R Shenoy <ego at in.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: stable at kernel.org
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 104f64549c961a797ff5f7c59946a7caa335c5b0
Author: Gregory Haskins <ghaskins at novell.com>
Date: Mon Apr 28 12:40:01 2008 -0400
sched: fix SCHED_FAIR wake-idle logic error
We currently use an optimization to skip the overhead of wake-idle
processing if more than one task is assigned to a run-queue. The
assumption is that the system must already be load-balanced or we
wouldnt be overloaded to begin with.
The problem is that we are looking at rq->nr_running, which may include
RT tasks in addition to CFS tasks. Since the presence of RT tasks
really has no bearing on the balance status of CFS tasks, this throws
the calculation off.
This patch changes the logic to only consider the number of CFS tasks
when making the decision to optimze the wake-idle.
Signed-off-by: Gregory Haskins <ghaskins at novell.com>
CC: Peter Zijlstra <peterz at infradead.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8ae121ac8666b0421aa20fd80d4597ec66fa54bc
Author: Gregory Haskins <ghaskins at novell.com>
Date: Wed Apr 23 07:13:29 2008 -0400
sched: fix RT task-wakeup logic
Dmitry Adamushko pointed out a logic error in task_wake_up_rt() where we
will always evaluate to "true". You can find the thread here:
http://lkml.org/lkml/2008/4/22/296
In reality, we only want to try to push tasks away when a wake up request is
not going to preempt the current task. So lets fix it.
Note: We introduce test_tsk_need_resched() instead of open-coding the flag
check so that the merge-conflict with -rt should help remind us that we
may need to support NEEDS_RESCHED_DELAYED in the future, too.
Signed-off-by: Gregory Haskins <ghaskins at novell.com>
CC: Dmitry Adamushko <dmitry.adamushko at gmail.com>
CC: Steven Rostedt <rostedt at goodmis.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 983ed7a66bcec9dc307d89dc7af47cdf209e56af
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Apr 24 18:17:55 2008 -0700
sched: add statics, don't return void expressions
Noticed by sparse:
kernel/sched.c:760:20: warning: symbol 'sched_feat_names' was not declared. Should it be static?
kernel/sched.c:767:5: warning: symbol 'sched_feat_open' was not declared. Should it be static?
kernel/sched_fair.c:845:3: warning: returning void-valued expression
kernel/sched.c:4386:3: warning: returning void-valued expression
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d478c2cfaa2476f8b6876f9eb4d8fddcfa986479
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Sat Apr 26 11:30:34 2008 -0700
sched: add debug checks to idle functions
Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Cc: "Justin Mattock" <justinmattock at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 733a0771df46af942b8355cd8bb15780106b4353
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Apr 28 14:05:18 2008 +0200
sched: remove old sched doc
Fabio Checconi noticed that Documentation/scheduler/sched-design.txt was
a stale copy of the old scheduler. Remove it.
Reported-by: Fabio Checconi <fabio at gandalf.sssup.it>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 2abdad0a4cd8f9413f778cc998e0ee7d60b28417
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 25 10:53:13 2008 -0700
sched: make rt_sched_class, idle_sched_class static
The C files are included directly in sched.c, so they are
effectively static.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e05510d01ad1565e5e086a939261084d67ba2b10
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon May 5 23:56:17 2008 +0200
sched: optimize calc_delta_mine()
Joel noticed that the !lw->inv_weight contition isn't unlikely anymore so
remove the unlikely annotation. Also, remove the two div64_u64() inv_weight
calculations, which makes them rely on the calc_delta_mine() path as well.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
CC: Joel Schopp <jschopp at austin.ibm.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit a992241de614dd2b7c97a9ba64e28c0e563f19bf
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon May 5 23:56:17 2008 +0200
sched: fix normalized sleeper
Normalized sleeper uses calc_delta*() which requires that the rq load is
already updated, so move account_entity_enqueue() before place_entity()
Tested-by: Frans Pop <elendil at planet.nl>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 19443178fbfbf40db15c86012fc37df1a44ab857
Author: Chris Wright <chrisw at sous-sol.org>
Date: Mon May 5 13:50:24 2008 -0700
dccp: return -EINVAL on invalid feature length
dccp_feat_change() validates length and on error is returning 1.
This happens to work since call chain is checking for 0 == success,
but this is returned to userspace, so make it a real error value.
Signed-off-by: Chris Wright <chrisw at sous-sol.org>
Acked-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 108c1961847df2a875047c0fd27b419cb817d213
Merge: 48fc8de9cd093b8c9e2cfa339421862bae3a6cad 0df18ff366853cdf31e5238764ec5c63e6b5a398
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 12:39:10 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86 PCI: call dmi_check_pciprobe()
x86/pci: add pci=skip_isa_align command lines.
x86/pci: remove flag in pci_cfg_space_size_ext
x86: fix section mismatch in pci_scan_bus
commit 48fc8de9cd093b8c9e2cfa339421862bae3a6cad
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Mon May 5 21:27:21 2008 +0200
CONFIG_SCSI_MAC_ESP needs CONFIG_SCSI_SPI_ATTRS
The new mac_esp scsi driver needs CONFIG_SCSI_SPI_ATTRS, just like all other
drivers using the new esp_scsi core.
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b6d9d267f0d68104df910fca89149803aec82426
Author: Finn Thain <fthain at telegraphics.com.au>
Date: Mon May 5 21:26:15 2008 +0200
m68k: remove old mac_esp cruft
Remove the rest of the old mac_esp driver. Also ditch the rest of the
machw mechanism, it needs to be replaced by a fake openfirmware tree.
Signed-off-by: Finn Thain <fthain at telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3b17f136bf32984eb0faeb116bcd44ffe3503782
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Mon May 5 21:25:48 2008 +0200
m68k: Handle 68040 bus faults
Fix 68040 bus fault handling, so the standard kernel exception handling
can be used for i/o probing.
Contrary to normal access faults there is nothing to fix, but at least
we have to disable writebacks to avoid recursive faults.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4933d07531711e399d8d578036aa9fc1be2f9b20
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Mon May 5 21:16:13 2008 +0200
m68k: drivers/input/serio/hp_sdc.c needs <linux/semaphore.h>
drivers/input/serio/hp_sdc.c: In function 'hp_sdc_take':
drivers/input/serio/hp_sdc.c:198: error: implicit declaration of function 'up'
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 63a59fa7a74fccff64dbf7d9230bd9d91bddead4
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Mon May 5 21:15:48 2008 +0200
m68k: serial167 missing return value in cy_put_char()
commit a5b08c66194fba02a865b397579b7204688bcb1e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:05 2008 -0700
serial167: switch to int put_char method
missed one case when adding return values.
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ab1a852128d6f0677999eecbf6d04bf9f6fe9a9a
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Mon May 5 21:15:19 2008 +0200
m68k: Fix falconide `data_adr' typo
commit 9567b349f7e7dd7e2483db99ee8e4a6fe0caca38
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:36 2008 +0200
ide: merge ->atapi_*put_bytes and ->ata_*put_data methods
introduced a typo (`data_adr' instead of `data_addr'), leading to a compile
failure.
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5717922a1b8cc477f45a0f4f11fe619392ba7133
Merge: 50f7ad2500b27ce5c42be3a6936f143b158f7bc3 e024cbd257efc2788b7d21b9353e966267485c87
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 10:17:30 2008 -0700
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
kgdb: kconfig fix xconfig/menuconfig element
kgdb: fix signedness mixmatches, add statics, add declaration to header
kgdb: 1000 loops for the single step test in kgdbts
kgdb: trivial sparse fixes in kgdb test-suite
kgdb: minor documentation fixes
commit 50f7ad2500b27ce5c42be3a6936f143b158f7bc3
Merge: 82af7aca56c67061420d618cc5a30f0fd4106b80 2c36eecfb6471c457994647771d1405502ad5fde
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 5 10:16:42 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc - fix S3C2410 i2s programming error
[ALSA] soc - fix s3c2410 PCM breakage
[ALSA] ac97 - Add a workaround for broken quirk for VT1617A codec
[ALSA] Revert migration to alc_set_pin_output() in alc861_auto_set_output_and_unmute()
[ALSA] fm801 - Fix kconfig dependency mess of fm801-tea575x
[ALSA] hda - Support IDT 92HD206 codec
[ALSA] pcsp: Fix build with CONFIG_PM=n
commit 0df18ff366853cdf31e5238764ec5c63e6b5a398
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Mon Apr 14 15:40:37 2008 -0700
x86 PCI: call dmi_check_pciprobe()
this change:
| commit 08f1c192c3c32797068bfe97738babb3295bbf42
| Author: Muli Ben-Yehuda <muli at il.ibm.com>
| Date: Sun Jul 22 00:23:39 2007 +0300
|
| x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata
|
| This patch introduces struct pci_sysdata to x86 and x86-64, and
| converts the existing two users (NUMA, Calgary) to use it.
|
| This lays the groundwork for having other users of sysdata, such as
| the PCI domains work.
|
| The Calgary bits are tested, the NUMA bits just look ok.
replaces pcibios_scan_root with pci_scan_bus_parented...
but in pcibios_scan_root we have a DMI check:
dmi_check_system(pciprobe_dmi_table);
when when have several peer root buses this could be called multiple
times (which is bad), so move that call to pci_access_init().
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 13a6ddb08e58a1bd344da7898c4e2f13bdf18c2f
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Thu Mar 27 01:31:18 2008 -0700
x86/pci: add pci=skip_isa_align command lines.
so we don't align the io port start address for pci cards.
also move out dmi check out acpi.c, because it has nothing to do with acpi.
it could spare some calling when we have several peer root buses.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 82af7aca56c67061420d618cc5a30f0fd4106b80
Author: Eric Sesterhenn <snakebyte at gmx.de>
Date: Fri Jan 25 10:40:46 2008 +0100
Removal of FUTEX_FD
Since FUTEX_FD was scheduled for removal in June 2007 lets remove it.
Google Code search found no users for it and NGPT was abandoned in 2003
according to IBM. futex.h is left untouched to make sure the id does
not get reassigned. Since queue_me() has no users left it is commented
out to avoid a warning, i didnt remove it completely since it is part of
the internal api (matching unqueue_me())
Signed-off-by: Eric Sesterhenn <snakebyte at gmx.de>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> (removed rest)
Acked-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e024cbd257efc2788b7d21b9353e966267485c87
Author: Jan Engelhardt <jengelh at computergmbh.de>
Date: Fri Apr 25 18:35:29 2008 +0200
kgdb: kconfig fix xconfig/menuconfig element
Kconfig.kgdb: fix menuconfig element
Signed-off-by: Jan Engelhardt <jengelh at computergmbh.de>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 688b744d8bc84dc5cc646e97509113dc5e8818ed
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Apr 24 16:57:23 2008 -0500
kgdb: fix signedness mixmatches, add statics, add declaration to header
Noticed by sparse:
arch/x86/kernel/kgdb.c:556:15: warning: symbol 'kgdb_arch_pc' was not declared. Should it be static?
kernel/kgdb.c:149:8: warning: symbol 'kgdb_do_roundup' was not declared. Should it be static?
kernel/kgdb.c:193:22: warning: symbol 'kgdb_arch_pc' was not declared. Should it be static?
kernel/kgdb.c:712:5: warning: symbol 'remove_all_break' was not declared. Should it be static?
Related to kgdb_hex2long:
arch/x86/kernel/kgdb.c:371:28: warning: incorrect type in argument 2 (different signedness)
arch/x86/kernel/kgdb.c:371:28: expected long *long_val
arch/x86/kernel/kgdb.c:371:28: got unsigned long *<noident>
kernel/kgdb.c:469:27: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:469:27: expected long *long_val
kernel/kgdb.c:469:27: got unsigned long *<noident>
kernel/kgdb.c:470:27: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:470:27: expected long *long_val
kernel/kgdb.c:470:27: got unsigned long *<noident>
kernel/kgdb.c:894:27: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:894:27: expected long *long_val
kernel/kgdb.c:894:27: got unsigned long *<noident>
kernel/kgdb.c:895:27: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:895:27: expected long *long_val
kernel/kgdb.c:895:27: got unsigned long *<noident>
kernel/kgdb.c:1127:28: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:1127:28: expected long *long_val
kernel/kgdb.c:1127:28: got unsigned long *<noident>
kernel/kgdb.c:1132:25: warning: incorrect type in argument 2 (different signedness)
kernel/kgdb.c:1132:25: expected long *long_val
kernel/kgdb.c:1132:25: got unsigned long *<noident>
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 7cfcd985d36031459cc64e3843ea36a4d801097d
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Thu Apr 24 16:57:23 2008 -0500
kgdb: 1000 loops for the single step test in kgdbts
The single step test is not terribly costly and it should be able to
pass at 1000 loops successfully in under 1 second. A non-kgdb timing
regression was found using this test, but it did not occur frequently
because by default the test was only executed a single time.
This patch changes the default for the single step test to 1000
iterations and allows for individual configuration of the single step
test to further exercise the kgdb subsystem when needed.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 001fddf5fdcfe2c08ac9c4e5ca80c5e5698363bb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Apr 24 16:57:23 2008 -0500
kgdb: trivial sparse fixes in kgdb test-suite
Shadowed variable and integer as NULL pointer fixes:
drivers/misc/kgdbts.c:877:6: warning: symbol 'sys_open_test' shadows an earlier one
drivers/misc/kgdbts.c:537:27: originally declared here
drivers/misc/kgdbts.c:378:22: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:386:22: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:468:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:472:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:502:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:506:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:509:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:523:20: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:527:20: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:530:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:541:21: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:545:21: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:548:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:559:30: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:563:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:573:16: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:574:19: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:578:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:588:16: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:589:19: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:593:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:602:16: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:604:15: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:925:3: warning: Using plain integer as NULL pointer
drivers/misc/kgdbts.c:938:3: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit f92509371ec06227a7e29778f395776d31b0deab
Author: grzegorz.chwesewicz at chilan.com <grzegorz.chwesewicz at chilan.com>
Date: Thu Apr 24 16:57:22 2008 -0500
kgdb: minor documentation fixes
Two minor fixes to the kgdb documentation.
Signed-off-by: Grzegorz Chwesewicz, Chilan <grzegorz.chwesewicz at chilan.com>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 2c36eecfb6471c457994647771d1405502ad5fde
Author: Davide Rizzo <davide at elpa.it>
Date: Mon May 5 14:59:39 2008 +0200
[ALSA] soc - fix S3C2410 i2s programming error
S3C2410 i2s driver currently manages only i2s protocol (and not left
justified one) and slave mode.
With this small patch, other modes are possible.
Signed-off-by: Davide Rizzo <davide at elpa.it>
Acked-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d6426171bab3403cdcd5613d5549f20b0ab0967c
Author: Davide Rizzo <davide at elpa.it>
Date: Mon May 5 14:56:07 2008 +0200
[ALSA] soc - fix s3c2410 PCM breakage
S3C2410 pcm doesn't work.
s3c2410_dma_request() now returns the channel number and not 0 if OK.
Signed-off-by: Davide Rizzo <davide at elpa.it>
Acked-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 2e75d050e42d1c61e820f9a35078a2f69e02cc3e
Author: Takashi Iwai <tiwai at suse.de>
Date: Sat May 3 18:46:56 2008 +0200
[ALSA] ac97 - Add a workaround for broken quirk for VT1617A codec
On boards with VT1617A codec, the sound disappears suddenly.
This looks like a problem with HPE-bit control that is supposed to be
set in patch_vt1617a(). However, on such problematic hardwares, the
bit is actually reset mysteriously.
The patch adds a workaround for the wrong quirk.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 564c5bead424fa798dfbd5fe382b4e0b7ea483fb
Author: Jacek Luczak <luczak.jacek at gmail.com>
Date: Sat May 3 18:41:23 2008 +0200
[ALSA] Revert migration to alc_set_pin_output() in alc861_auto_set_output_and_unmute()
Change done by:
commit f6c7e5461e9046445d50c5c7a9a4587824239623
[ALSA] hda-codec - Fix auto-configuration of Realtek codecs
broke sound on ALC861 Analog.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 20686c24377246d9eb57782551b25ff19df09873
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri May 2 12:31:51 2008 +0200
[ALSA] fm801 - Fix kconfig dependency mess of fm801-tea575x
FM801-tea575x tuner has a reverse selection to V4L1 and this causes
nasty dependency problems.
The patch simplifies the dependency with a normal
"depends on VIDEO_V4L1". This decreases the usability but fixes bugs,
yeah. If any better feature like "requires" is introduced to kbuild
in future, we'll be able to switch it...
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7bd3c0f73c9c5b47fd1ca49757c436e73f4cd55b
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri May 2 12:28:02 2008 +0200
[ALSA] hda - Support IDT 92HD206 codec
Added the support for IDT 92HD206 codec chip.
It's compatible with STAC927x.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 983e0972cea450fe5725d1ba11c78adfd5d7ad3a
Author: Johann Felix Soden <johfel at users.sourceforge.net>
Date: Fri May 2 09:54:31 2008 +0200
[ALSA] pcsp: Fix build with CONFIG_PM=n
sound/drivers/pcsp/pcsp.c: In function 'pcsp_suspend':
sound/drivers/pcsp/pcsp.c:201: error: implicit declaration of function 'snd_pcm_suspend_all'
Signed-off-by: Johann Felix Soden <johfel at users.sourceforge.net>
CC: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7a1aa309f21ea2f6c31f364341e4027ecf4e79bc
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon May 5 01:06:54 2008 -0700
irda: fix !PNP support for drivers/net/irda/smsc-ircc2.c
x86.git testing found this build bug on v2.6.26-rc1:
ERROR: "pnp_get_resource" [drivers/net/irda/smsc-ircc2.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
the driver did not anticipate the case of !CONFIG_PNP which is rare but
still possible. Instead of restricting the driver to PNP-only in the
Kconfig space, add the (trivial) dummy struct pnp_driver - this is that
other drivers use in the !PNP case too.
The driver itself can in theory be initialized on !PNP too in certain
cases, via smsc_ircc_legacy_probe().
Patch only minimally build tested, i dont have this hardware.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c17f888f8fc2e47e2b4a51424f8ccf564ae87576
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon May 5 01:04:06 2008 -0700
irda: fix !PNP support in drivers/net/irda/nsc-ircc.c
x86.git testing found the following build failure in latest -git:
drivers/built-in.o: In function `nsc_ircc_pnp_probe':
nsc-ircc.c:(.text+0xdf1b6): undefined reference to `pnp_get_resource'
nsc-ircc.c:(.text+0xdf1d4): undefined reference to `pnp_get_resource'
nsc-ircc.c:(.text+0xdf1ee): undefined reference to `pnp_get_resource'
nsc-ircc.c:(.text+0xdf237): undefined reference to `pnp_get_resource'
nsc-ircc.c:(.text+0xdf24c): undefined reference to `pnp_get_resource'
drivers/built-in.o:nsc-ircc.c:(.text+0xdf266): more undefined references to `pnp_get_resource' follow
make: *** [.tmp_vmlinux1] Error 1
triggered via this config:
http://redhat.com/~mingo/misc/config-Sat_May__3_20_53_13_CEST_2008.bad
while generally most users will have PNP enabled, drivers can support
non-PNP build mode too - and most drivers implement it. That is typically
done by providing a dummy pnp_driver structure that will not probe anything.
The fallback routines in the driver will handle this dumber mode of
operation too.
This patch implements that. I have not tested whether this actually
works on real hardware so take care. It does resolve the build bug.
[ Another solution that is used by a few drivers is to exclude the driver
in the Kconfig if PNP is disabled, via "depends on PNP", but this would
limit the availability of the driver needlessly. ]
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit fa1b1cff3d06550d23ef540c4f97ca83c021b473
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date: Mon May 5 00:22:35 2008 -0700
net_cls_act: Make act_simple use of netlink policy.
Convert to netlink helpers by using netlink policy validation.
As a side effect fixes a leak.
Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9185ef6787f1c8f1c06aa0cb3c7746fb4f101f50
Author: Denis V. Lunev <den at openvz.org>
Date: Sat May 3 06:34:05 2008 +1000
[POWERPC] Assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data.
No need to check for data!=NULL after that.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Alexey Dobriyan <adobriyan at openvz.org>
Cc: Eric W. Biederman <ebiederm at xmission.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit b41e5fffe8b81fc939067d8c1c195cc79115d5a3
Author: Emil Medve <Emilian.Medve at Freescale.com>
Date: Sat May 3 06:34:04 2008 +1000
[POWERPC] devres: Add devm_ioremap_prot()
We provide an ioremap_flags, so this provides a corresponding
devm_ioremap_prot. The slight name difference is at Ben
Herrenschmidt's request as he plans on changing ioremap_flags to
ioremap_prot in the future.
Signed-off-by: Emil Medve <Emilian.Medve at Freescale.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Acked-by: Tejun Heo <htejun at gmail.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit af3ce514ade2fd0e18c5d078d138a6c1137a33df
Author: Daniel Walker <dwalker at mvista.com>
Date: Sat May 3 06:34:03 2008 +1000
[POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 56783c5e4dd32ca370ad0bdf3a9c6c1aaee94726
Author: Daniel Walker <dwalker at mvista.com>
Date: Sat May 3 06:34:02 2008 +1000
[POWERPC] macintosh: windfarm_smu_sat: semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 0885cb5653ff82c8d322df1b8a95843dc5f5486b
Author: Daniel Walker <dwalker at mvista.com>
Date: Sat May 3 06:34:01 2008 +1000
[POWERPC] macintosh: therm_pm72: driver_lock semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 5ffc02a158997b1eb91ade8d02bcf521ff79a218
Author: Satoru SATOH <satoru.satoh at gmail.com>
Date: Sun May 4 22:14:42 2008 -0700
ip: Use inline function dst_metric() instead of direct access to dst->metric[]
There are functions to refer to the value of dst->metric[THE_METRIC-1]
directly without use of a inline function "dst_metric" defined in
net/dst.h.
The following patch changes them to use the inline function
consistently.
Signed-off-by: Satoru SATOH <satoru.satoh at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0bbeafd0118fc3ae54990064760c889d41dc21d6
Author: Satoru SATOH <satoru.satoh at gmail.com>
Date: Sun May 4 22:12:43 2008 -0700
ip: Make use of the inline function dst_metric_locked()
Signed-off-by: Satoru SATOH <satoru.satoh at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1e0ba0060ffcee2e766ec3159196235b1a2a0ff3
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 18:00:36 2008 -0700
atm: Bad locking on br2684_devs modifications.
The list_del happens under read-locked devs_lock.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 65e4113684e50cee75357ce10dc9026b0929e4e9
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 18:00:05 2008 -0700
atm: Do not free already unregistered net device.
Both br2684_push and br2684_exit do so, but unregister_netdev()
releases the device itself.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 339a7c41c913035bf58579f6e47b4ba29da83795
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 17:59:30 2008 -0700
mac80211: Do not free net device after it is unregistered.
The error path in ieee80211_register_hw() may call the unregister_netdev()
and right after it - the free_netdev(), which is wrong, since the
unregister releases the device itself.
So the proposed fix is to NULL the local->mdev after unregister is done
and check this before calling free_netdev().
I checked - no code uses the local->mdev after unregister in this error
path (but even if some did this would be a BUG).
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e340a90e6e07bba6e6b3fc39dd5fa76f95579d7c
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 17:58:07 2008 -0700
bridge: Consolidate error paths in br_add_bridge().
This actually had to be merged with the patch #1, but I decided not to
mix two changes in one patch.
There are already two calls to free_netdev() in there, so merge them
into one.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c37aa90b0458d87342e0bb083f6bf7d113220d09
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Sun May 4 17:57:29 2008 -0700
bridge: Net device leak in br_add_bridge().
In case the register_netdevice() call fails the device is leaked,
since the out: label is just rtnl_unlock()+return.
Free the device.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f74d505b58d36ceeef10e459094f0eb760681165
Merge: 45ea2103d8856454503b30464cc1dba378748d00 2961b423037da60a8cb230963ee0d8c04473d73b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:12:10 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
fix asm-mips/types.h syntax error
fix asm-alpha/types.h breakage
commit 45ea2103d8856454503b30464cc1dba378748d00
Merge: 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b 62179849b40aded9e727cca5006627a1c4d6446e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:11:43 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix setup printk format warning
x86: olpc build fix
x86: video/fbdev.c: add MODULE_LICENSE
x86: fix up bootparam.h for userspace inclusion
x86: relocs ELF handling - use SELFMAG instead of numeric constant
x86: vdso ELF handling - use SELFMAG instead of numeric constant
x86: remove dell reboot dmi quirk board name match
x86: es7000 build fix
x86: make additional_cpus static
x86: make start_secondary() static
kbuild, suspend, x86: fix rebuild of wakeup.bin
uml: fix gcc problem
x86: undo visws/numaq build changes
commit 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b
Merge: eb28062f131b0a1da32b2554fd819af5221040de 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:11:24 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kconfig-language.txt: remove bogus hint
kconfig: fix MAC OS X warnings in menuconfig
modpost: i2c aliases need no trailing wildcard
commit eb28062f131b0a1da32b2554fd819af5221040de
Author: Bryan Wu <cooloney at kernel.org>
Date: Sun May 4 23:12:55 2008 +0800
task_nommu: fix compile failing bug because of spilt file.h
CC fs/proc/task_nommu.o
fs/proc/task_nommu.c: In function ‘task_mem’:
fs/proc/task_nommu.c:55: error: dereferencing pointer to incomplete type
make[2]: *** [fs/proc/task_nommu.o] Error 1
make[1]: *** [fs/proc] Error 2
make: *** [fs] Error 2
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d0dcd41d7b463de955b7ae7a55f76ff4216ed665
Merge: 8dcf5782848600ecfd0df3a45c521b5ad0fcb42e 1024c5f4be4fc5b00337464fb8a442bebf15df68
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:08:21 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: IDE_HFLAG_SERIALIZE_DMA bugfix
commit 8dcf5782848600ecfd0df3a45c521b5ad0fcb42e
Merge: e73b65f1db7e3baa3db43951476b7d2d2381ba35 b8ba5f10c5956d2b297766fda8f4f5ab8ad1e2cc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:07:28 2008 -0700
Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
x86: KVM geust: make setup_secondary_clock definition dependent on local apic
KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
KVM: avoid fx_init() schedule in atomic
KVM: Avoid spurious execeptions after setting registers
KVM: PIT: support mode 4
KVM: x86 emulator: disable writeback on lmsw
KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
KVM: ppc: Handle guest idle by emulating MSR[WE] writes
KVM: x86: task switch: fix wrong bit setting for the busy flag
KVM: VMX: Enable EPT feature for KVM
KVM: VMX: Prepare an identity page table for EPT in real mode
KVM: Export necessary function for EPT
KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
KVM: MMU: Add EPT support
KVM: Add kvm_x86_ops get_tdp_level()
KVM: MMU: Move some definitions to a header file
KVM: VMX: EPT Feature Detection
commit e73b65f1db7e3baa3db43951476b7d2d2381ba35
Author: Ingo Molnar <mingo at elte.hu>
Date: Sun May 4 09:29:43 2008 +0200
sysfs: build fix
x86.git testing found the following build failure on v2.6.26-rc1:
In file included from include/linux/kobject.h:22,
from include/linux/module.h:17,
from include/linux/crypto.h:22,
from arch/x86/kernel/asm-offsets_32.c:8,
from arch/x86/kernel/asm-offsets.c:3:
include/linux/sysfs.h:201: error: redefinition of 'sysfs_update_group'
include/linux/sysfs.h:195: error: previous definition of 'sysfs_update_group' was here
make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
make: *** [prepare0] Error 2
with the following config:
http://redhat.com/~mingo/misc/config-Sun_May__4_07_09_30_CEST_2008.bad
the reason for the build failure is the duplicate definition of the
sysfs_update_group() inline function in include/linux/sysfs.h.
The duplication was a merge error: it was added via -mm by commit
v2.6.25-7262-g2850699, "sysfs: sysfs_update_group stub for
CONFIG_SYSFS=n" a day before v2.6.26-rc1, but a day before that the same
commit was already merged upstream via the sysfs tree, with commit
v2.6.25-7211-g1cbfb7a.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 826e4506a0acb6487910a5ebafe839f708a00e1c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 4 17:04:16 2008 -0700
Make forced module loading optional
The kernel module loader used to be much too happy to allow loading of
modules for the wrong kernel version by default. For example, if you
had MODVERSIONS enabled, but tried to load a module with no version
info, it would happily load it and taint the kernel - whether it was
likely to actually work or not!
Generally, such forced module loading should be considered a really
really bad idea, so make it conditional on a new config option
(MODULE_FORCE_LOAD), and make it default to off.
If somebody really wants to force module loads, that's their problem,
but we should not encourage it. Especially as it happened to me by
mistake (ie regular unversioned Fedora modules getting loaded) causing
lots of strange behavior.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2961b423037da60a8cb230963ee0d8c04473d73b
Author: Adrian Bunk <bunk at kernel.org>
Date: Sat May 3 22:26:17 2008 +0300
fix asm-mips/types.h syntax error
This patch fixes the following compile error caused by
commit 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
(mips: types: use <asm-generic/int-*.h> for the mips architecture):
<-- snip -->
...
CC kernel/bounds.s
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/types.h:12,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/page-flags.h:8,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/bounds.c:9:
include2/asm/types.h:56:2: error: #endif without #if
make[2]: *** [kernel/bounds.s] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
commit 36bbfe2f097d5e09e8e9c83f55264bd538a0ebe1
Author: Adrian Bunk <bunk at kernel.org>
Date: Sat May 3 23:51:03 2008 +0300
fix asm-alpha/types.h breakage
This patch fixes the following compile error on alpha caused by
commit 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00
(alpha: types: use <asm-generic/int-*.h> for the alpha architecture):
<-- snip -->
...
CC arch/alpha/kernel/asm-offsets.s
In file included from include2/asm/topology.h:6,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/topology.h:34,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mmzone.h:683,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/slab.h:12,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/percpu.h:5,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/rcupdate.h:39,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/pid.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h:74,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:9:
include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:12:
include2/asm/io.h:94: warning: type defaults to 'int' in declaration of 'dma_addr_t'
include2/asm/io.h:94: warning: variable 'dma_addr_t' declared 'inline'
include2/asm/io.h:94: error: expected ',' or ';' before 'isa_page_to_bus'
make[2]: *** [arch/alpha/kernel/asm-offsets.s] Error 1
<-- snip -->
Cc: Richard Henderson <rth at twiddle.net>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
commit 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun May 4 02:15:35 2008 +0300
kconfig-language.txt: remove bogus hint
For the use case the hint describe a simple dependency is
enough.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
commit c4143a83031aef7ba87a62cf654d6d8fb4d8e76e
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Sun May 4 21:03:20 2008 +0200
kconfig: fix MAC OS X warnings in menuconfig
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Acked-by: Timur Tabi <timur at freescale.com>
commit 62179849b40aded9e727cca5006627a1c4d6446e
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Fri May 2 13:32:35 2008 -0700
x86: fix setup printk format warning
Fix x86 setup printk format warming:
next-20080430/arch/x86/kernel/setup.c:172: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'ssize_t'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Cc: mingo at elte.hu
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e26a28d190304d910ee49b81cbfe6d9241f56e86
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Sat May 3 23:49:59 2008 +0200
x86: olpc build fix
CONFIG_OLPC needs to depend on MGEODE_LX
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7b04fa014c11e6415da8b5a7999dbd201abad53c
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri May 2 13:32:32 2008 -0700
x86: video/fbdev.c: add MODULE_LICENSE
Add the missing MODULE_LICENSE("GPL").
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit afaafe50ee15c59010f19273ebfb6c44f0962d7c
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:14:20 2008 +1000
x86: fix up bootparam.h for userspace inclusion
commit 8b664aa66e824a0ddf4ec56d41fa0cf7bb374de6 (x86, boot: add linked
list of struct setup_data) put a new struct in bootparam.h, but didn't
use the userspace-safe types.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Cc: Huang Ying <ying.huang at intel.com>
Acked-by: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8bd1796dedd50abd7553afbe6113bd97cc88390f
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Sat May 3 14:18:03 2008 +0400
x86: relocs ELF handling - use SELFMAG instead of numeric constant
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Cc: akpm at linux-foundation.org
Cc: hpa at zytor.com
Cc: mingo at elte.hu
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ecb783eae1372d69a53d406e1bdba8284e4bafcc
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Sat May 3 14:18:01 2008 +0400
x86: vdso ELF handling - use SELFMAG instead of numeric constant
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Cc: akpm at linux-foundation.org
Cc: hpa at zytor.com
Cc: mingo at elte.hu
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 163ea310b68bdde89b1ac633fbf8c0db290d3f86
Author: Ben <bdeb at willmore.eu>
Date: Sat May 3 22:39:42 2008 +0200
x86: remove dell reboot dmi quirk board name match
http://bugzilla.kernel.org/show_bug.cgi?id=10547
Newer Dell OptiPlex 745s hang before rebooting after 'sudo reboot'.
A patch for some versions of the OptiPlex was proposed here --
http://lkml.org/lkml/2007/6/5/59 -- and is included in 2.6.23 and
later kernels, according to
http://lxr.linux.no/linux+v2.6.23/arch/i386/kernel/reboot.c . However,
the DMI_BOARD_NAME ("0WF810") is too restrictive. Newer OptiPlex
machines have a DMI_BOARD_NAME of "0RF703". I therefore suggest
adding another clause to reboot.c, similar to the one in the original
patch, but matching a DMI_BOARD_NAME of "0RF703".
On further inspection, it seems that there are other DMI_BOARD_NAMEs
for this same machine. They seem to change from time to time, which
means that the current code is fragile. Moreover, using bios reboot
should not break non-SFF OptiPlex 745s, and so a reasonable fix is to
simply drop the match on DMI_BOARD_NAME.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e37ee42caadab46cec277546099fa2a6207fff0b
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat May 3 22:01:31 2008 +0200
x86: es7000 build fix
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit c5562faeaacf19e81a78ee37cc6b96ab1f3e68e4
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 00:31:37 2008 +0300
x86: make additional_cpus static
This patch makes the needlessly global additional_cpus static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit dbe55f4797712f86691a0ee0b5f508693c7310fe
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 01:50:26 2008 +0300
x86: make start_secondary() static
start_secondary() needlessly became global.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4c6214c75a5aca5417156a47cd890b128c5f0637
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Thu May 1 11:31:07 2008 +0200
kbuild, suspend, x86: fix rebuild of wakeup.bin
In kernel/acpi/realmode/Makefile use the 'always'
variable to say that wakeup.bin should always
be made.
In acpi/Makefile we then do not need to specify the
requested target and we avoid the message from make:
`arch/x86/kernel/acpi/realmode/wakeup.bin' is up to date.
Add wakeup.lds to list af targets to avoid rebuilding
wakeup.bin - from Roland McGrath.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Rafael J. Wysocki <rjw at sisk.pl>
Cc: Pavel Machek <pavel at suse.cz>
Cc: H. Peter Anvin <hpa at zytor.com>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 22eecde2f9034764a3fd095eecfa3adfb8ec9a98
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 1 12:06:54 2008 +0200
uml: fix gcc problem
this is what caused gcc 4.3 to throw an internal error when
OPTIMIZE_INLINING was enabled ...
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 48b83d2425d7781bb625b1c37b5f2a8963b6e23b
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Fri May 2 21:24:30 2008 +0200
x86: undo visws/numaq build changes
arch/x86/pci/Makefile_32 has a nasty detail. VISWS and NUMAQ build
override the generic pci-y rules. This needs a proper cleanup, but
that needs more thoughts. Undo
commit 895d30935ebe05f192e844792668bf8d19deaae7
x86: numaq fix
do not override the existing pci-y rule when adding visws or
numaq rules.
There is also a stupid init function ordering problem vs. acpi.o
Add comments to the Makefile to avoid tripping over this again.
Remove the srat stub code in discontig_32.c to allow a proper NUMAQ
build.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 1024c5f4be4fc5b00337464fb8a442bebf15df68
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun May 4 17:03:41 2008 +0200
ide: IDE_HFLAG_SERIALIZE_DMA bugfix
Patch re-ordering could be harmful:
commit 1fd1890594bd355a4217f5658a34763e77decee3
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:24 2008 +0200
ide: add IDE_HFLAG_SERIALIZE_DMA host flag
...
is buggy because ->init_dma method / ide_hwif_setup_dma() is called
before IDE_HFLAG_SERIALIZE_DMA host flag is checked.
Fix it by checking IDE_HFLAG_SERIALIZE[_DMA] after DMA initialization.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b8ba5f10c5956d2b297766fda8f4f5ab8ad1e2cc
Author: Glauber Costa <gcosta at redhat.com>
Date: Wed Apr 30 12:39:05 2008 -0300
x86: KVM geust: make setup_secondary_clock definition dependent on local apic
Since the pv_apic_ops are only present if CONFIG_X86_LOCAL_APIC is compiled
in, kvmclock failed to build without this option. This patch fixes this.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 93df766322ba1db2801e4b826985a4932dd75866
Author: Avi Kivity <avi at qumranet.com>
Date: Fri May 2 13:23:10 2008 +0300
KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
nonpae guests can call rmap_write_protect twice per page (for page tables)
or four times per page (for page directories), triggering a bogus warning.
Remove the warning.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit bc1a34f1bf354fabc03e3f465620c80e510d0e8f
Author: Andrea Arcangeli <andrea at qumranet.com>
Date: Thu May 1 18:43:33 2008 +0200
KVM: avoid fx_init() schedule in atomic
This make sure not to schedule in atomic during fx_init. I also
changed the name of fpu_init to fx_finit to avoid duplicating the name
with fpu_init that is already used in the kernel, this makes grep
simpler if nothing else.
Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b4f14abd95cd8d42f08438f1c4ec3eafe41054ee
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date: Wed Apr 30 17:59:04 2008 +0200
KVM: Avoid spurious execeptions after setting registers
Clear pending exceptions when setting new register values. This avoids
spurious exceptions after restoring a vcpu state or after
reset-on-triple-fault.
Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ece15babfa514e06118f62f4df2c757d6209f4f0
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Wed Apr 30 13:23:54 2008 -0300
KVM: PIT: support mode 4
The in-kernel PIT emulation ignores pending timers if operating under
mode 4, which for example DragonFlyBSD uses (and Plan9 too, apparently).
Mode 4 seems to be similar to one-shot mode, other than the fact that it
starts counting after the next CLK pulse once programmed, while mode 1
starts counting immediately, so add a FIXME to enhance precision.
Fixes sourceforge bug 1952988.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Acked-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit dc7457ea52f88539dc72925360e6068d5c938a0f
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Apr 30 16:13:36 2008 +0300
KVM: x86 emulator: disable writeback on lmsw
The recent changes allowing memory operands with lmsw and smsw left
lmsw with writeback enabled. Since lmsw has no oridinary destination
operand, the dst pointer was not initialized, resulting in an oops.
Close the hole by disabling writeback for lmsw.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit de368dceb33c3c068dbde1407aff75cd8e126f04
Author: Christian Ehrhardt <ehrhardt at linux.vnet.ibm.com>
Date: Tue Apr 29 18:18:23 2008 +0200
KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
This patch adds the delivery of INTERRUPT_FP_UNAVAIL exceptions to the guest.
It's needed if a guest uses ppc binaries using the Floating point instructions.
Signed-off-by: Christian Ehrhardt <ehrhardt at linux.vnet.ibm.com>
Acked-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 45c5eb67da5a668abe79c23a7e64dbc87a600f90
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Fri Apr 25 17:55:49 2008 -0500
KVM: ppc: Handle guest idle by emulating MSR[WE] writes
This reduces host CPU usage when the guest is idle. However, the guest must
set MSR[WE] in its idle loop, which Linux did not do until 2.6.26.
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Jerone Young <jyoung5 at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 3fe913e7c550a869e250d04c34410f7a6e263f7c
Author: Izik Eidus <izike at qumranet.com>
Date: Mon Apr 28 18:23:52 2008 +0300
KVM: x86: task switch: fix wrong bit setting for the busy flag
The busy bit is bit 1 of the type field, not bit 8.
Signed-off-by: Izik Eidus <izike at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1439442c7b257b47a83aea4daed8fbf4a32cdff9
Author: Sheng Yang <sheng.yang at intel.com>
Date: Mon Apr 28 12:24:45 2008 +0800
KVM: VMX: Enable EPT feature for KVM
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b7ebfb0509692cd923e31650f81ed4d79c9a3e59
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 21:44:52 2008 +0800
KVM: VMX: Prepare an identity page table for EPT in real mode
[aliguory: plug leak]
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 0d15029895051904e31925ec63525cc3a637f7de
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 21:44:50 2008 +0800
KVM: Export necessary function for EPT
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1ac593c97eb229da44819f66fea47975537c1177
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 21:44:42 2008 +0800
KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
Currently EPT level is 4 for both pae and x86_64. The patch remove the #ifdef
for alloc root_hpa and free root_hpa to support EPT.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 7b52345e2c4c7333bf7eba8034ffc4683fa63c91
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 21:13:50 2008 +0800
KVM: MMU: Add EPT support
Enable kvm_set_spte() to generate EPT entries.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 67253af52e9133fb4cfbf7a2448a2d3524d1fa6c
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 10:20:22 2008 +0800
KVM: Add kvm_x86_ops get_tdp_level()
The function get_tdp_level() provided the number of tdp level for EPT and
NPT rather than the NPT specific macro.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 8c6d6adc6b87daa364ee9deb2e966021d37a7622
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 10:17:08 2008 +0800
KVM: MMU: Move some definitions to a header file
Move some definitions to mmu.h in order to allow building common table
entries between EPT and non-EPT.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit d56f546db97795dca5aa575b00b0e9886895ac87
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Apr 25 10:13:16 2008 +0800
KVM: VMX: EPT Feature Detection
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit be0c007ac64f880a946995d6d1fc654acc81484d
Author: David S. Miller <davem at davemloft.net>
Date: Sun May 4 01:34:31 2008 -0700
niu: Fix probing regression for maramba on-board chips.
Changeset 7f7c4072ea552f97a0898331322f71986a97299c ("niu: Determine
the # of ports from the card's VPD data") caused maramba on-board
NIU ports to stop probing properly.
The old code had a fallback that would use a num_ports value of
4 if all the probing methods failed, but that was removed.
This restores the fallback of 4 ports, to get things working
again.
Bump driver version and release date.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ac551828993eecb8499ef9cc3c828fceb49bcf7a
Author: Jean Delvare <khali at linux-fr.org>
Date: Fri May 2 20:37:21 2008 +0200
modpost: i2c aliases need no trailing wildcard
Not all device types need a wildcard at the end of their module
aliases. In particular, for i2c module aliases, the trailing wildcard
is not only unneeded, it could also cause the wrong driver to be
loaded.
As I2C devices have no IDs, i2c module aliases are simple, arbitrary
device names. For example:
$ /sbin/modinfo lm90
filename: /lib/modules/2.6.25-git18/kernel/drivers/hwmon/lm90.ko
author: Jean Delvare <khali at linux-fr.org>
description: LM90/ADM1032 driver
license: GPL
vermagic: 2.6.25-git18 mod_unload
depends: hwmon
alias: i2c:lm90*
alias: i2c:adm1032*
alias: i2c:lm99*
alias: i2c:lm86*
alias: i2c:max6657*
alias: i2c:adt7461*
alias: i2c:max6680*
$
This would cause trouble if one I2C chip name matches the beginning of
another I2C chip name and both chips are supported by different
drivers. For example, an i2c device named lm9042 would cause the lm90
driver to be loaded, while it doesn't support that device. This case
has yet to be seen in practice, but still, I'd like to fix it now. The
cleanest fix is to remove the trailing wildcard from i2c module aliases.
Here's a patch doing this.
Not all device type aliases need a trailing wildcard, in particular
the i2c aliases don't. Don't add a wildcard by default in do_table(),
instead let each device type handler add it if needed.
I have tested types acpi, dmi, eisa, i2c, ide, ieee1394, input, pci,
pcmcia, platform, pnp, scsi, serio, ssb and usb. Other types (ccw, of,
vio, parisc, sdio and virtio) are untested.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Jochen Friedrich <jochen at scram.de>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit e544ff00da4b53069dbca3debbfb02d455f72467
Author: David S. Miller <davem at davemloft.net>
Date: Sat May 3 21:10:58 2008 -0700
lapbeth: Release ->ethdev when unregistering device.
Otherwise it leaks forever.
Based upon a report by Roland <devzero at web.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 41fef0ee7b8f3fe3f3dd2ddc9b170f3d88bce595
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Sat May 3 21:03:01 2008 -0700
xfrm: convert empty xfrm_audit_* macros to functions
it removes these warnings when CONFIG_AUDITSYSCALL is unset:
net/xfrm/xfrm_user.c: In function 'xfrm_add_sa':
net/xfrm/xfrm_user.c:412: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:411: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:410: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_del_sa':
net/xfrm/xfrm_user.c:485: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:484: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:483: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_policy':
net/xfrm/xfrm_user.c:1132: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1131: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1130: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_get_policy':
net/xfrm/xfrm_user.c:1382: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1381: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1380: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_pol_expire':
net/xfrm/xfrm_user.c:1620: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1619: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1618: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_sa_expire':
net/xfrm/xfrm_user.c:1658: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1657: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1656: warning: unused variable 'loginuid'
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c8005785102e5b67ecf213f06a3d6c001f6f8cb4
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Sat May 3 20:56:42 2008 -0700
net: Fix useless comment reference loop.
include/linux/skbuff.h says:
/* These elements must be at the end, see alloc_skb() for details. */
net/core/skbuff.c says:
* See comment in sk_buff definition, just before the 'tail' member
This patch contains my guess as to the actual reason rather than a
dead comment reference loop.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3ba08b00e0d8413d79be9cab8ec085ceb6ae6fd6
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date: Sat May 3 20:46:29 2008 -0700
sch_htb: remove from event queue in htb_parent_to_leaf()
There is lack of removing a class from the event queue while changing
from parent to leaf which can cause corruption of this rb tree. This
patch fixes a bug introduced by my patch: "sch_htb: turn intermediate
classes into leaves" commit: 160d5e10f87b1dc88fd9b84b31b1718e0fd76398.
Many thanks to Jan 'yanek' Bortl for finding a way to reproduce this
rare bug and narrowing the test case, which made possible proper
diagnosing.
This patch is recommended for all kernels starting from 2.6.20.
Reported-and-tested-by: Jan 'yanek' Bortl <yanek at ya.bofh.cz>
Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit afa26be86b65a7183ceac29bdf1f51d6fc6932f0
Merge: 269f21344b23e552c21c9e2d7ca258479dcd7a0a 4f95f81a48623982879f4fa80c641933444afd18
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 3 13:51:10 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
clocksource: allow read access to available/current_clocksource
clocksource: Fix permissions for available_clocksource
hrtimer: remove duplicate helper function
commit 269f21344b23e552c21c9e2d7ca258479dcd7a0a
Author: Ulrich Drepper <drepper at redhat.com>
Date: Sat May 3 15:28:45 2008 -0400
tiny mq_open optimization
A very small cleanup for mq_open.
We do not have to call set_close_on_exit if we create the file
descriptor right away with the flag set. We have a function for this
now. The resulting code is smaller and a tiny bit faster.
Signed-off-by: Ulrich Drepper <drepper at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d35c7b0e54a596c5a8134d75999b7f391a9c6550
Author: Ulrich Drepper <drepper at redhat.com>
Date: Sat May 3 15:10:37 2008 -0400
unified (weak) sys_pipe implementation
This replaces the duplicated arch-specific versions of "sys_pipe()" with
one unified implementation. This removes almost 250 lines of duplicated
code.
It's marked __weak, so that *if* an architecture wants to override the
default implementation it can do so by simply having its own replacement
version, since many architectures use alternate calling conventions for
the 'pipe()' system call for legacy reasons (ie traditional UNIX
implementations often return the two file descriptors in registers)
I still haven't changed the cris version even though Linus says the BKL
isn't needed. The arch maintainer can easily do it if there are really
no obstacles.
Signed-off-by: Ulrich Drepper <drepper at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2ddcca36c8bcfa251724fe342c8327451988be0d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 3 11:59:44 2008 -0700
Linux 2.6.26-rc1
commit 38e80121bd7d0c493072442ac7eddcba165a07a8
Merge: e098675635479e9267cf2b12fb969c463cf506ab 35bf559145b6332f5465c15a4e5cd7a363985382
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 3 10:57:57 2008 -0700
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
PMU battery: filenames in sysfs with spaces
pda_power: add init and exit function callbacks
commit e098675635479e9267cf2b12fb969c463cf506ab
Merge: 2905474d3842bfab0b9d8197fb1f4576462901da b9095fd8a7f41dc7ac0b0b7864f74766a3056f96
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 3 10:54:23 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes: (24 commits)
Make constants in kernel/timeconst.h fixed 64 bits
types: add C99-style constructors to <asm-generic/int-*.h>
xtensa: types: use <asm-generic/int-*.h> for the xtensa architecture
x86: types: use <asm-generic/int-*.h> for the x86 architecture
v850: types: use <asm-generic/int-*.h> for the v850 architecture
sparc64: types: use <asm-generic/int-*.h> for the sparc64 architecture
sparc: types: use <asm-generic/int-*.h> for the sparc architecture
sh: types: use <asm-generic/int-*.h> for the sh architecture
s390: types: use <asm-generic/int-*.h> for the s390 architecture
powerpc: types: use <asm-generic/int-*.h> for the powerpc architecture
parisc: types: use <asm-generic/int-*.h> for the parisc architecture
mn10300: types: use <asm-generic/int-*.h> for the mn10300 architecture
mips: types: use <asm-generic/int-*.h> for the mips architecture
m68k: types: use <asm-generic/int-*.h> for the m68k architecture
m32r: types: use <asm-generic/int-*.h> for the m32r architecture
ia64: types: use <asm-generic/int-*.h> for the ia64 architecture
h8300: types: use <asm-generic/int-*.h> for the h8300 architecture
frv: types: use <asm-generic/int-*.h> for the frv architecture
cris: types: use <asm-generic/int-*.h> for the cris architecture
blackfin: types: use <asm-generic/int-*.h> for the blackfin architecture
...
commit 2905474d3842bfab0b9d8197fb1f4576462901da
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Sat May 3 08:35:49 2008 -0700
[MAINTAINERS] PCI list moved
Many thanks to Martin for his years of hosting. The pci list has moved to
vger, along with what seems like the rest of the major Linux mailing lists.
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c402f98c6d43f22b4c6d7b3db9d7099611cdcaec
Merge: 4f9faaace217b854ae1e1746ee4ac44688ddadbd f6acb63508700b5f8cd817082b62c96ba907775e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 3 10:18:40 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: #ifdef simplification
slabinfo: Support printout of the number of fallbacks
slub: Whitespace cleanup and use of strict_strtoul
commit 4f9faaace217b854ae1e1746ee4ac44688ddadbd
Merge: bf640be423d60d954b9673527e106a461a129eb8 f37f2c62a28e848e06399ea2f9be1e098212625c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 3 10:18:21 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)
rose: Wrong list_lock argument in rose_node seqops
netns: Fix reassembly timer to use the right namespace
netns: Fix device renaming for sysfs
bnx2: Update version to 1.7.5.
bnx2: Update RV2P firmware for 5709.
bnx2: Zero out context memory for 5709.
bnx2: Fix register test on 5709.
bnx2: Fix remote PHY initial link state.
bnx2: Refine remote PHY locking.
bridge: forwarding table information for >256 devices
tg3: Update version to 3.92
tg3: Add link state reporting to UMP firmware
tg3: Fix ethtool loopback test for 5761 BX devices
tg3: Fix 5761 NVRAM sizes
tg3: Use constant 500KHz MI clock on adapters with a CPMU
hci_usb.h: fix hard-to-trigger race
dccp: ccid2.c, ccid3.c use clamp(), clamp_t()
net: remove NR_CPUS arrays in net/core/dev.c
net: use get/put_unaligned_* helpers
bluetooth: use get/put_unaligned_* helpers
...
commit bf640be423d60d954b9673527e106a461a129eb8
Merge: c36c804559d3a891a2e655ba8185b4fa7eaee156 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 3 10:05:11 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32: Delete prom_stdin and prom_stdout.
sparc32: More memory probing consolidation.
sparc32: Kill totally unused memory information tables.
sparc64: Fix syscall restart, for real...
serial: Fix sparc driver name strings.
sparc64: Stop creating dummy root PCI host controller devices.
commit c36c804559d3a891a2e655ba8185b4fa7eaee156
Merge: be2e88011bd800222bfd7b477c727966f93186a9 3b5750644b2ffa2a76fdfe7b4e00e4af2ecf3539
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 3 10:01:33 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Bolt in SLB entry for kernel stack on secondary cpus
[POWERPC] PS3: Update ps3_defconfig
[POWERPC] PS3: Remove unsupported wakeup sources
[POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static
[POWERPC] PS3: Add time include to lpm
[POWERPC] Fix slb.c compile warnings
[POWERPC] Xilinx: Fix compile warnings
[POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c
[RAPIDIO] fix current kernel-doc notation
[POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot
Fix a potential issue in mpc52xx uart driver
[POWERPC] mpc5200: Allow for fixed speed MII configurations
[POWERPC] 86xx: Fix the wrong serial1 interrupt for 8610 board
commit 4f95f81a48623982879f4fa80c641933444afd18
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Sat May 3 14:23:14 2008 +0200
clocksource: allow read access to available/current_clocksource
There is no harm, when users can read the info and we ask often enough
during debugging for this kind of information.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: John Stultz <johnstul at us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4359a023a8c3b247b348c310bf510b23f3c1ab64
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri May 2 12:49:40 2008 +0200
clocksource: Fix permissions for available_clocksource
File permissions for
/sys/devices/system/clocksource/clocksource0/available_clocksource
are 600 which allows write access. But this is in fact a read only
file. So change permissions to 400.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: John Stultz <johnstul at us.ibm.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4346f65426cbceb64794b468e4af6f5632d58c5e
Author: Oliver Hartkopp <oliver at hartkopp.net>
Date: Wed Apr 30 23:04:37 2008 +0200
hrtimer: remove duplicate helper function
The helper function hrtimer_callback_running() is used in
kernel/hrtimer.c as well as in the updated net/can/bcm.c which now
supports hrtimers. Moving the helper function to hrtimer.h removes the
duplicate definition in the C-files.
Signed-off-by: Oliver Hartkopp <oliver at hartkopp.net>
Cc: David Miller <davem at davemloft.net>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit f37f2c62a28e848e06399ea2f9be1e098212625c
Author: Bernard Pidoux <f6bvp at amsat.org>
Date: Fri May 2 17:03:22 2008 -0700
rose: Wrong list_lock argument in rose_node seqops
In rose_node_start() as well as in rose_node_stop() __acquires() and
spin_lock_bh() were wrongly passing rose_neigh_list_lock instead of
rose_node_list_lock arguments.
Signed-off-by: Bernard Pidoux <f6bvp at amsat.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4ac2ccd01646e08d7176185c94e5b19404a25998
Author: Daniel Lezcano <dlezcano at fr.ibm.com>
Date: Fri May 2 17:02:03 2008 -0700
netns: Fix reassembly timer to use the right namespace
This trivial fix retrieves the network namespace from frag queue
and use it to get the network device in the right namespace.
Signed-off-by: Daniel Lezcano <dlezcano at fr.ibm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit aaf8cdc34ddba08122f02217d9d684e2f9f5d575
Author: Daniel Lezcano <dlezcano at fr.ibm.com>
Date: Fri May 2 17:00:58 2008 -0700
netns: Fix device renaming for sysfs
When a netdev is moved across namespaces with the
'dev_change_net_namespace' function, the 'device_rename' function is
used to fixup kobject and refresh the sysfs tree. The device_rename
function will call kobject_rename and this one will check if there is
an object with the same name and this is the case because we are
renaming the object with the same name.
The use of 'device_rename' seems for me wrong because we usually don't
rename it but just move it across namespaces. As we just want to do a
mini "netdev_[un]register", IMO the functions
'netdev_[un]register_kobject' should be used instead, like an usual
network device [un]registering.
This patch replace device_rename by netdev_unregister_kobject,
followed by netdev_register_kobject.
The netdev_register_kobject will call device_initialize and will raise
a warning indicating the device was already initialized. In order to
fix that, I split the device initialization into a separate function
and use it together with 'netdev_register_kobject' into
register_netdevice. So we can safely call 'netdev_register_kobject' in
'dev_change_net_namespace'.
This fix will allow to properly use the sysfs per namespace which is
coming from -mm tree.
Signed-off-by: Daniel Lezcano <dlezcano at fr.ibm.com>
Acked-by: Benjamin Thery <benjamin.thery at bull.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 705d209168681b4408d10fca7257de3343be573d
Author: Michael Chan <mchan at broadcom.com>
Date: Fri May 2 16:58:18 2008 -0700
bnx2: Update version to 1.7.5.
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit d25be1d3ecf0b1b95ae29919786372b87b2bfea6
Author: Michael Chan <mchan at broadcom.com>
Date: Fri May 2 16:57:59 2008 -0700
bnx2: Update RV2P firmware for 5709.
The new RV2P firmware fixes 2 issues:
1. The jumbo rx buffer page size is now configurable and set to the
proper PAGE_SIZE. Before, it was assumed to be always 4K.
2. Driver sometimes would crash when receiving jumbo packets mixed
with firmware management packets. This was caused by the old
firmware DMA'ing to the wrong address.
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 352f76879ebde543817360ce9c18c973d4300f4f
Author: Michael Chan <mchan at broadcom.com>
Date: Fri May 2 16:57:26 2008 -0700
bnx2: Zero out context memory for 5709.
We should zero out the context memory for 5709 before each reset. When
we resume after suspend for example, the memory may not be zero and the
chip may not function correctly.
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: Benjamin Li <benli at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 15b169cccff1503a88f12f104e5657c65c53ade7
Author: Michael Chan <mchan at broadcom.com>
Date: Fri May 2 16:57:08 2008 -0700
bnx2: Fix register test on 5709.
The register BNX2_CTX_STATUS (0x1004) should be skipped on 5709 as it
contains reserved bits.
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: Benjamin Li <benli at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 543a827d7a5600a71855bd6afacac78536c86822
Author: Michael Chan <mchan at broadcom.com>
Date: Fri May 2 16:56:44 2008 -0700
bnx2: Fix remote PHY initial link state.
On some remote PHY blade systems, the driver receives no initial link
interrupt. As a result, the GMII/MII MAC mode does not get setup properly.
To fix this problem, we add an initial poll of the link state after chip
reset.
With this change, the setting of the initial carrier state in the init
code can be eliminated.
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: Benjamin Li <benli at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 74ecc62d6e595ca64bbef2471787bf53b94e5d3c
Author: Michael Chan <mchan at broadcom.com>
Date: Fri May 2 16:56:16 2008 -0700
bnx2: Refine remote PHY locking.
bnx2_set_remote_link() should be called under bp->phy_lock to protect
against concurrent polling and interrupt calls. This change is needed
by the next patch which will add one initial poll of the remote PHY
link status.
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: Benjamin Li <benli at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ae4f8fca4030a4e783fa4ccb0c9d8d8a8cf60a32
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Fri May 2 16:53:33 2008 -0700
bridge: forwarding table information for >256 devices
The forwarding table binary interface (my bad choice), only exposes
the port number of the first 8 bits. The bridge code was limited to
256 ports at the time, but now the kernel supports up 1024 ports, so
the upper bits are lost when doing:
brctl showmacs
The fix is to squeeze the extra bits into small hole left in data
structure, to maintain binary compatiablity.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 920e37f76b19b4a3d8a1a3144cd6ee24e0e7f5b4
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Fri May 2 16:49:50 2008 -0700
tg3: Update version to 3.92
This patch updates the version number to 3.92.
Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7c5026aa9b81dd45df8d3f4e0be73e485976a8b6
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Fri May 2 16:49:29 2008 -0700
tg3: Add link state reporting to UMP firmware
All variants of the 5714, 5715, and 5780 offer a feature called the
"Universal Management Port". This feature is implemented in firmware
and is largely transparent to the driver, except...
It turns out that the UMP firmware needs to know the current status
of the link. Because the firmware cannot touch the PHY registers while
the driver is in control of the device, it needs the driver to report
link status changes through an additional handshaking mechanism.
Without this handshake, it has been observed in the field that the UMP
firmware will not operate correctly.
This patch implements the new handshake with the UMP firmware. Since
the handshake uses the same mechanism ASF heartbeats use, code was
added to detect and wait for completion of a pending previous event.
Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 109115e1991824b88306b374b763d6857b292aeb
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Fri May 2 16:48:59 2008 -0700
tg3: Fix ethtool loopback test for 5761 BX devices
A CPMU related loopback test bug existed for AX revisions of the 5761.
While that errata has been fixed, the CPMU still slows down the core
clock too far to run the loopback test successfully. This patch
disables the CPMU LINK_SPEED mode just like we do with the AX
revisions of the 5761 and all revisions of the 5784.
Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit fd1122a2593d0bbe19856e3943c859ebfe563583
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Fri May 2 16:48:36 2008 -0700
tg3: Fix 5761 NVRAM sizes
The 5761 NVRAM sizes assigned to the nvram_size member are half as big
as they should be. This patch corrects the NVRAM sizes and replaces
the hardcoded constants with preprocessor constants for readability.
Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8ef214288622bf523a3b3096958292a1c63132ad
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Fri May 2 16:47:53 2008 -0700
tg3: Use constant 500KHz MI clock on adapters with a CPMU
The MI clock is not configured correctly on adapters with the CPMU
present. The tg3 driver has code which statically sets the MI clock to
be a fraction of the speed at which the core clock is running.
However, the CPMU can change the adapter's core clock frequency based
on operating conditions. Consequently, the MI will run slow when the
core's clock has been slowed down.
There is a new 500KHz constant frequency clock available on adapters
with a CPMU. This patch removes the static core clock scaling and
configures the MI clock to use this new 500KHz clock instead.
Running the MI clock at slower speeds will not directly result in data
corruption, but it does challenge the PHY read and write routine timeouts.
Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 026672d0997c911c9bef9aabe862884fc0add106
Author: Pavel Machek <pavel at suse.cz>
Date: Fri May 2 16:45:10 2008 -0700
hci_usb.h: fix hard-to-trigger race
If someone tries to _urb_unlink while _urb_queue_head is running, he'll see
_urb->queue == NULL and fail to do any locking. Prevent that from happening
by strategically placed barriers.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 84994e16f25dabe234be4fc2d323ec9db95b87cb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri May 2 16:44:07 2008 -0700
dccp: ccid2.c, ccid3.c use clamp(), clamp_t()
Makes the intention of the nested min/max clear.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0c0b0aca66b3a58e12a216d992a0b534eff210e0
Author: Mike Travis <travis at sgi.com>
Date: Fri May 2 16:43:08 2008 -0700
net: remove NR_CPUS arrays in net/core/dev.c
Remove the fixed size channels[NR_CPUS] array in net/core/dev.c and
dynamically allocate array based on nr_cpu_ids.
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 35bf559145b6332f5465c15a4e5cd7a363985382
Author: Christian Kujau <lists at nerdbynature.de>
Date: Fri May 2 13:41:56 2008 -0700
PMU battery: filenames in sysfs with spaces
By changing drivers/power/pmu_battery.c I now have '_' instead of
' ' (spaces) in /sys:
/sys/devices/platform/pmu-battery.0/power_supply/PMU_battery_0
/sys/class/power_supply/PMU_battery_0
I'm still not sure if some userspace tool out there uses the old paths and
will break now.
Signed-off-by: Christian Kujau <lists at nerdbynature.de>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Anton Vorontsov <cbouatmailru at gmail.com>
commit f6b6b180b4614e57af217045f71caedd94821fc7
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Sat Apr 12 13:47:45 2008 +0200
pda_power: add init and exit function callbacks
This adds init/exit function callbacks to pda_power, to
provide a place where the platform code can request/free
GPIOs that it wants to use in the is_ac_online, is_usb_online
and set_charge functions.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Anton Vorontsov <cbouatmailru at gmail.com>
commit d3e2ce3bcdbf4319dea308c79b5f72a8ecc8015c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri May 2 16:26:16 2008 -0700
net: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 83985319393973f280ca2a797047780a7955cf19
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri May 2 16:25:46 2008 -0700
bluetooth: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Marcel Holtmann <marcel at holtmann.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 260ffeed3fd185d29f08e98fb47c09e71bb59cd8
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri May 2 16:21:52 2008 -0700
irda: use get_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b4192bbd85d29eb3bec7f9297d6464250e6a7a90
Author: Arjan van de Ven <arjan at linux.intel.com>
Date: Fri May 2 16:21:07 2008 -0700
net: Add a WARN_ON_ONCE() to the transmit timeout function
WARN_ON_ONCE() gives a stack trace including the full module list.
Having this in the kernel dump for the timeout case in the
generic netdev watchdog will help us see quicker which driver
is involved. It also allows us to collect statistics
and patterns in terms of which drivers have this event occuring.
Suggested by Andrew Morton
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 50aab54f3056ba28afc681f71adee41c399dde1e
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Fri May 2 16:20:10 2008 -0700
net: Add missing braces to multi-statement if()s
One finds all kinds of crazy things with some shell pipelining.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b9095fd8a7f41dc7ac0b0b7864f74766a3056f96
Author: H. Peter Anvin <hpa at zytor.com>
Date: Fri May 2 16:18:42 2008 -0700
Make constants in kernel/timeconst.h fixed 64 bits
Force constants in kernel/timeconst.h (except shift counts) to be 64 bits,
using U64_C() constructor macros, and eliminate constants that cannot
be represented at all in 64 bits. This avoids warnings with some gcc
versions.
Drop generating 64-bit constants, since we have no real hope of
getting a full set (operation on 64-bit values requires a 128-bit
intermediate result, which gcc only supports on 64-bit platforms, and
only with libgcc support on some.) Note that the use of these
constants does not depend on if we are on a 32- or 64-bit architecture.
This resolves Bugzilla 10153.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
commit c25bd29805f4d854c3a0b4176813f3c1bff569d3
Author: H. Peter Anvin <hpa at zytor.com>
Date: Thu Apr 24 13:37:33 2008 -0700
types: add C99-style constructors to <asm-generic/int-*.h>
Add C99-style constructor macros for fixed types to
<asm-generic/int-*.h>. Since Linux uses names like "u64" instead of
"uint64_t", the constructor macros are called U64_C() instead of
UINT64_C() and so forth.
These macros allow specific sizes to be specified as
U64_C(0x123456789abcdef), without gcc issuing warnings as it will if
one writes (u64)0x123456789abcdef.
When used from assembly, these macros pass their argument unchanged.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
commit 4cf63c8ac48c63b4c55669d4648506ed2bb8976f
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:15 2008 -0700
xtensa: types: use <asm-generic/int-*.h> for the xtensa architecture
This modifies <asm-xtensa/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Chris Zankel <chris at zankel.net>
commit edfa5cfa3dc5bfa95e6aa82a2b8904e7f6c35ed7
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:14 2008 -0700
x86: types: use <asm-generic/int-*.h> for the x86 architecture
This modifies <asm-x86/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: H. Peter Anvin <hpa at zytor.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
commit a192da9afa00476ca27edf763922ab0b5d64246e
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:13 2008 -0700
v850: types: use <asm-generic/int-*.h> for the v850 architecture
This modifies <asm-v850/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
commit 0dc794754cba8e3e8eb39bc028cb88c5d6ed506b
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:13 2008 -0700
sparc64: types: use <asm-generic/int-*.h> for the sparc64 architecture
This modifies <asm-sparc64/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Acked-by: David S. Miller <davem at davemloft.net>
commit a3727dc6c21cd0bed64dbc97212c39d2b391f5af
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:12 2008 -0700
sparc: types: use <asm-generic/int-*.h> for the sparc architecture
This modifies <asm-sparc/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: William L. Irwin <wli at holomorphy.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ba6677886e46adcd075f251d8971debf7b5ca3ee
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:11 2008 -0700
sh: types: use <asm-generic/int-*.h> for the sh architecture
This modifies <asm-sh/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Paul Mundt <lethal at linux-sh.org>
commit 59df83992b6ec962fdf69e4db4c18951499cc67c
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:10 2008 -0700
s390: types: use <asm-generic/int-*.h> for the s390 architecture
This modifies <asm-s390/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
commit 3f02c4e0e5d20884677a0259de42e553514534f9
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:09 2008 -0700
powerpc: types: use <asm-generic/int-*.h> for the powerpc architecture
This modifies <asm-powerpc/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Anton Blanchard <anton at samba.org>
commit 849bf3a09fdcf9dbbe060da0f5bce90231b14625
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:09 2008 -0700
parisc: types: use <asm-generic/int-*.h> for the parisc architecture
This modifies <asm-parisc/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Kyle McMartin <kyle at parisc-linux.org>
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: Grant Grundler <grundler at parisc-linux.org>
commit 8523437b4c664cfc0f11998c4274846b95182000
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:07 2008 -0700
mn10300: types: use <asm-generic/int-*.h> for the mn10300 architecture
This modifies <asm-mn10300/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: David Howells <dhowells at redhat.com>
Cc: Koichi Yasutake <yasutake.koichi at jp.panasonic.com>
commit 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:06 2008 -0700
mips: types: use <asm-generic/int-*.h> for the mips architecture
This modifies <asm-mips/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Ralf Baechle <ralf at linux-mips.org>
commit ad55ed6161c113cc03c04df266e75d484bce8247
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:06 2008 -0700
m68k: types: use <asm-generic/int-*.h> for the m68k architecture
This modifies <asm-m68k/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Roman Zippel <zippel at linux-m68k.org>
commit ff704db3d4d9354712df2683b62f89dc0611632a
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:05 2008 -0700
m32r: types: use <asm-generic/int-*.h> for the m32r architecture
This modifies <asm-m32r/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Hirokazu Takata <takata at linux-m32r.org>
commit 4a4bb4cee14905dd8b2b471b6998d62eeae8199c
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:04 2008 -0700
ia64: types: use <asm-generic/int-*.h> for the ia64 architecture
This modifies <asm-ia64/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Acked-by: Tony Luck <tony.luck at intel.com>
commit 861531555dfac342c1c40668af8ac2f88af26e71
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:04 2008 -0700
h8300: types: use <asm-generic/int-*.h> for the h8300 architecture
This modifies <asm-h8300/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Yoshinori Sato <ysato at users.sourceforge.jp>
commit 8f337b5399302e41ed44e999e0cc518f92d0a509
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:03 2008 -0700
frv: types: use <asm-generic/int-*.h> for the frv architecture
This modifies <asm-frv/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: David Howells <dhowells at redhat.com>
commit e3b8cf047eb2702178b8cc16f03f8194af840732
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:02 2008 -0700
cris: types: use <asm-generic/int-*.h> for the cris architecture
This modifies <asm-cris/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Mikael Starvik <starvik at axis.com>
Cc: Jesper Nilsson <jesper.nilsson at axis.com>
commit 5424a328d281f54bbc62bf9b5118c45f8113a8b8
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:02 2008 -0700
blackfin: types: use <asm-generic/int-*.h> for the blackfin architecture
This modifies <asm-blackfin/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Bryan Wu <cooloney at kernel.org>
commit 63eae0ccacd67fd5ee238c6ba68f83f0ab91a1df
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:01 2008 -0700
avr32: types: use <asm-generic/int-*.h> for the avr32 architecture
This modifies <asm-avr32/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit 4cc1a102b049ff2890e3a97c23ca88e7205b42fd
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:00 2008 -0700
arm: types: use <asm-generic/int-*.h> for the arm architecture
This modifies <asm-arm/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Lennert Buytenhek <kernel at wantstofly.org>
Cc: Ben Dooks <ben-linux at fluff.org>
commit 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00
Author: H. Peter Anvin <hpa at zytor.com>
Date: Sun Apr 6 10:35:00 2008 -0700
alpha: types: use <asm-generic/int-*.h> for the alpha architecture
This modifies <asm-alpha/types.h> to use the <asm-generic/int-*.h>
generic include files.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Richard Henderson <rth at twiddle.net>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
commit d13ff31cfeedbf2fefc7ba13cb753775648eac0c
Author: H. Peter Anvin <hpa at zytor.com>
Date: Thu Apr 24 12:56:52 2008 -0700
types: create <asm-generic/int-*.h>
This creates two generic files with common integer definitions; one
where 64 bits is "long" (most 64-bit architectures) and one where 64
bits is "long long" (all 32-bit architectures and x86-64.)
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Cc: Anton Blanchard <anton at samba.org>
Cc: Ben Dooks <ben-linux at fluff.org>
Cc: Bryan Wu <cooloney at kernel.org>
Cc: Chris Zankel <chris at zankel.net>
Cc: David Howells <dhowells at redhat.com>
Cc: David S. Miller <davem at davemloft.net>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: H. Peter Anvin <hpa at zytor.com>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Hirokazu Takata <takata at linux-m32r.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Cc: Jesper Nilsson <jesper.nilsson at axis.com>
Cc: Koichi Yasutake <yasutake.koichi at jp.panasonic.com>
Cc: Kyle McMartin <kyle at parisc-linux.org>
Cc: Lennert Buytenhek <kernel at wantstofly.org>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: Mikael Starvik <starvik at axis.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Paul Mundt <lethal at linux-sh.org>
Cc: Ralf Baechle <ralf at linux-mips.org>
Cc: Richard Henderson <rth at twiddle.net>
Cc: Roman Zippel <zippel at linux-m68k.org>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Tony Luck <tony.luck at intel.com>
Cc: William L. Irwin <wli at holomorphy.com>
Cc: Yoshinori Sato <ysato at users.sourceforge.jp>
commit be2e88011bd800222bfd7b477c727966f93186a9
Merge: d626e3bf728c47746f2129aa00c775d4e8c2a73b 4ba1c5bfd2e5a6c9528eb7777b66c297e70f61ca
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 2 13:53:07 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Use GFP_NOFS in kmalloc during localalloc window move
ocfs2: Allow uid/gid/perm changes of symlinks
ocfs2/dlm: dlmdebug.c: make 2 functions static
ocfs2: make struct o2cb_stack_ops static
ocfs2: make struct ocfs2_control_device static
ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)
commit d626e3bf728c47746f2129aa00c775d4e8c2a73b
Merge: b66e1f11ebc429569a3784aaf64123633d9e3ed1 7ad4a485002c141f156a014e89542e01e7f8e36a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 2 13:52:35 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
[SCSI] aic94xx: fix section mismatch
[SCSI] u14-34f: Fix 32bit only problem
[SCSI] dpt_i2o: sysfs code
[SCSI] dpt_i2o: 64 bit support
[SCSI] dpt_i2o: move from virt_to_bus/bus_to_virt to dma_alloc_coherent
[SCSI] dpt_i2o: use standard __init / __exit code
[SCSI] megaraid_sas: fix suspend/resume sections
[SCSI] aacraid: Add Power Management support
[SCSI] aacraid: Fix jbod operations scan issues
[SCSI] aacraid: Fix warning about macro side-effects
[SCSI] add support for variable length extended commands
[SCSI] Let scsi_cmnd->cmnd use request->cmd buffer
[SCSI] bsg: add large command support
[SCSI] aacraid: Fix down_interruptible() to check the return value correctly
[SCSI] megaraid_sas; Update the Version and Changelog
[SCSI] ibmvscsi: Handle non SCSI error status
[SCSI] bug fix for free list handling
[SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions
[SCSI] megaraid_mbox: fix Dell CERC firmware problem
commit 7ad4a485002c141f156a014e89542e01e7f8e36a
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Fri Apr 18 13:57:22 2008 -0700
[SCSI] aic94xx: fix section mismatch
Fix following warnings:
WARNING: vmlinux.o(.data+0x17aa88): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9410_setup()
WARNING: vmlinux.o(.data+0x17aa98): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9410_setup()
WARNING: vmlinux.o(.data+0x17aaa8): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9405_setup()
asd_pcidev_data is only used by __devinit asd_pci_probe. So mark is const and
annotate it __devinitconst to fix the warnings.
[akpm at linux-foundation.org: fix warning]
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit b66e1f11ebc429569a3784aaf64123633d9e3ed1
Merge: 1be1d6b7f3f6e3a87f872dd5e7a867d03d8a6851 5c598b3428c372a1209597cee99a70da20625876
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 2 11:23:14 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] fix sysctl_nr_open bugs
[PATCH] sanitize anon_inode_getfd()
[PATCH] split linux/file.h
[PATCH] make osf_select() use core_sys_select()
[PATCH] remove horrors with irix tty ioctls handling
[PATCH] fix file and descriptor handling in perfmon
commit 392512fbf9407fa1647225143e3f9c28a869ac57
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Fri May 2 14:21:50 2008 +0100
[SCSI] u14-34f: Fix 32bit only problem
Another user of 32bit time
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 1ed43910956f5faec690ea3214451779e93bbb52
Author: Miquel van Smoorenburg <miquels at cistron.nl>
Date: Fri May 2 01:08:19 2008 +0200
[SCSI] dpt_i2o: sysfs code
Create a /sys/class/dpt_i2o directory and populate it with
dptiN directories. Each dptiN directory contains a "dev" file
that makes udev create /dev/dptiN
Signed-off-by: Miquel van Smoorenburg <miquels at cistron.nl>
Acked-by: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 62ac5aedc51485d672a5d91c262a001acecbe447
Author: Miquel van Smoorenburg <miquels at cistron.nl>
Date: Fri May 2 01:07:27 2008 +0200
[SCSI] dpt_i2o: 64 bit support
This is the code to actually support 64 bit platforms. 64 bit
DMA is enabled on both x86_32 PAE and 64 bit platforms.
This code is based in part on the unofficial adaptec 64-bit
dpt_i2o driver update that I got from Mark Salyzyn at Adaptec.
Signed-off-by: Miquel van Smoorenburg <miquels at cistron.nl>
Acked-by: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 67af2b060e027c84b8e48d77e00b2369d997c0d4
Author: Miquel van Smoorenburg <miquels at cistron.nl>
Date: Fri May 2 01:06:39 2008 +0200
[SCSI] dpt_i2o: move from virt_to_bus/bus_to_virt to dma_alloc_coherent
Remove virt_to_bus/bus_to_virt code from dpt_i2o, and use
dma_alloc_coherent() / dma_free_coherent().
This is in preparation of 64-bit support, dma_alloc_coherent()
can allocate memory in the lower 32 bits of physical memory
which is needed because the HBA only supports message blocks under 4GB
This code is based in part on the unofficial adaptec 64-bit
dpt_i2o driver update that I got from Mark Salyzyn at Adaptec.
Signed-off-by: Miquel van Smoorenburg <miquels at cistron.nl>
Acked-by: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit c864cb145dc2218cfad9fe53d323b54b48dbab6c
Author: Miquel van Smoorenburg <miquels at cistron.nl>
Date: Fri May 2 01:05:33 2008 +0200
[SCSI] dpt_i2o: use standard __init / __exit code
Update dpt_i2o.c to use the standard __init / __exit
code instead of the legacy '#include "scsi_module.c"' code.
This is needed in preparation of 64-bit support. scsi_module.c
calls scsi_add_host() with the device pointer set to NULL, and that
crashes code like arch/x64/kernel/pci-gart_64.c::need_iommu().
The reboot_notifier code is deleted because it wasn't compiled
in ever anyway, and it would be useless to duplicate it in
the new code.
Signed-off-by: Miquel van Smoorenburg <miquels at cistron.nl>
Acked-by: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 33139b21013aba815924b421159fab35e5175483
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Thu May 1 17:56:02 2008 +0200
[SCSI] megaraid_sas: fix suspend/resume sections
megaraid_sas suspend and resume are inappropriatelly placed in
__devinit section. Remove those placements and make the stuff
dependent on CONFIG_PM.
While at it, mark remove function as __devexit.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Acked-by: "Yang, Bo" <Bo.Yang at lsi.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 655d722cf7812078306f975a3afe88b96a1306b8
Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Date: Wed Apr 30 16:03:42 2008 -0400
[SCSI] aacraid: Add Power Management support
For firmware that supports the feature(s), add the ability to start or
stop an array using the associated SCSI commands, to automatically
manage the spin-up of an array on new I/O reporting back the
appropriate check conditions and actions in cooperation with the
normal timeout mechanisms and enable the blackout period management in
the Firmware associated with the background spin-down of the arrays
when the Firmware times out and deems the arrays as idle.
Signed-off-by: Mark Salyzyn <aacraid at adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit a4576b5da671563187ac388e36e1d077bd20e43a
Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Date: Wed Apr 30 15:47:35 2008 -0400
[SCSI] aacraid: Fix jbod operations scan issues
As JBOD devices (really just Simple Single Drive Volumes exported to
the SCSI channel) are managed, they fail to update correctly when the
driver triggers a SCSI scan. In addition, the ability to change
multiple arrays or JBODs at the same time was resulting in dropped
scans, set up a mechanism to issue a list of single target scans on a
single configuration change notification from the Firmware.
Performed some additional sundry cosmetic code style cleanups.
Signed-off-by: Mark Salyzyn <aacraid at adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit e2efe7aa24dc7b430d2ea109fa117bd3c60ae8e6
Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Date: Wed Apr 30 15:28:32 2008 -0400
[SCSI] aacraid: Fix warning about macro side-effects
On some compile environments, warnings are produced regarding the
usage of aac_logical_to_phys macro.
Signed-off-by: Mark Salyzyn <aacraid at adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 1be1d6b7f3f6e3a87f872dd5e7a867d03d8a6851
Merge: 37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8 62fd2cac5bf5cf9e6fcb2fc40b32e7271e605c53
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 2 11:03:08 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (32 commits)
USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance, clear-feature ignore
USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance
usb_serial: some coding style fixes
USB: Remove redundant dependencies on USB_ATM.
USB: UHCI: disable remote wakeup when it's not needed
USB: OHCI: work around bogus compiler warning
USB: add Cypress c67x00 OTG controller HCD driver
USB: add Cypress c67x00 OTG controller core driver
USB: add Cypress c67x00 low level interface code
USB: airprime: unlock mutex instead of trying to lock it again
USB: storage: Update mailling list address
USB: storage: UNUSUAL_DEVS() for PanDigital Picture frame.
USB: Add the USB 2.0 extension descriptor.
USB: add more FTDI device ids
USB: fix cannot work usb storage when using ohci-sm501
usb: gadget zero timer init fix
usb: gadget zero style fixups (mostly whitespace)
usb serial gadget: CDC ACM fixes
usb: pxa27x_udc driver
USB: INTOVA Pixtreme camera mass storage device
...
commit 37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8
Merge: 3482a6f1d1447b618d37049529cf36a8dc3bd3e3 06916639e2fed9ee475efef2747a1b7429f8fe76
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 2 11:02:53 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
driver-core: add dev_name() to help transition away from using bus_id
commit 77a8d5741f3ee2c79554382179cca7b5893d6ae9
Author: Steve Wise <swise at opengridcomputing.com>
Date: Fri May 2 10:57:09 2008 -0700
RDMA/cxgb3: Bump up the MPA connection setup timeout.
Testing on large clusters shows its way too short at 10 secs.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit c4d49776e8f5bf2d900d2b6d4855c1670a535ac5
Author: Steve Wise <swise at opengridcomputing.com>
Date: Fri May 2 10:57:09 2008 -0700
RDMA/cxgb3: Silently ignore close reply after abort.
Remove bad BUG_ON() that can trigger in correct operation from
close_con_rpl(). It is possible to get a close_rpl message on a dead
connection. The sequence is:
- host refs ep for close exchange
- host posts close_req
- hw posts PEER_ABORT from incoming RST
- host marks ep DEAD
- host posts ABORT_RPL and releases ep resources
- hw posts CLOSE_RPL
- host derefs ep and ep freed.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit c8286944b802c5ce4063ec3c334b38c6757a9434
Author: Steve Wise <swise at opengridcomputing.com>
Date: Fri May 2 11:17:41 2008 -0500
RDMA/cxgb3: QP flush fixes
- Flush the QP only after the HW disables the connection. Currently
we flush the QP when transitioning to CLOSING. This exposes a race
condition where the HW can complete a RECV WR, for instance, -and-
the SW can flush that same WR.
- Only call CQ event handlers on flush IFF we actually flushed something.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 62fd2cac5bf5cf9e6fcb2fc40b32e7271e605c53
Author: David Lopo <lopo.david at gmail.com>
Date: Tue Apr 29 10:14:38 2008 +0100
USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance, clear-feature ignore
Gadget tells controller driver to ignore Clear-Feature(HALT_ENDPOINT)
Signed-off-by: David Lopo <lopo.david at gmail.com>
Acked-by: Alan Stern <stern at rowland.harvard.edu>
commit a5e54b0dbb6a099793caf508b1d6c7d82f965ec3
Author: David Lopo <lopo.david at gmail.com>
Date: Tue Apr 29 10:12:37 2008 +0100
USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance
Gadget can tell controller driver to ignore Clear-Feature(HALT_ENDPOINT)
This API change enables future support for Bulk-Only Transport compliance
Signed-off-by: David Lopo <lopo.david at gmail.com>
Acked-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c4d0f8cbca3a97900f85b082064a63c7a5928bd7
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Apr 29 14:35:39 2008 +0100
usb_serial: some coding style fixes
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e5430f889ce04301152044cce15a4a11a3e21e7d
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Fri Apr 25 17:06:35 2008 -0400
USB: Remove redundant dependencies on USB_ATM.
Given that the bulk of the Kconfig file is enclosed in "if USB_ATM",
remove the unnecessary dependencies.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d8f12ab5d984761726e638a4222299a9fc516233
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue Apr 22 10:49:15 2008 -0400
USB: UHCI: disable remote wakeup when it's not needed
This patch (as1084b) fixes the way uhci-hcd handles polling and
remote wakeups for its root hubs. When remote wakeup is disabled,
neither interrupts nor polling should be enabled during a root-hub
suspend. Likewise, if interrupts are enabled during suspend then
polling isn't needed.
Furthermore the EGSM (Enter Global Suspend Mode) bit shouldn't be set
in the Command register unless remote wakeup is enabled. Apparently
some controllers will issue a remote-wakeup interrupt whenever EGSM
is on, even if Resume-Detect interrupts are supposedly disabled.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 1b7b61c5d4071b9a25f6a9aae6f0a1e0efdbb2ae
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue Apr 22 10:50:18 2008 -0400
USB: OHCI: work around bogus compiler warning
The patch (as1086) works around a bogus "uninitialized variable"
warning generated by some versions of GCC.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e9b29ffc519b9e63d4e1c0b1278bb951bb418a9d
Author: Peter Korsgaard <jacmet at sunsite.dk>
Date: Sun Apr 27 08:59:45 2008 +0200
USB: add Cypress c67x00 OTG controller HCD driver
This patch adds HCD support for the Cypress c67x00 family of devices.
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b02b371e6d14961ad458ca9d88b30eefef77003d
Author: Peter Korsgaard <jacmet at sunsite.dk>
Date: Sun Apr 27 08:59:44 2008 +0200
USB: add Cypress c67x00 OTG controller core driver
This patch add the core driver for the c67x00 USB OTG controller. The core
driver is responsible for the platform bus binding and creating either
USB HCD or USB Gadget instances for each of the serial interface engines
on the chip.
This driver does not directly implement the HCD or gadget behaviours; it
just controls access to the chip.
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d6f945044ee3b91a170183e8e34c3db29696d9b8
Author: Peter Korsgaard <jacmet at sunsite.dk>
Date: Sun Apr 27 08:59:43 2008 +0200
USB: add Cypress c67x00 low level interface code
This patch adds the low level support code for the Cypress c67x00 family of
OTG controllers. The low level code is responsible for register access and
implements the software protocol for communicating with the 16bit
microcontroller inside the c67x00 device.
Communication is done over the HPI interface (16bit SRAM-like parallel bus).
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 21ae1dd1d4948968ad2d923c5e104d38fb35b4e4
Author: Leonardo Chiquitto <leonardo at iken.com.br>
Date: Tue Apr 22 16:02:03 2008 -0300
USB: airprime: unlock mutex instead of trying to lock it again
The following patch fixes a [probable] copy & paste mistake in
airprime.c. Instead of unlocking an acquired mutex, the actual
code tries to lock it again.
Signed-off-by: Leonardo Chiquitto <lchiquitto at novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit cef03f8f1d5042e85de431d739eeded89d79999b
Author: Andrew Lunn <andrew at lunn.ch>
Date: Wed Apr 23 22:04:30 2008 +0200
USB: storage: Update mailling list address
drivers/usb/storage/unusual_devs.h lists the address
linux-usb-devel at lists.sourceforge.net for patches to that file. This
address results in a bounce and a pointer to vger. This patch updates
the address in the header file.
Signed-off-by: Andrew Lunn <andrew at lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit f7687217ddb5e20ca855fadef2f9eb3c3202acca
Author: Andrew Lunn <andrew at lunn.ch>
Date: Thu Apr 24 19:36:39 2008 +0200
USB: storage: UNUSUAL_DEVS() for PanDigital Picture frame.
Signed-off-by: Andrew Lunn <andrew at lunn.ch>
Signed-off-by: Matthew Dharm <mdharm-usb at one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 35e5437e8c8cd013e1e573ac4671d556819edbcb
Author: Sarah Sharp <sarah.a.sharp at intel.com>
Date: Fri Apr 25 16:46:45 2008 -0700
USB: Add the USB 2.0 extension descriptor.
This device descriptor was added by the recent USB Link Power Management (LPM)
ECN. It indicates whether the USB device supports LPM.
This descriptor is grouped under a Binary Device Object Store (BOS) descriptor.
Update the BOS comments to indicate any USB device (not just wireless USB
devices) can implement BOS descriptors.
Signed-off-by: Sarah Sharp <sarah.a.sharp at intel.com>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6e1ab3ed825418320319f44af1b990c9c3f4c45b
Author: Peter Mack <Peter.Mack at scs-ptc.com>
Date: Tue Apr 22 13:25:11 2008 +0200
USB: add more FTDI device ids
Add more usb device ids to the ftdi driver.
From: Peter Mack <Peter.Mack at scs-ptc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e2722528ce688eecf574c237f7656d3934d4f23c
Author: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Date: Mon Apr 21 13:48:22 2008 +0900
USB: fix cannot work usb storage when using ohci-sm501
When I used ohci-sm501, hcd_alloc_coherent() in map_urb_for_dma() is not
called, because usb_sg_init() always sets URB_NO_TRANSFER_DMA_MAP.
dmesg (CONFIG_USB_STORAGE_DEBUG enabled):
usb-storage: Bulk Command S 0x43425355 T 0x1 L 36 F 128 Trg 0 LUN 0 CL 6
usb-storage: usb_stor_bulk_transfer_buf: xfer 31 bytes
usb-storage: Status code 0; transferred 31/31
usb-storage: -- transfer complete
usb-storage: Bulk command transfer result=0
usb-storage: usb_stor_bulk_transfer_sglist: xfer 36 bytes, 1 entries
usb-storage: Status code -75; transferred 0/36
usb-storage: -- babble
usb-storage: Bulk data transfer result 0x3
usb-storage: Attempting to get CSW...
usb-storage: usb_stor_bulk_transfer_buf: xfer 13 bytes
usb-storage: Status code 0; transferred 13/13
usb-storage: -- transfer complete
usb-storage: Bulk status result = 0
usb-storage: Bulk Status S 0x53425355 T 0x1 R 0 Stat 0x0
usb-storage: scsi cmd done, result=0x2
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7a6ad1dd86a45da8f235300349d4abd9ae7d1a21
Author: David Lopo <lopo.david at gmail.com>
Date: Fri Apr 18 18:49:01 2008 -0700
usb: gadget zero timer init fix
Initialize timer earlier so if an error occurs allocating USB request
or buffer request (zero_bind) Gadget Zero will not hang trying to
delete an uninitialized timer (zero_unbind).
Signed-off-by: David Lopo <lopo.david at gmail.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7472f38b10c884f47241529d1367f77c2e1b3551
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Fri Apr 18 18:47:54 2008 -0700
usb: gadget zero style fixups (mostly whitespace)
Minor updates to "Gadget Zero".
- Primarily these are whitespace updates to address the fact that since
this was written, Documentation/CodingStyle was changed to disapprove
of parts of the original coding style.
- Update a few comments that weren't quite correct, notably mentioning
the "autoresume" module parameter.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit f371e750c9324f3498842ee833a0242a11b359e6
Author: David Brownell <david-b at pacbell.net>
Date: Fri Apr 18 17:37:49 2008 -0700
usb serial gadget: CDC ACM fixes
Based on a patch from <Aurel.Thomi at ruag.com>, this makes the
CDC-ACM support in the serial gadget handle the SET_LINE_CODING
and SET_CONTROL_LINE_STATE requests ... which should improve
interop with at least MS-Windows "usbser.sys" if not some other
ACM host drivers.
It also adds a few REVISIT comments where this code plays a bit
loose with the CDC ACM spec. If this were used to hook up to a
real RS232 or modem link, those places would need a bit of work.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d75379a538708c5a8e3dba673d866c3f5f856620
Author: Robert Jarzmik <rjarzmik at free.fr>
Date: Fri Apr 18 15:56:49 2008 -0700
usb: pxa27x_udc driver
Adds pxa27x udc driver to support USB peripherals on pxa27x chips.
The driver is compatible with: Gadget Zero, the File Storage
gadget, and the Ethernet gadget (only in CDC subset mode).
The driver can't properly support multiple interfaces, because
of hardware bugs without possible workaround. That means no
RNDIS support from g_ether, and no CDC ACM support in g_serial.
Signed-off-by: Robert Jarzmik <rjarzmik at free.fr>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d301f528eb7b204fc99fb9ebbf289f84a69bfa19
Author: Rohan Hart <rohan.hart17 at gmail.com>
Date: Fri Apr 18 21:19:33 2008 +1200
USB: INTOVA Pixtreme camera mass storage device
FIX_CAPACITY is all that's needed.
Cc: Alan Stern <stern at rowland.harvard.edu>
Cc: Phil Dibowitz <phil at ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 87521c46f63f0e1cac2bf8af08942ac47bb25de5
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Thu Apr 17 06:16:24 2008 +0200
USB: mos7840: test and propagate set_uart_reg return value
The test for an mos7840_set_uart_reg() error return value only works when
status is signed. propagate its error value.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Cc: SL Baur <steve at xemacs.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 28ffd79c31a7bed6f610511a4d104d1255cd1d95
Author: David Brownell <david-b at pacbell.net>
Date: Fri Apr 25 18:51:10 2008 -0700
USB: usbtest displays diagnostics again
Minor cleanup to the "usbtest" driver, mostly to resolve a regression:
all the important diagnostics were at KERN_DEBUG, so that when the
"#define DEBUG" was removed from the top of that file it stopped
providing diagnostics. Fix by using KERN_ERROR. Also:
- Stop using the legacy dbg() calls
- Simplify the internal debug macros
- Correct some test descriptions:
* Test #10 subcase 7 should *always* stall
* Test #10 subcase 8 *may* stall
- Diagnostic about control queue test failures is more informative
- Fix some whitespace "bugs"
And add a warning about the rude interaction between usbfs ioctl()
and khubd during device disconnect ... don't unplug a device under
test, that will wedge.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9029b174ba22918d0a0aa3b71859854bd50c39cc
Author: Pete Zaitcev <zaitcev at redhat.com>
Date: Sat Apr 19 14:45:24 2008 -0700
ub: Cosmetics
Fix a few comments and printk statements.
Signed-off-by: Pete Zaitcev <zaitcev at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 0da13c8c3dfb1ab6c56f2a70fadfddd57e0d7c42
Author: Pete Zaitcev <zaitcev at redhat.com>
Date: Sat Apr 19 14:42:49 2008 -0700
ub: Ignore bad residue
I hoped to continue to ignore this problem or use libusual, but these
days it's simpler to work around than to deal with it. Let's attempt to
use bad residue devices and hope that upper level integrity checks catch
any problems (e.g. please use sha1sum on your backups).
Signed-off-by: Pete Zaitcev <zaitcev at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 82fe26ba7a21d9bcc77e6142c941683eede32940
Author: Pete Zaitcev <zaitcev at redhat.com>
Date: Sat Apr 19 14:35:30 2008 -0700
ub: Tune retries
Make ub to fail faster in hopeless cases.
Signed-off-by: Pete Zaitcev <zaitcev at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 2c51ae70ede5a90d8ccb67d965c1b4e20fc4e110
Author: Pete Zaitcev <zaitcev at redhat.com>
Date: Sat Apr 19 14:32:18 2008 -0700
ub: Fix timeouts
The wodim says:
"close track/session scsi sendcmd: cmd timeout after 5.000 (480) s"
This happened because we ignored the supplied timeout and used 5s.
It's not completely correct to apply a timeout meant for the complete
command to any single URB, but we don't have many URBs per command, so
this is simple and works.
Signed-off-by: Pete Zaitcev <zaitcev at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 043042109b24a1bd418db7cd509dadc5d120daf1
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Apr 21 06:38:34 2008 +1000
usb: libusual kthread_run() called with wrong format.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b28884c1729940df83d87c515a5e66e5afbe9dea
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Apr 28 10:26:13 2008 -0400
usb-storage: add unusual_devs entry for Samsung YP-U3
This patch (as1088) adds an unusual_devs entry for Samsung's YP-U3.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Cc: Phil Dibowitz <phil at ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 43c1e98c87013757ef02c50a6e43bafeb6871f68
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 28 18:39:37 2008 +0300
USB: storage/onetouch.c: make a function static
This patch makes the needlessly global onetouch_release_input() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e42dc36b2cf9849362967ea836196c8ef6079ec7
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Mon Apr 28 16:57:14 2008 -0400
usb-storage: fix build failure in OneTouch driver
If USB storage is built-in but input subsystem is made modular then
OneTouch button functionality can not be selected.
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
Cc: Matthew Dharm <mdharm-usb at one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit ce0d7d3f575fc1ba6a89c3c651e710355590daff
Author: Daniel Walker <dwalker at mvista.com>
Date: Mon Apr 28 10:34:56 2008 -0700
usb: ldusb: ld_usb semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Acked-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit db11e47dd7b09b7f76c7eaa236277f23391331e7
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date: Thu Apr 24 00:37:04 2008 +0200
USB: ISP1760 HCD driver
This driver has been written from scratch and supports the ISP1760. ISP1761
might (should) work as well but the OTG isn't supported. Also ISO packets are
not. However, it works on my little PowerPC board.
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 06916639e2fed9ee475efef2747a1b7429f8fe76
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri May 2 06:02:41 2008 +0200
driver-core: add dev_name() to help transition away from using bus_id
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit db4742dd8f0aa9125b74f9b2516336a75f3d9106
Author: Boaz Harrosh <bharrosh at panasas.com>
Date: Wed Apr 30 11:27:26 2008 +0300
[SCSI] add support for variable length extended commands
Add support for variable-length, extended, and vendor specific
CDBs to scsi-ml. It is now possible for initiators and ULD's
to issue these types of commands. LLDs need not change much.
All they need is to raise the .max_cmd_len to the longest command
they support (see iscsi patch).
- clean-up some code paths that did not expect commands to be
larger than 16, and change cmd_len members' type to short as
char is not enough.
Signed-off-by: Boaz Harrosh <bharrosh at panasas.com>
Signed-off-by: Benny Halevy <bhalevy at panasas.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 3482a6f1d1447b618d37049529cf36a8dc3bd3e3
Merge: 59d42c0eb1d8fdfeec18f4ff088de8084bda906b 1adb0850a1254333d81e64121c80af100c6d6e06
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 2 08:22:36 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq:
genirq: reenable a nobody cared disabled irq when a new driver arrives
commit 59d42c0eb1d8fdfeec18f4ff088de8084bda906b
Merge: 02cdf0827b61d51f0e9cc1b5ddd486950830ba08 62478fa4b7cd1bdf0ba8ff8a5e3a95c45c7b8ac8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 2 08:20:43 2008 -0700
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: cleanup: drop .data.idt section in vmlinux.lds script
m32r: use KBUILD_DEFCONFIG
commit 02cdf0827b61d51f0e9cc1b5ddd486950830ba08
Merge: 8bec4a5d9305c86d028a519b08f05b81cd63cc55 a007a751d98fe97142e4724a83a4e31ec66b7532
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 2 08:20:04 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest: make Launcher see device status updates
lguest: remove bogus NULL cpu check
lguest: avoid using NR_CPUS as a bounds check.
virtio: add virtio disk geometry feature
virtio: explicit advertisement of driver features
virtio: change config to guest endian.
virtio: finer-grained features for virtio_net
virtio: wean net driver off NETDEV_TX_BUSY
virtio-blk: fix remove oops
virtio: fix scatterlist sizing in net driver.
virtio: de-structify virtio_block status byte
virtio: export more headers to userspace
virtio: fix sparse return void-valued expression warnings
virtio: fix tx_ stats in virtio_net
virtio: ignore corrupted virtqueues rather than spinning.
commit 64a87b244b9297667ca80264aab849a36f494884
Author: Boaz Harrosh <bharrosh at panasas.com>
Date: Wed Apr 30 11:19:47 2008 +0300
[SCSI] Let scsi_cmnd->cmnd use request->cmd buffer
- struct scsi_cmnd had a 16 bytes command buffer of its own.
This is an unnecessary duplication and copy of request's
cmd. It is probably left overs from the time that scsi_cmnd
could function without a request attached. So clean that up.
- Once above is done, few places, apart from scsi-ml, needed
adjustments due to changing the data type of scsi_cmnd->cmnd.
- Lots of drivers still use MAX_COMMAND_SIZE. So I have left
that #define but equate it to BLK_MAX_CDB. The way I see it
and is reflected in the patch below is.
MAX_COMMAND_SIZE - means: The longest fixed-length (*) SCSI CDB
as per the SCSI standard and is not related
to the implementation.
BLK_MAX_CDB. - The allocated space at the request level
- I have audit all ISA drivers and made sure none use ->cmnd in a DMA
Operation. Same audit was done by Andi Kleen.
(*)fixed-length here means commands that their size can be determined
by their opcode and the CDB does not carry a length specifier, (unlike
the VARIABLE_LENGTH_CMD(0x7f) command). This is actually not exactly
true and the SCSI standard also defines extended commands and
vendor specific commands that can be bigger than 16 bytes. The kernel
will support these using the same infrastructure used for VARLEN CDB's.
So in effect MAX_COMMAND_SIZE means the maximum size command
scsi-ml supports without specifying a cmd_len by ULD's
Signed-off-by: Boaz Harrosh <bharrosh at panasas.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 8bec4a5d9305c86d028a519b08f05b81cd63cc55
Merge: 886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a f8e811b98935f702b48abc92563462a15c226eb8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 2 08:17:58 2008 -0700
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix file and descriptor handling in perfmon
[IA64] TS_RESTORE_SIGMASK
[IA64] smp.c coding style fix
[IA64] fix section mismatch in arch/ia64/kernel/topology.c
[IA64] fix section mismatch in arch/ia64/kernel/palinfo.c
[IA64] fix section mismatch in arch/ia64/kernel/irq.c
[IA64] fix section mismatch in arch/ia64/kernel/acpi.c
commit 9f5de6b105bfa45911d46566df0b36720b648c42
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Wed Apr 30 13:16:21 2008 +0900
[SCSI] bsg: add large command support
This enables bsg to handle the request length larger than BLK_MAX_CDB
(mainly for the variable length CDB format).
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Acked-by: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 0462590efe9a562dd2aa976ae2dc9cd2e6f5a0c6
Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Date: Wed Apr 23 08:16:06 2008 -0400
[SCSI] aacraid: Fix down_interruptible() to check the return value correctly
On Apr 21, 2008, at 8:42 PM, Yinghai Lu wrote:
> bisected to:
>
> commit e6990c6448ca9359b6d4ad027c0a6efbf4379e64
> Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
> Date: Mon Apr 14 14:20:16 2008 -0400
>
> [SCSI] aacraid: Fix down_interruptible() to check the return value
The return value for down_interruptible was incorrectly checked!
updated patch enclosed.
Signed-off-by: Mark Salyzyn <aacraid at adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 1 22:33:04 2008 -0700
sparc32: Delete prom_stdin and prom_stdout.
They are written, but never used.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 1 22:28:17 2008 -0700
sparc32: More memory probing consolidation.
The PROM library function prom_meminit() builds a table,
prom_phys_avail[], just so that probe_memory() in
arch/sparc/mm/fault.c can copy it into sp_banks[].
Just have prom_meminit() fill in the sp_banks[] array directly, and
remove duplicated sort() function.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ccc34028d46230f715eeda4c8cce27e919934fad
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 1 21:28:59 2008 -0700
sparc32: Kill totally unused memory information tables.
The code in arch/sparc/prom/memory.c computes three tables, the list
of total memory, the list of available memory (total minus what
firmware is using), and the list of firmware taken memory.
Only the available memory list is even used.
Therefore, kill those unused tables and make prom_meminfo() return
just the available memory list.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 2678fefedbbc03a3ae6f5c254791bf147d6c52fd
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 1 03:30:22 2008 -0700
sparc64: Fix syscall restart, for real...
The change I put into copy_thread() just papered over the real
problem.
When we are looking to see if we should do a syscall restart, when
deliverying a signal, we should only interpret the syscall return
value as an error if the carry condition code(s) are set.
Otherwise it's a success return.
Also, sigreturn paths should do a pt_regs_clear_trap_type().
It turns out that doing a syscall restart when returning from a fork()
does and should happen, from time to time. Even if copy_thread()
returns success, copy_process() can still unwind and signal
-ERESTARTNOINTR in the parent.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 32039f4954938e4d761032d7046254d08d0db54c
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 1 01:14:27 2008 -0700
serial: Fix sparc driver name strings.
They were all "serial" so if multiple of these drivers registered,
we'd trigger sysfs directory creation errors:
[ 1.695793] proc_dir_entry 'serial' already registered
[ 1.695839] Call Trace:
[ 1.831891] [00000000004f2534] create_proc_entry+0x7c/0x98
[ 1.833608] [00000000004f3a58] proc_tty_register_driver+0x40/0x70
[ 1.833663] [0000000000594700] tty_register_driver+0x1fc/0x208
[ 1.835371] [00000000005aade4] uart_register_driver+0x134/0x16c
[ 1.841762] [00000000005ac274] sunserial_register_minors+0x34/0x68
[ 1.841818] [00000000007db2a4] sunsu_init+0xf8/0x150
[ 1.867697] [00000000007c62a4] kernel_init+0x190/0x330
[ 1.939147] [0000000000426cf8] kernel_thread+0x38/0x48
[ 1.939198] [00000000006a0d90] rest_init+0x18/0x5c
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c26d3c0138970778fabe114df99dffb34a04b1d7
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 1 01:12:40 2008 -0700
sparc64: Stop creating dummy root PCI host controller devices.
It just creates confusion, errors, and bugs.
For one thing, this can cause dup sysfs or procfs nodes to get
created:
[ 1.198015] proc_dir_entry '00.0' already registered
[ 1.198036] Call Trace:
[ 1.198052] [00000000004f2534] create_proc_entry+0x7c/0x98
[ 1.198092] [00000000005719e4] pci_proc_attach_device+0xa4/0xd4
[ 1.198126] [00000000007d991c] pci_proc_init+0x64/0x88
[ 1.198158] [00000000007c62a4] kernel_init+0x190/0x330
[ 1.198183] [0000000000426cf8] kernel_thread+0x38/0x48
[ 1.198210] [00000000006a0d90] rest_init+0x18/0x5c
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a007a751d98fe97142e4724a83a4e31ec66b7532
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:53 2008 -0500
lguest: make Launcher see device status updates
This brings us closer to Real Life, where we'd examine the device
features once it's set the DRIVER_OK status bit.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 9f3f746741d917fe3c6c544c7d319d533176d90b
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:51 2008 -0500
lguest: remove bogus NULL cpu check
If lg isn't NULL, and cpu_id is sane, &lg->cpus[cpu_id] can't be NULL.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 24adf12722b4f2800e5b5f0955d57033f0d0c9e5
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:51 2008 -0500
lguest: avoid using NR_CPUS as a bounds check.
NR_CPUS (being a host number) is an arbitrary limit for the Guest.
Using the array size directly (which currently happes to be NR_CPUS)
is more futureproof.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 48e4043d4529523cbc7fa8dd745bd8e2c45ce1d3
Author: Ryan Harper <ryanh at us.ibm.com>
Date: Wed Apr 16 13:56:37 2008 -0500
virtio: add virtio disk geometry feature
Rather than faking up some geometry, allow the backend to push the disk
geometry via virtio pci config option. Keep the old geo code around for
compatibility.
Signed-off-by: Ryan Harper <ryanh at us.ibm.com>
Reviewed-by: Anthony Liguori <aliguori at us.ibm.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> (modified to single struct)
commit c45a6816c19dee67b8f725e6646d428901a6dc24
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:50 2008 -0500
virtio: explicit advertisement of driver features
A recent proposed feature addition to the virtio block driver revealed
some flaws in the API: in particular, we assume that feature
negotiation is complete once a driver's probe function returns.
There is nothing in the API to require this, however, and even I
didn't notice when it was violated.
So instead, we require the driver to specify what features it supports
in a table, we can then move the feature negotiation into the virtio
core. The intersection of device and driver features are presented in
a new 'features' bitmap in the struct virtio_device.
Note that this highlights the difference between Linux unsigned-long
bitmaps where each unsigned long is in native endian, and a
straight-forward little-endian array of bytes.
Drivers can still remove feature bits in their probe routine if they
really have to.
API changes:
- dev->config->feature() no longer gets and acks a feature.
- drivers should advertise their features in the 'feature_table' field
- use virtio_has_feature() for extra sanity when checking feature bits
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 72e61eb40b55dd57031ec5971e810649f82b0259
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:49 2008 -0500
virtio: change config to guest endian.
A recent proposed feature addition to the virtio block driver revealed
some flaws in the API, in particular how easy it is to break big
endian machines.
The virtio config space was originally chosen to be little-endian,
because we thought the config might be part of the PCI config space
for virtio_pci. It's actually a separate mmio region, so that
argument holds little water; as only x86 is currently using the virtio
mechanism, we can change this (but must do so now, before the
impending s390 merge).
API changes:
- __virtio_config_val() just becomes a striaght vdev->config_get() call.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 5539ae9613587e4a4eec42d420b8bdd9ff552a65
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:46 2008 -0500
virtio: finer-grained features for virtio_net
So, we previously had a 'VIRTIO_NET_F_GSO' bit which meant that 'the
host can handle csum offload, and any TSO (v4&v6 incl ECN) or UFO
packets you might want to send. I thought this was good enough for
Linux, but it actually isn't, since we don't do UFO in software.
So, add separate feature bits for what the host can handle. Add
equivalent ones for the guest to say what it can handle, because LRO
is coming too (thanks Herbert!).
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 99ffc696d10b28580fe93441d627cf290ac4484c
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:46 2008 -0500
virtio: wean net driver off NETDEV_TX_BUSY
Herbert tells me that returning NETDEV_TX_BUSY from hard_start_xmit is
seen as a poor thing to do; we should cache the packet and stop the queue.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 2e895e4c23b7f73dba7238db5c5c2dcffb2a4d9d
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Thu Apr 24 15:49:53 2008 -0300
virtio-blk: fix remove oops
Do not unregister the major at device remove, since there might be
another device instances around.
(qemu) pci_del 0 11
(qemu) ACPI: PCI interrupt for device 0000:00:0b.0 disabled
(qemu) pci_del 0 10
(qemu) ------------[ cut here ]------------
WARNING: at block/genhd.c:126 unregister_blkdev+0x74/0x9e()
ACPI: PCI interrupt for device 0000:00:0a.0 disabled
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 0527168522c25121bdd5d5f1d3c5b484d972ea14
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:45 2008 -0500
virtio: fix scatterlist sizing in net driver.
Herbert Xu points out (within another patch) that my scatterlists are
too short: one entry for the gso header, one for the skb->data, and
MAX_SKB_FRAGS for all the fragments.
Fix both xmit and recv sides (recv currently unused, coming in later
patch).
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit cb38fa23c17519faf46a76d2f71a8430705fe474
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:45 2008 -0500
virtio: de-structify virtio_block status byte
Ron Minnich points out that a struct containing a char is not always
sizeof(char); simplest to remove the structure to avoid confusion.
Cc: "ron minnich" <rminnich at gmail.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 81473132878f8a1d0c6a78cffa0cf84c8a19c1be
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Wed Apr 23 12:57:00 2008 +0200
virtio: export more headers to userspace
Rusty,
is there a reason why we dont export the virtio headers for
9p, balloon, console, pci, and virtio_ring? kvm uses make sync,
but I think it is still useful to heave these headers exported
as they might be useful for other userspace tools.
I dont export virtio.h, because it does not seem to have useful
information for userspace and it requires scatterlist.h which is
also not exported. See also my other mail about your "virtio:
change config to guest endian." patch.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 597d56e4b51fc3385e097e52d6e92bf596ff21ec
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Mar 31 17:53:55 2008 -0700
virtio: fix sparse return void-valued expression warnings
drivers/virtio/virtio_pci.c:148:2: warning: returning void-valued expression
drivers/virtio/virtio_pci.c:155:2: warning: returning void-valued expression
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 655aa31f028c4498e8896576571ee1ea68dd26e0
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:43 2008 -0500
virtio: fix tx_ stats in virtio_net
get_buf() gives the length written by the other side, which will be
zero. We want to add the skb length.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 5ef827526fc01820a7a80827802e9fad3f34f937
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 2 21:50:43 2008 -0500
virtio: ignore corrupted virtqueues rather than spinning.
A corrupt virtqueue (caused by the other end screwing up) can have
strange results such as a driver spinning: just bail when we try to
get a buffer from a known-broken queue.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 1adb0850a1254333d81e64121c80af100c6d6e06
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Mon Apr 28 17:01:56 2008 +0200
genirq: reenable a nobody cared disabled irq when a new driver arrives
Uwe Kleine-Koenig has some strange hardware where one of the shared
interrupts can be asserted during boot before the appropriate driver
loads. Requesting the shared irq line from another driver result in a
spurious interrupt storm which finally disables the interrupt line.
I have seen similar behaviour on resume before (the hardware does not
work anymore so I can not verify).
Change the spurious disable logic to increment the disable depth and
mark the interrupt with an extra flag which allows us to reenable the
interrupt when a new driver arrives which requests the same irq
line. In the worst case this will disable the irq again via the
spurious trap, but there is a decent chance that the new driver is the
one which can handle the already asserted interrupt and makes the box
usable again.
Eric Biederman said further: This case also happens on a regular basis
in kdump kernels where we deliberately don't shutdown the hardware
before starting the new kernel. This patch should reduce the need for
using irqpoll in that situation by a small amount.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Tested-and-Acked-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
commit 78e92b99ec4eb73755abd4e357b0b211eadafd88
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 04:12:41 2008 -0700
netns: assign PDE->data before gluing entry into /proc tree
In this unfortunate case, proc_mkdir_mode wrapper can't be used anymore and
this is no way to reuse proc_create_data due to nlinks assignment. So,
copy the code from proc_mkdir and assign PDE->data at the appropriate
moment.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8b169240e266d7fc58d9b9077d18d50a548d9732
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 04:11:52 2008 -0700
netfilter: assign PDE->data before gluing PDE into /proc tree
Replace proc_net_fops_create with proc_create_data.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 52c0e111fa082082060c4d43c05f20b756d5f06a
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 04:10:57 2008 -0700
netfilter: assign PDE->fops before gluing PDE into /proc tree
Replace create_proc_entry with specially created for this purpose proc_create.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 84841c3c6cf2ed9a8e0dfd842fb35ef6e2bce091
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 04:10:08 2008 -0700
ipv4: assign PDE->data before gluing PDE into /proc tree
The check for PDE->data != NULL becomes useless after the replacement
of proc_net_fops_create with proc_create_data.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1d3faa390df9f009d7d76134b2aa1f07990945a4
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 04:09:11 2008 -0700
vlan: assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0c89652a741cce71661d561c4466115c60c752d1
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 04:08:30 2008 -0700
atm: assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data.
proc_atm_dev_ops holds proper referrence.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0bb53a66fe1258b1cb5eb1ea70768386f0c2a1ca
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 02:46:55 2008 -0700
ipv6: assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5efdccbcda20d3e5fbaa85f726dcc9cfeb005577
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 02:46:22 2008 -0700
net: assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data.
Additionally, there is no need to assign NULL to PDE->data after creation,
/proc generic has already done this for us.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 6e79d85d9a6b7a149dd3666b079c96cfbf57fdb8
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 02:45:42 2008 -0700
netfilter: assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e7fe23363bab0488c7ce09626900e7d621ea2292
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 2 02:44:36 2008 -0700
sunrpc: assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3b5750644b2ffa2a76fdfe7b4e00e4af2ecf3539
Author: Paul Mackerras <paulus at samba.org>
Date: Fri May 2 14:29:12 2008 +1000
[POWERPC] Bolt in SLB entry for kernel stack on secondary cpus
This fixes a regression reported by Kamalesh Bulabel where a POWER4
machine would crash because of an SLB miss at a point where the SLB
miss exception was unrecoverable. This regression is tracked at:
http://bugzilla.kernel.org/show_bug.cgi?id=10082
SLB misses at such points shouldn't happen because the kernel stack is
the only memory accessed other than things in the first segment of the
linear mapping (which is mapped at all times by entry 0 of the SLB).
The context switch code ensures that SLB entry 2 covers the kernel
stack, if it is not already covered by entry 0. None of entries 0
to 2 are ever replaced by the SLB miss handler.
Where this went wrong is that the context switch code assumes it
doesn't have to write to SLB entry 2 if the new kernel stack is in the
same segment as the old kernel stack, since entry 2 should already be
correct. However, when we start up a secondary cpu, it calls
slb_initialize, which doesn't set up entry 2. This is correct for
the boot cpu, where we will be using a stack in the kernel BSS at this
point (i.e. init_thread_union), but not necessarily for secondary
cpus, whose initial stack can be allocated anywhere. This doesn't
cause any immediate problem since the SLB miss handler will just
create an SLB entry somewhere else to cover the initial stack.
In fact it's possible for the cpu to go quite a long time without SLB
entry 2 being valid. Eventually, though, the entry created by the SLB
miss handler will get overwritten by some other entry, and if the next
access to the stack is at an unrecoverable point, we get the crash.
This fixes the problem by making slb_initialize create a suitable
entry for the kernel stack, if we are on a secondary cpu and the stack
isn't covered by SLB entry 0. This requires initializing the
get_paca()->kstack field earlier, so I do that in smp_create_idle
where the current field is initialized. This also abstracts a bit of
the computation that mk_esid_data in slb.c does so that it can be used
in slb_initialize.
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit d9f2f3f537acb8aa04280509b2eed50c855fd3ef
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date: Thu May 1 08:25:36 2008 +1000
[POWERPC] PS3: Update ps3_defconfig
Update ps3_defconfig.
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 5442381cdd311633d18f8bb52a66ede2d0fa502c
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date: Thu May 1 08:25:30 2008 +1000
[POWERPC] PS3: Remove unsupported wakeup sources
Other OS wakeup is not supported from the IR controller,
the bluetooth controller nor the RTC. Remove references
to these in the PS3 sys-manager source.
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit fdedb4caea36cfc00571928a727ac87906037712
Author: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Date: Thu May 1 08:25:18 2008 +1000
[POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static
The routines ps3_virq_setup() and ps3_virq_destroy() are used
in only one file, so make them static.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 483d8876f75aa5707a646442377051f1b90db206
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Thu May 1 08:25:09 2008 +1000
[POWERPC] PS3: Add time include to lpm
Add an include <asm/time.h> statement for get_tb().
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit bbea34606269efedf7d12c608924b47bafb344f5
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date: Thu May 1 08:24:58 2008 +1000
[POWERPC] Fix slb.c compile warnings
Arrange for a syntax check to always be done on the powerpc/mm/slb.c
DBG() macro by defining it to pr_debug() for non-debug builds.
Also, fix these related compile warnings:
slb.c:273: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'long unsigned int
slb.c:274: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 5be661a28b12aa43cc83ba935ba2b2c273d0da45
Merge: fbe543b412cef02350fab35526a6d4dc3d20d182 b17b8181c97e88e6fac5aa704879ad61fdd67351
Author: Paul Mackerras <paulus at samba.org>
Date: Fri May 2 14:45:50 2008 +1000
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
commit b17b8181c97e88e6fac5aa704879ad61fdd67351
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Wed Apr 30 10:24:44 2008 -0500
[POWERPC] Xilinx: Fix compile warnings
arch/powerpc/sysdev/xilinx_intc.c: In function 'xilinx_intc_init':
arch/powerpc/sysdev/xilinx_intc.c:111: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'resource_size_t'
drivers/char/xilinx_hwicap/xilinx_hwicap.c: In function 'hwicap_setup':
drivers/char/xilinx_hwicap/xilinx_hwicap.c:626: warning: cast to pointer from integer of different size
drivers/char/xilinx_hwicap/xilinx_hwicap.c:646: warning: format '%x' expects type 'unsigned int', but argument 6 has type 'resource_size_t'
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 128cf7f2eb952a85875834c0d274da05ee0f02aa
Author: Becky Bruce <bgill at freescale.com>
Date: Thu May 1 18:15:45 2008 -0500
[POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c
When resource_size_t is larger than an int, the current code
generates a build warning. Kill it.
Signed-off-by: Becky Bruce <becky.bruce at freescale.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 9941d945f491320bc121d86c558b1288ac0ad6ca
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Apr 30 16:45:58 2008 -0700
[RAPIDIO] fix current kernel-doc notation
Fix current (-git16) missing docbook/kernel-doc notation in RapidIO files.
Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description found for parameter 'sys_size'
Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description found for parameter 'phy_type'
Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:188): No description found for parameter 'mport'
Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:224): No description found for parameter 'mport'
Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:245): No description found for parameter 'mport'
Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:270): No description found for parameter 'mport'
Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:311): No description found for parameter 'mport'
Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:996): No description found for parameter 'dev'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit e598477a3a9679bd04565ef2be20cc985b8954ae
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Tue Apr 29 20:41:12 2008 +0400
[POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot
This patch adds pcie node which is resposible for PCI-E x8 slot
functioning. Though, this was tested using only x1 SKY2 NIC.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit fb65f180e02dde224af256b43d3ab2c28b9689d7
Merge: ab59859de1946a098b091308380179e92dc7683b 61c2b682b8391f13b67e2d95990a0aba34697d9c
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 1 16:04:59 2008 -0700
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 61c2b682b8391f13b67e2d95990a0aba34697d9c
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Mon Apr 21 19:01:09 2008 +0200
rt2x00: Fix quality/activity led handling
There was an obvious typo in LED structure
initialization which caused the radio and quality/activity
leds to be incorrectly initialized which resulted in
the leds not being enabled.
Additionally add the rt2x00led_led_activity() handler
that will enable TX/RX activity leds when the radio
is being enabled.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 44a9809b97ec5acd1c549c3120bdd35613897d7c
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Mon Apr 21 19:00:17 2008 +0200
rt2x00: Don't enable short preamble for 1MBs
The timing settings for 1MBs should exclude
the short preamble bit since that only applies
to 2MBs, 5.5MBs and 11MBs.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 2218228392080f0ca2fc2974604e79f57b12c436
Author: Kirill A. Shutemov <kirill at shutemov.name>
Date: Tue Apr 22 16:38:55 2008 +0300
Make linux/wireless.h be able to compile
Signed-off-by: Kirill A. Shutemov <kirill at shutemov.name>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 786b4557075ae0d8a23e73c316dc4204b41ccb4d
Author: Bill Moss <bmoss at clemson.edu>
Date: Thu Apr 17 16:03:40 2008 -0700
iwlwifi: fix debug messages during scanning
direct_mask will be set when we are not associated and requesting a
direct scan. The second debug print will be confusing as priv->essid
is not set at that time and it will thus print "<hidden>" while it is
known to which AP a direct scan is requested - as previous debug message
also indicates.
Now make all debugging consistent.
Signed-off-by: Bill Moss <bmoss at clemson.edu>
Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f52764886540b16e7962bd1d150bd939aec9248c
Author: Guy Cohen <guy.cohen at intel.com>
Date: Mon Apr 21 15:41:57 2008 -0700
iwlwifi: fix current channel is not scanned
All channels should be scanned, including the current channel
when the client is associated.
Removed also unused flag to scan only active channels.
Signed-off-by: Guy Cohen <guy.cohen at intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 21a75d7788f4e29b6c6d28e08f9f0310c4de828d
Author: Michael Buesch <mb at bu3sch.de>
Date: Fri Apr 25 19:29:08 2008 +0200
b43: Fix some TX/RX locking issues
This fixes some TX/RX related locking issues.
With this patch applied, some of the PHY transmission errors are fixed.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f8e811b98935f702b48abc92563462a15c226eb8
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Thu May 1 14:36:36 2008 -0700
[IA64] fix file and descriptor handling in perfmon
Races galore... General rule: as soon as it's in descriptor table,
it's over; another thread might have started IO on it/dup2() it
elsewhere/dup2() something *over* it/etc. fd_install() is the very
last step one should take - it's a point of no return.
Besides, the damn thing leaked on failure exits...
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 848376c774a941c29e4fa083d96d84a5f2190857
Author: Roland McGrath <roland at redhat.com>
Date: Wed Apr 30 14:40:14 2008 -0700
[IA64] TS_RESTORE_SIGMASK
Replace TIF_RESTORE_SIGMASK with TS_RESTORE_SIGMASK and define
our own set_restore_sigmask() function. This saves the costly
SMP-safe set_bit operation, which we do not need for the sigmask
flag since TIF_SIGPENDING always has to be set too.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit c0cd661b1b0ad83dac54420169ec9ca14df409e9
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Wed Apr 30 18:55:48 2008 +0900
[IA64] smp.c coding style fix
Fix indenting of switch statement to follow CodingStyle, and
pull out handling of call_data into an inlined function.
I confirmed that applying this fix doesn't affect assembled code.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit f6acb63508700b5f8cd817082b62c96ba907775e
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 16:16:06 2008 -0700
slub: #ifdef simplification
If we make SLUB_DEBUG depend on SYSFS then we can simplify some
#ifdefs and avoid others.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit f715e6f15ee167026581a8a2e09b2ed644b974aa
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 16:14:46 2008 -0700
slabinfo: Support printout of the number of fallbacks
Add functionality to slabinfo to print out the number of fallbacks
that have occurred for each slab cache when the -D option is specified.
Also widen the allocation / free field since the numbers became
too big after a week.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 0121c619d03820d965745e56f80f6eb5994533fe
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 16:11:12 2008 -0700
slub: Whitespace cleanup and use of strict_strtoul
Fix some issues with wrapping and use strict_strtoul to make parameter
passing from sysfs safer.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a
Merge: 6ed7b6a05dc4332c391134809387220123e82ea7 f32ddaddf95d8a30be5a41cf681bc8792bc42ec7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 1 11:31:38 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fw-sbp2: log scsi_target ID at release
ieee1394: fix NULL pointer dereference in sysfs access
commit 6ed7b6a05dc4332c391134809387220123e82ea7
Merge: 2c4aabcca847ac4c92aa5e960c3f6053e1051b62 90ebd878a5900839106664fae40a6cc83dbe86ab
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 1 11:31:24 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus:
kbuild: fix vmlinux.o link
kconfig: made check-lxdialog more portable
commit 2c4aabcca847ac4c92aa5e960c3f6053e1051b62
Merge: bcf35afb528109a31264b45d4851fa6ae72dbe18 a98889f3d8882995b5aa2255b931cf0202325cc0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 1 11:15:28 2008 -0700
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
[MTD][NOR] Add physical address to point() method
[JFFS2] Track parent inode for directories (for NFS export)
[JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean.
[JFFS2] Quiet lockdep false positive.
[JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once()
[MTD] Delete long-unused jedec.h header file.
[MTD] [NAND] at91_nand: use at91_nand_{en,dis}able consistently.
commit fbe543b412cef02350fab35526a6d4dc3d20d182
Author: Andrew Liu <shengping.liu at windriver.com>
Date: Tue Apr 29 17:36:25 2008 +1000
Fix a potential issue in mpc52xx uart driver
mpc52xx_uart_int and __uart_put_char both try to acquire the
port->lock. Therefore the function sequence of:
mpc52xx_uart_int--> ...-->flush_to_ldisc-->...-->__uart_put_char
can potentially trigger a deadlock. To avoid this deadlock a fix
similar to that found in the 8250.c serial driver is applied. The
deadlock is avoided by releasing the lock before pushing a buffer
and reacquiring it when completed.
Signed-off-by: Andrew Liu <shengping.liu at windriver.com>
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit a98889f3d8882995b5aa2255b931cf0202325cc0
Author: Jared Hulbert <jaredeh at gmail.com>
Date: Tue Apr 29 23:26:49 2008 -0700
[MTD][NOR] Add physical address to point() method
Adding the ability to get a physical address from point() in addition
to virtual address. This physical address is required for XIP of
userspace code from flash.
Signed-off-by: Jared Hulbert <jaredeh at gmail.com>
Reviewed-by: Jörn Engel <joern at logfs.org>
Acked-by: Nicolas Pitre <nico at cam.org>
Acked-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit f32ddaddf95d8a30be5a41cf681bc8792bc42ec7
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Apr 24 23:17:47 2008 +0200
firewire: fw-sbp2: log scsi_target ID at release
Makes the good-by message more informative.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit 07c7224cf74c3977c69c7c9a0b0fba264f2df36a
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu May 1 10:43:04 2008 +0200
ieee1394: fix NULL pointer dereference in sysfs access
Regression since "ieee1394: prevent device binding of raw1394,
video1394, dv1394", commit d2ace29fa44589da51fedc06a67b3f05301f3bfd:
$ cat /sys/bus/ieee1394/drivers/raw1394/device_ids
triggers a NULL pointer dereference in fw_show_drv_device_ids.
Reported by Miles Lane.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Tested-by: Miles Lane <miles.lane at gmail.com>
commit 27c72b040c0be8f3704ed0b6b84c12cbba24a7e8
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Thu May 1 18:47:17 2008 +0100
[JFFS2] Track parent inode for directories (for NFS export)
To support NFS export, we need to know the parent inode of directories.
Rather than growing the jffs2_inode_cache structure, share space with
the nlink field -- which was always set to 1 for directories anyway.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 90ebd878a5900839106664fae40a6cc83dbe86ab
Author: Sam Ravnborg <sam at uranus.ravnborg.org>
Date: Thu May 1 19:31:35 2008 +0200
kbuild: fix vmlinux.o link
We always linked vmliux.o.
Remove init/built-in.o dependency so we avoid this
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit b44158de9e318fbc92ac6c665ad3d0c948e80ac3
Author: Sam Ravnborg <sam at uranus.ravnborg.org>
Date: Thu May 1 19:29:47 2008 +0200
kconfig: made check-lxdialog more portable
OS-X shell did not like 'echo -e' so implement
suggestion from Al Viro to use a more portable construct.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Al Viro <viro at ZenIV.linux.org.uk>
Acked-By: Timur Tabi <timur at freescale.com>
commit bcf35afb528109a31264b45d4851fa6ae72dbe18
Author: Christoph Hellwig <hch at lst.de>
Date: Thu May 1 18:43:12 2008 +0200
make generic sys_ptrace unconditional
With s390 the last arch switched to the generic sys_ptrace yesterday so
we can now kill the ifdef around it to enforce every new port it using
it instead of introducing new weirdo versions.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5c598b3428c372a1209597cee99a70da20625876
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Sun Apr 27 20:04:15 2008 -0400
[PATCH] fix sysctl_nr_open bugs
* if luser with root sets it to something that is not a multiple of
BITS_PER_LONG, the system is screwed.
* if it gets decreased at the wrong time, we can get expand_files()
returning success and _not_ increasing the size of table as asked.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 2030a42cecd4dd1985a2ab03e25f3cd6106a5ca8
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Sat Feb 23 06:46:49 2008 -0500
[PATCH] sanitize anon_inode_getfd()
a) none of the callers even looks at inode or file returned by anon_inode_getfd()
b) any caller that would try to look at those would be racy, since by the time
it returns we might have raced with close() from another thread and that
file would be pining for fjords.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 9f3acc3140444a900ab280de942291959f0f615d
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Thu Apr 24 07:44:08 2008 -0400
[PATCH] split linux/file.h
Initial splitoff of the low-level stuff; taken to fdtable.h
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit a2dcb44c3c5a8151d2d9f6ac8ad0789efcdbe184
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Wed Apr 23 14:05:15 2008 -0400
[PATCH] make osf_select() use core_sys_select()
... instead of open-coding it
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit bf7da7bcfb38409b4cdea34b0905bdf344f1b36d
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Wed Apr 23 00:49:25 2008 -0400
[PATCH] remove horrors with irix tty ioctls handling
Existing code in there (get_tty(), etc.) is both severely
racy *and* pointless: ioctls in question have Linux equivalents
and there's no need to play silly buggers in irix_ioctl() -
just need to replace arguments and, in case of TIOCGSID,
deal with API differences - Linux one expects pid_t __user *
while Irix one does unsigned long __user *. BFD...
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 74d92abc6143b124db03f0d341f02bde72fba6f5
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Tue Apr 22 19:46:10 2008 -0400
[PATCH] fix file and descriptor handling in perfmon
Races galore... General rule: as soon as it's in descriptor table,
it's over; another thread might have started IO on it/dup2() it
elsewhere/dup2() something *over* it/etc. fd_install() is the very
last step one should take - it's a point of no return.
Besides, the damn thing leaked on failure exits...
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 80791be11145f7dd7f68c84741fc66e5164b7353
Author: Grant Likely <grant.likely at secretlab.ca>
Date: Thu May 1 11:05:58 2008 -0600
[POWERPC] mpc5200: Allow for fixed speed MII configurations
Various improvements for configuring the MPC5200 MII link from the
device tree:
* Look for 'current-speed' property for fixed speed MII links
* Look for 'fsl,7-wire-mode' property for boards using the 7 wire mode
* move definition of private data structure out of the header file
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
Acked-by: Wolfgang Grandegger <wg at grandegger.com>
commit 1b690b48786229571e590dd22fe01ecc22a8746b
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Thu May 1 16:59:24 2008 +0100
[JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean.
We don't actually care about nlink; we only care whether the inode in
question is unlinked or not.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 9fc3ace937a675bf42cbe6e6ef8950a6731ca16f
Merge: c92758ceda477b1333fde35327cfa867dcc47bd1 23f8e4bf7cf0e2125b6d798cc85c031951c763d3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 1 08:45:19 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: fix early setup of hwif->host_flags
commit c92758ceda477b1333fde35327cfa867dcc47bd1
Merge: 03fc922f4085a0139f313831fe2dc6fed467cd2d 4f02f8220562591322c118d07a32bebf705318b7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 1 08:28:26 2008 -0700
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: (adt7473) minor cleanup / refactoring
hwmon: (asb100) Remove some dead code
hwmon: (lm75) Fix an incorrect comment
hwmon: (w83793) VID and VRM handling cleanups
hwmon: (w83l785ts) Don't ask the user to report failures
hwmon: (smsc47b397) add a new chip id (0x8c)
commit 03fc922f4085a0139f313831fe2dc6fed467cd2d
Merge: a0be7522b25f17ac2c3964a24b88b5fe7c9404b8 df4b565e1fbc777bb6e274378a41fa8ff7485680
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 1 08:26:56 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
module: add MODULE_STATE_GOING notifier call
module: Enhance verify_export_symbols
module: set unused_gpl_crcs instead of overwriting unused_crcs
module: neaten __find_symbol, rename to find_symbol
module: reduce module image and resident size
module: make module_sect_attrs private to kernel/module.c
commit a0be7522b25f17ac2c3964a24b88b5fe7c9404b8
Merge: 3b2b74cad34e7a0cf6d4929ee9e8ad4e11a84867 b1145ce395f7785487c128fe8faf8624e6586d84
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 1 08:15:36 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] cryptd: Correct kzalloc error test
[CRYPTO] eseqiv: Fix off-by-one encryption
[CRYPTO] api: Fix scatterwalk_sg_chain
[CRYPTO] authenc: Fix async crypto crash in crypto_authenc_genicv()
commit 3b2b74cad34e7a0cf6d4929ee9e8ad4e11a84867
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date: Thu May 1 14:08:12 2008 +1000
m68knommu: fix FEC driver locking
It's easy: grab locks before talking to hardware and realease
them afterwards. The one big lock has been splitted into a hw_lock
and mii_lock.
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c1d9615680c3f43a305b1f66dff0f933d5079273
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date: Thu May 1 14:04:02 2008 +1000
m68knommu: kill warnings in FEC driver
linux-2.6-mk68/drivers/net/fec.c: In function 'fec_enet_module_init':
linux-2.6-mk68/drivers/net/fec.c:2627: warning: unused variable 'j'
linux-2.6-mk68/drivers/net/fec.c: At top level:
linux-2.6-mk68/drivers/net/fec.c:2136: warning: 'mii_link_interrupt' defined but not used
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 398ec922b9cd5fdec26d2ca75b9389bed2432557
Author: Greg Ungerer <gerg at snapgear.com>
Date: Thu May 1 13:47:09 2008 +1000
m68knommu: remove unused interrupts in FEC driver
Remove the acquisition of unused interrupt types. We don't need to
register all the TX and RX varients used on some ColdFire FEC hardware.
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cc462f7df0a78df568fd4e1d19f0874476f3c002
Author: Greg Ungerer <gerg at snapgear.com>
Date: Thu May 1 13:35:34 2008 +1000
m68knommu: fix ColdFire 5272 fec driver hash registers
Renamed the 5272 hash_table registers to match the "grp" hash_table
registers of the other ColdFire parts. They are actually a group hash.
The makes for consistent setup across all ColdFire parts.
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6c5a7d504fb0e27aa90b96267177d434642a393d
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date: Thu May 1 12:17:49 2008 +1000
m68knommu: fix compare race in sched related code
The interrupts must be disabled before considering the need resched
bit of the task struct and they have to be disabled before calling
schedule()
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0042a1f7ecbc5d40eb2164f375ec87ecf3494418
Author: Greg Ungerer <gerg at snapgear.com>
Date: Thu May 1 12:17:41 2008 +1000
m68knommu: rework definition of HZ
Rework the HZ definition to be more consistent with other architectures.
Non-kernel includers will see a constant HZ setting of 100.
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6cca49173198e1666cb9852649f66e1dba99d88a
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date: Thu May 1 12:17:36 2008 +1000
m68knommu: update MAX_M68K_DMA_CHANNELS for some plattforms
include/asm-m68knommu/mcfdma.h defines base0-3 for M523x,
M527x and M528x so it looks this has been forgotten.
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cff28b56bdafd314836f4193b638b88d9b3cb5b1
Author: Greg Ungerer <gerg at snapgear.com>
Date: Thu May 1 12:17:21 2008 +1000
m68knommu: remove unused CONFIG_DISKtel
Remove unused CONFIG_DISKtel support.
Missing config definition pointed out by
Robert P. J. Day <rpjday at mindspring.com>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 188a9a4841c9b4a56cdd9b58761a882db4873f0c
Author: Steve Bennett <steveb at workware.net.au>
Date: Thu May 1 12:17:08 2008 +1000
m68knommu: add WilFire and WildfireMod board support
This patch adds linux-2.6.x kernel support for the Intec Automation
ColdFire 5282-based boards, the WildFire and WildFireMod
Signed-Off-By: Steve Bennett <steveb at workware.net.au>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 653620d6190670a7e2e3a6c7c0a4f78badb0e31f
Author: Greg Ungerer <gerg at snapgear.com>
Date: Thu May 1 12:17:00 2008 +1000
m68knommu: remove unused CONFIG_MTD_KeyTechnology
Remove unused board type CONFIG_MTD_KeyTechnology.
Pointed out by Robert P. J. Day <rpjday at mindspring.com>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d259c329835bc1c17eca1dac7604baaf2d895e73
Author: Greg Ungerer <gerg at snapgear.com>
Date: Thu May 1 12:16:53 2008 +1000
m68knommu: fix 5206e UART init function naming
Fix ColdFire 5206e platform UART init function naming.
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 779125c274446e873f262e24853353eaf0002719
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date: Thu May 1 12:16:46 2008 +1000
m68knommu: add some missing sections into the linker script
Add some missing sections into the linker script.
Those are required for spinlocks & kallsyms.
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f6054e2131d8f5d43f6686ecc7687994adecc5a2
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date: Thu May 1 12:16:38 2008 +1000
m68knommu: add pretty back strace
With this patch and
CONFIG_FRAME_POINTER=y
CONFIG_KALLSYMS=y
The backtrace shows resolved function names and their numeric
address.
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 008150f53729d188a5c14b1a86725972e15fe5f4
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date: Thu May 1 12:16:33 2008 +1000
m68knommu: add a missing backslash n in setup code
add a missing backslash n in setup code
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a19325a77432338d2710b3ebbe7fd8e6627e81e3
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date: Thu May 1 12:16:29 2008 +1000
m68knommu: ColdFire add support for kernel preemption
As the subject says this patch adds the support for kernel preemption
on m68knommu Coldfire. I thing the same changes could be applied to
68360 & 68328 but since I don't have the HW for testing, I don't touch it.
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2d7f16d6d12682c41fb287ea8261df8e4679f638
Author: Wilson Callan <wcallan at savantav.com>
Date: Thu May 1 12:16:28 2008 +1000
m68knommu: fix signal handling return path
The return from software signal handling pushes code on the stack
that system calls to the kernels cleanup code. This is borrowed
directly from the m68k linux signal handler.
The rt signal case is not quite right for the restricted instruction
set of the ColdFire parts. And neither the normal signal case or rt
signal case properly flushes/pushes the appropriate cache lines.
Rework the return path to just call back through some code fragments
in the kernel proper (with no MMU in the way we can do this). No
cache problems, and less code overall.
Original patch submitted by Wilson Callan <wcallan at savantav.com>
Greg fixed the rt signal return path to use the proper system call
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 10ed2195bb8aef4358223f07bb00e8cf9b278bf2
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu May 1 04:35:20 2008 -0700
drivers/scsi/mvsas.c: fix printk warnings
drivers/scsi/mvsas.c: In function `mvs_update_phyinfo':
drivers/scsi/mvsas.c:2822: warning: long long unsigned int format, u64 arg (arg 5)
drivers/scsi/mvsas.c:2822: warning: long long unsigned int format, u64 arg (arg 6)
We do not know what type the arch uses to implement u64.
Cc: Ke Wei <kewei at marvell.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 726792b26b66c41f650e4a0c2f7b9e1fc16473a4
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu May 1 04:35:20 2008 -0700
drivers/scsi/ncr53c8xx.c: fix warning
drivers/scsi/ncr53c8xx.c: In function 'process_waiting_list':
drivers/scsi/ncr53c8xx.c:8225: warning: suggest parentheses around assignment used as truth value
recently added by
commit 172c122df5186e7cbd413d61757ff90267331002
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 16:50:03 2008 -0700
scsi: fix integer as NULL pointer warnings
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5098021e1ed91388ab7f3984650e95a5584450c3
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu May 1 04:35:19 2008 -0700
drivers-char-synclinkc-inbreak-mgsl_put_char-fix
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Cc: Jiri Slaby <jirislaby at gmail.com>
Cc: Paul Fulghum <paulkf at microgate.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 076482307ff1acfe88d5ad1a3fbfbac5cc8d7ad4
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu May 1 04:35:18 2008 -0700
drivers/char/synclink.c: unbreak mgsl_put_char()
Repair the effects of
commit 55da77899c1472d83452c914fa179d00ea96df65
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:07 2008 -0700
synclink series: switch to int put_char method
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Paul Fulghum <paulkf at microgate.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
drivers/char/synclink_gt.c: In function 'put_char':
drivers/char/synclink_gt.c:919: warning: 'ret' may be used uninitialized in this function
and do some whitespace repair and unneeded-cast-removal in there as well.
Cc: Paul Fulghum <paulkf at microgate.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 24c03d47d0481ed7b172b398f6c9b7ca1fafb9fa
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 1 04:35:17 2008 -0700
block: remove remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e37d05dad7ff9744efd8ea95a70d389e9a65a6fc
Author: Mike Travis <travis at sgi.com>
Date: Thu May 1 04:35:16 2008 -0700
cpu: change cpu_sys_devices from array to per_cpu variable
Change cpu_sys_devices from array to per_cpu variable in drivers/base/cpu.c.
Signed-off-by: Mike Travis <travis at sgi.com>
Cc: Ashok Raj <ashok.raj at intel.com>
Cc: Vivek Goyal <vgoyal at in.ibm.com>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Suresh Siddha <suresh.b.siddha at intel.com>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bd7309677c937bf23296f6c81027123c84c5cc5c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 1 04:35:15 2008 -0700
fuse: use clamp() rather than nested min/max
clamp() exists for this use.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Miklos Szeredi <miklos at szeredi.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3dfcf9c4bf1fda4aa75861bcf6c50607dd322fe5
Author: Denis V. Lunev <den at openvz.org>
Date: Thu May 1 04:35:14 2008 -0700
cciss: assign PDE->data before gluing PDE into /proc tree
Simply replace proc_create and further data assigned with proc_create_data.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Alexey Dobriyan <adobriyan at openvz.org>
Cc: Eric W. Biederman <ebiederm at xmission.com>
Acked-by: Mike Miller <mike.miller at hp.com>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8a3e77cc212f3bc8eccc95e0d046405cf2a02764
Author: Andrew Liu <shengping.liu at windriver.com>
Date: Thu May 1 04:35:14 2008 -0700
workqueue: remove redundant function invocation
timer_stats_timer_set_start_info is invoked twice, additionally, the
invocation of this function can be moved to where it is only called when a
delay is really required.
Signed-off-by: Andrew Liu <shengping.liu at windriver.com>
Cc: Pavel Machek <pavel at ucw.cz>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 55e462b05b5df4fd113c4a304c4f487d44b0898e
Author: Balaji Rao <balajirrao at gmail.com>
Date: Thu May 1 04:35:12 2008 -0700
memcg: simple stats for memory resource controller
Implement trivial statistics for the memory resource controller.
Signed-off-by: Balaji Rao <balajirrao at gmail.com>
Acked-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Cc: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f39e578172f30d3bdd4533465c7ec00db738eb9d
Author: Will Newton <will.newton at gmail.com>
Date: Thu May 1 04:35:10 2008 -0700
gpio: pca953x: add support for pca9555 I2C I/O expander
Add support for pca9555 I2C I/O expander. As the comment suggests this part
is software compatible with the pca9539.
Signed-off-by: Will Newton <will.newton at imgtec.com>
Cc: "eric miao" <eric.miao at marvell.com>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 868eb7a8539d3e8c494209be2b1f4084a274dfef
Author: Jan Blunck <jblunck at suse.de>
Date: Thu May 1 04:35:10 2008 -0700
autofs: path_{get,put}() cleanups
Here are some more places where path_{get,put}() can be used instead of
dput()/mntput() pair. Besides that it fixes a bug in autofs4_mount_busy()
where mntput() was called before dput().
Signed-off-by: Jan Blunck <jblunck at suse.de>
Cc: Ian Kent <raven at themaw.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9d2de6ad2a78bb8b60bf7a54e6043dca44e9a801
Author: Jeff Moyer <jmoyer at redhat.com>
Date: Thu May 1 04:35:09 2008 -0700
autofs4: fix incorrect return from root.c:try_to_fill_dentry()
Jeff Moyer has identified a case where the autofs4 function
root.c:try_to_fill_dentry() can return -EBUSY when it should return 0.
Jeff's description of the way this happens is:
"automount starts an expire for directory d. after the callout to the daemon,
but before the rmdir, another process tries to walk into the same directory.
It puts itself onto the waitq, pending the expiration.
When the expire finishes, the second process is woken up. In
try_to_fill_dentry, it does this check:
status = d_invalidate(dentry);
if (status != -EBUSY)
return -EAGAIN;
And status is EBUSY. The dentry still has a non-zero d_inode, and the
flags do not contain LOOKUP_CONTINUE or LOOKUP_DIRECTORY
So, we fall through and return -EBUSY to the caller."
Signed-off-by: Jeff Moyer <jmoyer at redhat.com>
Signed-off-by: Ian Kent <raven at themaw.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 033790449ba9c4dcf8478a87693d33df625c23b5
Author: Jeff Moyer <jmoyer at redhat.com>
Date: Thu May 1 04:35:08 2008 -0700
autofs4: fix execution order race in mount request code
Jeff Moyer has identified a race in due to an execution order dependency
in the autofs4 function root.c:try_to_fill_dentry().
Jeff's description of this race is:
"P1 does a lookup of /mount/submount/foo. Since the VFS can't find an entry
for "foo" under /mount/submount, it calls into the autofs4 kernel module to
allocate a new dentry, D1. The kernel creates a new waitq for this lookup and
calls the daemon to perform the mount.
The daemon performs a mkdir of the "foo" directory under /mount/submount,
which ends up creating a *new* dentry, D2.
Then, P2 does a lookup of /mount/submount/foo. The VFS path walking logic
finds a dentry in the dcache, D2, and calls the revalidate function with this.
In the autofs4 revalidate code, we then trigger a mount, since the dentry is
an empty directory that isn't a mountpoint, and so set DCACHE_AUTOFS_PENDING
and call into the wait code to trigger the mount.
The wait code finds our existing waitq entry (since it is keyed off of the
directory name) and adds itself to the list of waiters.
After the daemon finishes the mount, it calls back into the kernel to release
the waiters. When this happens, P1 is woken up and goes about clearing the
DCACHE_AUTOFS_PENDING flag, but it does this in D1! So, given that P1 in our
case is a program that will immediately try to access a file under
/mount/submount/foo, we end up finding the dentry D2 which still has the
pending flag set, and we set out to wait for a mount *again*!
So, one way to address this is to re-do the lookup at the end of
try_to_fill_dentry, and to clear the pending flag on the hashed dentry. This
seems a sane approach to me."
And Jeff's patch does this.
Signed-off-by: Jeff Moyer <jmoyer at redhat.com>
Signed-off-by-by: Ian Kent <raven at themaw.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cab0936aac8aa907c6bb814c2cf26385478f254b
Author: Ian Kent <raven at themaw.net>
Date: Thu May 1 04:35:07 2008 -0700
autofs4: check for invalid dentry in getpath
Catch invalid dentry when calculating its path.
Signed-off-by: Ian Kent <raven at themaw.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit afec570c32a0d116e3c68af583ed1d11110f12fc
Author: Ian Kent <raven at themaw.net>
Date: Thu May 1 04:35:06 2008 -0700
autofs4: fix sparse warning in waitq.c:autofs4_expire_indirect()
Re-order some code in expire.c:autofs4_expire_indirect() to avoid compile
warning, reported by Harvey Harrison:
CHECK fs/autofs4/expire.c
fs/autofs4/expire.c:383:2: warning: context imbalance in
'autofs4_expire_indirect' - unexpected unlock
Signed-off-by: Ian Kent <raven at themaw.net>
Reviewed-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c32e026efc1e1a4f9e36babebf123f2b88205b0b
Author: Jan Kara <jack at suse.cz>
Date: Thu May 1 04:35:05 2008 -0700
quota: add a convenience macro for filesystems
Note that it cannot be an inline function because we don't have struct
super_block prototype...
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0d34aa4d5a3e5d141bb4d07ed5d4bf02d4d4998a
Author: Matthew Wilcox <matthew at wil.cx>
Date: Thu May 1 04:35:04 2008 -0700
spi_s3c24xx signedness fix
On Fri, Apr 18, 2008 at 09:08:55PM +0200, Julia Lawall wrote:
> I found 63 occurrences of this problem with the following semantic match
> (http://www.emn.fr/x-info/coccinelle/):
>
> @@ unsigned int i; @@
>
> * i < 0
>
Since this one's always in the range 0-255, it could probably be made
signed, but it's just as easy to make it work unsigned.
Reported-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8eeb12e5a2486ab958fa27ec97e71dabf234b73b
Author: Vitja Makarov <vitja.makarov at gmail.com>
Date: Thu May 1 04:35:03 2008 -0700
spi_bfin5xx: use PIO for full duplex, not DMA
Use PIO for full-duplex transfers, instead of DMA.
Signed-off-by: Vitja Makarov <vitja.makarov at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ef3fb66ced1a890769d71a4f4ae9f68b8afa98b6
Author: Jean Delvare <khali at linux-fr.org>
Date: Thu May 1 04:35:01 2008 -0700
dmi: clean-up dmi helper declarations
The declaration of dmi helper functions is a bit messy and inconsistent at the
moment:
* On ia64 they are declared in <asm/io.h>.
* On x86-64 they are declared in <asm/dmi.h>.
* On i386 they are declared both in <asm/io.h> and <asm/dmi.h>.
Fix the header files so that the dmi helper functions are consistently
defined in <asm/dmi.h>.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: Matt Domsch <Matt_Domsch at dell.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 99da9047e675a4a8d671bbd67b34eb096c308b0d
Author: Scott Kilau <scottk at digi.com>
Date: Thu May 1 04:35:00 2008 -0700
jsm: add new supported board to jsm serial driver
Add new PCI Express Neo/JSM board to the supported list of drivers in
the JSM driver.
Signed-off-by: Scott Kilau <scottk at digi.com>
Acked-by: Ananda V <avenkat at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6f441fe99814f64315b8c11890744230b990c460
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Thu May 1 04:34:59 2008 -0700
8250: switch 8250 drivers to use _nocache ioremaps
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4ed99a27d161ce6f1eb6657c5cd5e6aef365c665
Author: Jochen Eisinger <jochen at penguin-breeder.org>
Date: Thu May 1 04:34:58 2008 -0700
i8k: make fan multiplier tunable with a module parameter
The i8k driver multiplies the fan speed reported by the BIOS with a factor of
30. On my Dell Latitude D800, this factor is not required.
I'd suggest to make this configurable.
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit af8e2a4cb9b3e14b919ae1cd4012825aefddbeb0
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Thu May 1 04:34:57 2008 -0700
idr: fix idr_remove()
The return inside the loop makes us free only a single layer.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: "Paul E. McKenney" <paulmck at us.ibm.com>
Cc: Manfred Spraul <manfred at colorfullife.com>
Cc: Jim Houston <jim.houston at comcast.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7793bfcfccc91d036d61618d90baf2be3d76e710
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Thu May 1 04:34:55 2008 -0700
PNP: fix printk format warnings
next-20080430/drivers/pnp/pnpbios/rsparser.c:594: warning: format '%d' expects type 'int', but argument 4 has type 'resource_size_t'
next-20080430/drivers/pnp/pnpbios/rsparser.c:605: warning: format '%d' expects type 'int', but argument 4 has type 'resource_size_t'
[joe at perches.com: fix it]
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Joe Perches <joe at perches.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2e11cb4c52ffbadab4844b28803577ba7272b221
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 1 04:34:54 2008 -0700
pcmcia: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 23d077e28127ea96408032edcf9dd7062a0daaa3
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu May 1 04:34:54 2008 -0700
drivers/pcmcia/soc_common.c: convert soc_pcmcia_sockets_lock into a mutex and make it static
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 12d1e75d3d4d2748f5db308d9b5d5b873435c308
Author: Matthias Kaehlcke <matthias at kaehlcke.net>
Date: Thu May 1 04:34:53 2008 -0700
Alchemy Semi Au1000 pcmcia driver: convert pcmcia_sockets_lock in a mutex
Alchemy Semi Au1000 pcmcia driver: The semaphore pcmcia_sockets_lock
is used as a mutex, convert it to the mutex API
(akpm: make it static too)
Signed-off-by: Matthias Kaehlcke <matthias at kaehlcke.net>
Cc: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e772d782a6b0f14d491a95445f0ec6767d66fb29
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Thu May 1 04:34:52 2008 -0700
pcmcia: annotate cb_alloc with __ref
cb_alloc() uses a function (pci_scan_slot) that will be annotated __devinit.
Annotate cb_alloc() with __ref to tell modpost to ignore this reference.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Dominik Brodowski <linux at dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ba66ddfa613886cbb554f7b064dc05bdc2c7138b
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Thu May 1 04:34:51 2008 -0700
pcmcia: silence section mismatch warnings from pci_driver variables
Silence following warnings:
WARNING: drivers/pcmcia/built-in.o(.data+0x14e0): Section mismatch in reference from the variable pd6729_pci_drv to the function .devinit.text:pd6729_pci_probe()
WARNING: drivers/pcmcia/built-in.o(.data+0x14e8): Section mismatch in reference from the variable pd6729_pci_drv to the function .devexit.text:pd6729_pci_remove()
WARNING: drivers/pcmcia/built-in.o(.data+0x16c0): Section mismatch in reference from the variable i82092aa_pci_drv to the function .devinit.text:i82092aa_pci_probe()
WARNING: drivers/pcmcia/built-in.o(.data+0x16c8): Section mismatch in reference from the variable i82092aa_pci_drv to the function .devexit.text:i82092aa_pci_remove()
Rename the variables from *_drv to *_driver so modpost ignore the OK
references to __devinit/__devexit functions.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Dominik Brodowski <linux at dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ed49f5d0015927334dcca3607a9bfc1478ff8f55
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Thu May 1 04:34:50 2008 -0700
pcmcia: silence section mismatch warnings from class_interface variables
Silence the following warnings:
WARNING: drivers/pcmcia/built-in.o(.data+0x6e8): Section mismatch in reference from the variable pcmcia_bus_interface to the function .devinit.text:pcmcia_bus_add_socket()
WARNING: drivers/pcmcia/built-in.o(.data+0xa88): Section mismatch in reference from the variable pccard_rsrc_interface to the function .devinit.text:pccard_sysfs_add_rsrc()
WARNING: drivers/pcmcia/built-in.o(.data+0xa90): Section mismatch in reference from the variable pccard_rsrc_interface to the function .devexit.text:pccard_sysfs_remove_rsrc()
The variables of type class_interface contains references
to __devinit and __devexit functions which is OK.
Silence warnings by annotating the variables with __refdata.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Dominik Brodowski <linux at dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit be089d79c46f5efa77fbdf03c5e576e220bf143f
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu May 1 04:34:49 2008 -0700
kexec: make extended crashkernel= syntax less confusing
The extended crashkernel syntax is a little confusing in the way it handles
ranges. eg:
crashkernel=512M-2G:64M,2G-:128M
Means if the machine has between 512M and 2G of memory the crash region should
be 64M, and if the machine has 2G of memory the region should be 64M. Only if
the machine has more than 2G memory will 128M be allocated.
Although that semantic is correct, it is somewhat baffling. Instead I propose
that the end of the range means the first address past the end of the range,
ie: 512M up to but not including 2G.
[bwalle at suse.de: clarify inclusive/exclusive in crashkernel commandline in documentation]
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Acked-by: Bernhard Walle <bwalle at suse.de>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Simon Horman <horms at verge.net.au>
Signed-off-by: Bernhard Walle <bwalle at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c85d194bfd2e36c5254b8058c1f35cfce0dfa10a
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Thu May 1 04:34:48 2008 -0700
docbook: fix vmalloc missing parameter notation
Fix vmalloc kernel-doc warning:
Warning(linux-2.6.25-git14//mm/vmalloc.c:555): No description found for parameter 'caller'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5045790589bd426b5d515d78fa71f0fc92dd4e83
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 1 04:34:47 2008 -0700
isdn: hysdn_procconf.c build fix
x86.git randconfig testing found the following build error in latest
-git:
CC [M] drivers/isdn/hysdn/hysdn_procconf.o
CC [M] drivers/isdn/hysdn/hysdn_init.o
drivers/isdn/hysdn/hysdn_procconf.c: In function 'hysdn_procconf_init':
drivers/isdn/hysdn/hysdn_procconf.c:408: error: too few arguments to function 'proc_create'
with the following config:
http://redhat.com/~mingo/misc/config-Wed_Apr_30_15_12_48_CEST_2008.bad
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Cc: "Denis V. Lunev" <den at openvz.org>
Cc: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3e3a7d666d6db19406ba0865e8116ff59c8af6f1
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Thu May 1 04:34:46 2008 -0700
Embedded Maintainer(s), linux-embedded at vger list
Add Paul and myself, and the linux-embedded list, to MAINTAINERS.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 02c6be615f1fcd37ac5ed93a3ad6692ad8991cd9
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Thu May 1 04:34:45 2008 -0700
vfs: fix permission checking in sys_utimensat
If utimensat() is called with both times set to UTIME_NOW or one of them to
UTIME_NOW and the other to UTIME_OMIT, then it will update the file time
without any permission checking.
I don't think this can be used for anything other than a local DoS, but could
be quite bewildering at that (e.g. "Why was that large source tree rebuilt
when I didn't modify anything???")
This affects all kernels from 2.6.22, when the utimensat() syscall was
introduced.
Fix by doing the same permission checking as for the "times == NULL" case.
Thanks to Michael Kerrisk, whose utimensat-non-conformances-and-fixes.patch in
-mm also fixes this (and breaks other stuff), only he didn't realize the
security implications of this bug.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Ulrich Drepper <drepper at redhat.com>
Cc: Michael Kerrisk <mtk-manpages at gmx.net>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2850699c59d513a0cd0c68f60f75609a5f9d4d32
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Thu May 1 04:34:43 2008 -0700
sysfs: sysfs_update_group stub for CONFIG_SYSFS=n
scsi_transport_spi uses sysfs_update_group() when CONFIG_SYSFS=n, so provide a
stub for it.
next-20080423/drivers/scsi/scsi_transport_spi.c:1467: error: implicit declaration of function 'sysfs_update_group'
make[3]: *** [drivers/scsi/scsi_transport_spi.o] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Greg KH <greg at kroah.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 34990cf702bdf2b4964e0629dab4af7669f8b2c5
Author: David Brownell <david-b at pacbell.net>
Date: Thu May 1 04:34:42 2008 -0700
Add a new sysfs_streq() string comparison function
Add a new sysfs_streq() string comparison function, which ignores
the trailing newlines found in sysfs inputs. By example:
sysfs_streq("a", "b") ==> false
sysfs_streq("a", "a") ==> true
sysfs_streq("a", "a\n") ==> true
sysfs_streq("a\n", "a") ==> true
This is intended to simplify parsing of sysfs inputs, letting them
avoid the need to manually strip off newlines from inputs.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Greg KH <greg at kroah.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7dffa3c673fbcf835cd7be80bb4aec8ad3f51168
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:41 2008 -0700
ntp: handle leap second via timer
Remove the leap second handling from second_overflow(), which doesn't have to
check for it every second anymore. With CONFIG_NO_HZ this also makes sure the
leap second is handled close to the full second. Additionally this makes it
possible to abort a leap second properly by resetting the STA_INS/STA_DEL
status bits.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8383c42399f394a89bd6c2f03632c53689bdde7a
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:39 2008 -0700
ntp: remove current_tick_length()
current_tick_length used to do a little more, but now it just returns
tick_length, which we can also access directly at the few places, where it's
needed.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7fc5c78409479d826341b103bdf734cb4fb02436
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:38 2008 -0700
ntp: rename TICK_LENGTH_SHIFT to NTP_SCALE_SHIFT
As TICK_LENGTH_SHIFT is used for more than just the tick length, the name
isn't quite approriate anymore, so this renames it to NTP_SCALE_SHIFT.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 153b5d054ac2d98ea0d86504884326b6777f683d
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:37 2008 -0700
ntp: support for TAI
This adds support for setting the TAI value (International Atomic Time). The
value is reported back to userspace via timex (as we don't have a
ntp_gettime() syscall).
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9f14f669d18477fe3df071e2fa4da36c00acee8e
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:36 2008 -0700
ntp: increase time_offset resolution
time_offset is already a 64bit value but its resolution barely used, so this
makes better use of it by replacing SHIFT_UPDATE with TICK_LENGTH_SHIFT.
Side note: the SHIFT_HZ in SHIFT_UPDATE was incorrect for CONFIG_NO_HZ and the
primary reason for changing time_offset to 64bit to avoid the overflow.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 074b3b87941c99bc0ce35385b5817924b1ed0c23
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:34 2008 -0700
ntp: increase time_freq resolution
This changes time_freq to a 64bit value and makes it static (the only outside
user had no real need to modify it). Intermediate values were already 64bit,
so the change isn't that big, but it saves a little in shifts by replacing
SHIFT_NSEC with TICK_LENGTH_SHIFT. PPM_SCALE is then used to convert between
user space and kernel space representation.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eea83d896e318bda54be2d2770d2c5d6668d11db
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:33 2008 -0700
ntp: NTP4 user space bits update
This adds a few more things from the ntp nanokernel related to user space.
It's now possible to select the resolution used of some values via STA_NANO
and the kernel reports in which mode it works (pll/fll).
If some values for adjtimex() are outside the acceptable range, they are now
simply normalized instead of letting the syscall fail. I removed
MOD_CLKA/MOD_CLKB as the mapping didn't really makes any sense, the kernel
doesn't support setting the clock.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ee9851b218b8bafa22942b5404505ff3d2d34324
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:32 2008 -0700
ntp: cleanup ntp.c
This is mostly a style cleanup of ntp.c and extracts part of do_adjtimex as
ntp_update_offset(). Otherwise the functionality is still the same as before.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f8bd2258e2d520dff28c855658bd24bdafb5102d
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:31 2008 -0700
remove div_long_long_rem
x86 is the only arch right now, which provides an optimized for
div_long_long_rem and it has the downside that one has to be very careful that
the divide doesn't overflow.
The API is a little akward, as the arguments for the unsigned divide are
signed. The signed version also doesn't handle a negative divisor and
produces worse code on 64bit archs.
There is little incentive to keep this API alive, so this converts the few
users to the new API.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: Ralf Baechle <ralf at linux-mips.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6f6d6a1a6a1336431a6cba60ace9e97c3a496a19
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:28 2008 -0700
rename div64_64 to div64_u64
Rename div64_64 to div64_u64 to make it consistent with the other divide
functions, so it clearly includes the type of the divide. Move its definition
to math64.h as currently no architecture overrides the generic implementation.
They can still override it of course, but the duplicated declarations are
avoided.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: Avi Kivity <avi at qumranet.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Ralf Baechle <ralf at linux-mips.org>
Cc: David Howells <dhowells at redhat.com>
Cc: Jeff Dike <jdike at addtoit.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: Patrick McHardy <kaber at trash.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 71abb3af62dfa52930755f3b6497eafbe1d6ec85
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:26 2008 -0700
convert a few do_div users
This converts a few users of do_div to div_[su]64 and this demonstrates nicely
how it can reduce some expressions to one-liners.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2418f4f28f8467b92a6177af32d05737ebf6206c
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Thu May 1 04:34:25 2008 -0700
introduce explicit signed/unsigned 64bit divide
The current do_div doesn't explicitly say that it's unsigned and the signed
counterpart is missing, which is e.g. needed when dealing with time values.
This introduces 64bit signed/unsigned divide functions which also attempts to
cleanup the somewhat awkward calling API, which often requires the use of
temporary variables for the dividend. To avoid the need for temporary
variables everywhere for the remainder, each divide variant also provides a
version which doesn't return the remainder.
Each architecture can now provide optimized versions of these function,
otherwise generic fallback implementations will be used.
As an example I provided an alternative for the current x86 divide, which
avoids the asm casts and using an union allows gcc to generate better code.
It also avoids the upper divde in a few more cases, where the result is known
(i.e. upper quotient is zero).
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit adafbedf0c31ae1cde62035c82857f5e376af553
Author: David Howells <dhowells at redhat.com>
Date: Thu May 1 04:34:24 2008 -0700
frv: unbreak misalignment handling changes
Fix a reference in a arch/frv/mm/Makefile to unaligned.c which has now been
deleted.
Also revert the change to the guard macro name in include/asm-frv/unaligned.h.
Signed-off-by: David Howells <dhowells at redhat.com>
Cc: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e5e417232e7c9ecc58a77902d2e8dd46792cd092
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Thu May 1 04:34:23 2008 -0700
Fix cpu hotplug problem in softirq code
currently cpu hotplug (unplug) seems broken on s390 and likely others. On cpu
unplug the system starts to behave very strange and hangs.
I bisected the problem to the following commit:
commit 48f20a9a9488c432fc86df1ff4b7f4fa895d1183
Author: Olof Johansson <olof at lixom.net>
Date: Tue Mar 4 15:23:25 2008 -0800
tasklets: execute tasklets in the same order they were queued
Reverting this patch seems to fix the problem. I looked into takeover_tasklet
and it seems that there is a way to corrupt the tail pointer of the current
cpu. If the tasklet list of the frozen cpu is empty, the tail pointer of the
current cpu points to the address of the head pointer of the stopped cpu and
not to the next pointer of a tasklet_struct.
This patch avoids the list splice of the list is empty and cpu hotplug seems
to work as the tail pointer is not corrupted. Olof, can you look into that
patch and ACK/NACK it so Andrew can push this to Linus, if appropriate?
Please note that some lines are longer than 80 chars, but line-wrapping looked
worse that this version.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Acked-by: Olof Johansson <olof at lixom.net>
Acked-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6bffd7b57d747d74ec2962d7c822f4b86e9f64d4
Author: Paul Jackson <pj at sgi.com>
Date: Thu May 1 04:34:21 2008 -0700
cpusets: update maintainers
Update CPUSETS MAINTAINERS to reflect the more active role of Paul Menage
(secondary to his work on cgroups) and the retirement of the original author
of cpusets, Simon Derr. Thanks, Simon! Best of luck to you.
Signed-off-by: Paul Jackson <pj at sgi.com>
Acked-by: Paul Menage <menage at google.com>
Acked-by: Simon Derr <simon.derr at bull.net>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 590fe34c47cb5c2d836ac76fabc5f160bf31a3f1
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Thu May 1 15:53:28 2008 +0100
[JFFS2] Quiet lockdep false positive.
Don't hold f->sem while calling into jffs2_do_create(). It makes lockdep
unhappy, and we don't really need it -- the _reason_ it's a false
positive is because nobody else can see this inode yet and so nobody
will be trying to lock it anyway.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 23f8e4bf7cf0e2125b6d798cc85c031951c763d3
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Thu May 1 14:08:51 2008 +0200
ide: fix early setup of hwif->host_flags
On Thursday 01 May 2008, Jeremy Kerr wrote:
> Hi all,
>
> On QS20 Cell machines, Linus' current git tree explodes on boot:
>
> SiI680: IDE controller (0x1095:0x0680 rev 0x02) at PCI slot
> 0000:00:0a.0
> SiI680: BASE CLOCK == 133
> SiI680: 100% native mode on irq 51
> ide0: MMIO-DMA
> ide1: MMIO-DMA
> Unable to handle kernel paging request for data at address
> 0xa000100081220080
> Faulting instruction address: 0xc000000000024748
> cpu 0x2: Vector: 300 (Data Access) at [c00000001e143420]
> pc: c000000000024748: ._insw_ns+0x10/0x30
> lr: c000000000037fc4: .spiderpci_readsw+0x24/0x6c
> sp: c00000001e1436a0
> msr: 9000000000001032
> dar: a000100081220080
> dsisr: 40000000
> current = 0xc00000003d060000
> paca = 0xc000000000623880
> pid = 1, comm = swapper
> enter ? for help
> [link register ] c000000000037fc4 .spiderpci_readsw+0x24/0x6c
> [c00000001e1436a0] c00000000062ce63 (unreliable)
> [c00000001e143730] c0000000000379d4 .iowa_readsw+0x78/0xa8
> [c00000001e1437c0] c000000000037a98 .iowa_insw+0x94/0xd4
> [c00000001e143850] c00000000022a190 .ata_input_data+0x298/0x2ec
> [c00000001e143910] c00000000022b600 .try_to_identify+0x2c0/0x6d4
> [c00000001e1439d0] c00000000022bb54 .do_probe+0x140/0x35c
> [c00000001e143a80] c00000000022bfbc .ide_probe_port+0x24c/0x670
> [c00000001e143b50] c00000000022d09c .ide_device_add_all+0x2ec/0x690
> [c00000001e143c00] c00000000022d4a4 .ide_device_add+0x64/0x74
> [c00000001e143c90] c00000000022f834 .ide_setup_pci_device+0x58/0x7c
> [c00000001e143d30] c00000000038bdf8
> [c00000001e143e10] c000000000486fb0 .ide_scan_pcibus+0x8c/0x178
> [c00000001e143ea0] c000000000460c00 .kernel_init+0x1c4/0x344
> [c00000001e143f90] c000000000024a1c .kernel_thread+0x4c/0x68
>
> It looks like we're trying to do PIO accesses (which appear to be
> broken, but that's another issue) to this MMIO device. In
> ata_input_data, we see that:
>
> u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
>
> Gives mmio == 0.
>
> (what's the difference between hwif->mmio and ID_HFLAG_MMIO?)
>
> In the siimage driver, hwif->host flags is initially set up correctly
> (host_flags includes IDE_HFLAG_MMIO), but we then *clear* this bit in
> ide_init_port:
>
> hwif->host_flags = d->host_flags;
>
> where d is the struct ide_port_info for this chipset. In my case,
> d->host_flags is 0x0. It looks like this will be the same for all of
> the siimage chipsets.
Don't over-write hwif->host_flags in ide_init_port(), some host drivers
set IDE_HFLAG_MMIO or IDE_HFLAG_NO_IO_32BIT host flag early.
Thanks to Jeremy Kerr for the excellent analysis of the bug.
Reported-by: Jeremy Kerr <jk at ozlabs.org>
Tested-by: Jeremy Kerr <jk at ozlabs.org>
Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Cc: Ben Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 4f02f8220562591322c118d07a32bebf705318b7
Merge: 1852448652fd526d56099256dadc4ef32cb1b10e 809307768cb177621b8f45f87fa840993ca4cb60
Author: Mark M. Hoffman <mhoffman at lightlink.com>
Date: Thu May 1 07:33:17 2008 -0400
Merge branch 'smsc47b397-new-id' into release
commit 4e571aba7bb25a3a069a7b88c0f63fe5a14c05c6
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Thu May 1 12:28:04 2008 +0100
[JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once()
Ditch a couple of pointless casts from void *, and use the normal
variable name 'f' for jffs2_inode_info pointers -- especially since
it actually shows up in lockdep reports.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit df4b565e1fbc777bb6e274378a41fa8ff7485680
Author: Peter Oberparleiter <peter.oberparleiter at de.ibm.com>
Date: Mon Apr 21 14:34:31 2008 +0200
module: add MODULE_STATE_GOING notifier call
Provide module unload callback. Required by the gcov profiling
infrastructure to keep track of profiling data structures.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter at de.ibm.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit b211104d111c99dbb97c636b57bd9db711455684
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Thu May 1 21:15:00 2008 -0500
module: Enhance verify_export_symbols
Make verify_export_symbols check the modules unused, unused_gpl and
gpl_future syms.
Inspired by Jan Beulich's fix, but table-driven.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 4e2d92454b2d822fe1d474efabccc2a3806d5f86
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Thu May 1 21:15:00 2008 -0500
module: set unused_gpl_crcs instead of overwriting unused_crcs
Obvious typo, but I don't know of any modules with unused GPL exports,
and then it would take someone noticing that the version shouldn't
have matched in a dependent module.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit ad9546c9917d44eddc7676b639296d624cee455e
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Thu May 1 21:14:59 2008 -0500
module: neaten __find_symbol, rename to find_symbol
__find_symbol() has grown over time: there are now 5 different arrays
of symbols it traverses. It also shouldn't print out a warning on
some calls (ie. verify_symbol which simply checks for name clashes,
and __symbol_put which checks for bugs).
1) Rename to find_symbol: no need for underscores.
2) Use bool and add "warn" parameter to suppress warnings.
3) Make table-driven rather than open coded.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit ea01e798e2d27fd04142e0473ca36570fa9d9218
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Thu Mar 13 09:02:17 2008 +0000
module: reduce module image and resident size
Resulting reduction (x86-64, gcc 4.1.2) with my (special purpose, i.e.
much reduced) configurations:
- 16k kernel resident size
- 180k module resident size
- 10k module image size
Signed-off-by: Jan Beulich <jbeulich at novell.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit a58730c42174672fe0012a4edbe3e38f94ef2bad
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Thu Mar 13 09:03:44 2008 +0000
module: make module_sect_attrs private to kernel/module.c
No-one else is using these afaics.
Signed-off-by: Jan Beulich <jbeulich at novell.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit b1145ce395f7785487c128fe8faf8624e6586d84
Author: Julia Lawall <julia at diku.dk>
Date: Wed Apr 30 00:27:14 2008 +0800
[CRYPTO] cryptd: Correct kzalloc error test
Normally, kzalloc returns NULL or a valid pointer value, not a value to be
tested using IS_ERR.
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 46f8153cc59384eb09a426d044668d4801f818ce
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date: Tue Apr 29 21:57:01 2008 +0800
[CRYPTO] eseqiv: Fix off-by-one encryption
After attaching the IV to the head during encryption, eseqiv does not
increase the encryption length by that amount. As such the last block
of the actual plain text will be left unencrypted.
Fortunately the only user of this code hifn currently crashes so this
shouldn't affect anyone :)
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 8ec970d8561abb5645d4602433b772e268c96d05
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date: Tue Apr 29 21:53:52 2008 +0800
[CRYPTO] api: Fix scatterwalk_sg_chain
When I backed out of using the generic sg chaining (as it isn't currently
portable) and introduced scatterwalk_sg_chain/scatterwalk_sg_next I left
out the sg_is_last check in the latter. This causes it to potentially
dereference beyond the end of the sg array.
As most uses of scatterwalk_sg_next are bound by an overall length, this
only affected the chaining code in authenc and eseqiv. Thanks to Patrick
McHardy for identifying this problem.
This patch also clears the "last" bit on the head of the chained list as
it's no longer last. This also went missing in scatterwalk_sg_chain and
is present in sg_chain.
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 161613293fd4b7d5ceb1faab788f47e688e07a67
Author: Patrick McHardy <kaber at trash.net>
Date: Tue Apr 29 21:44:28 2008 +0800
[CRYPTO] authenc: Fix async crypto crash in crypto_authenc_genicv()
crypto_authenc_givencrypt_done uses req->data as struct aead_givcrypt_request,
while it really points to a struct aead_request, causing this crash:
BUG: unable to handle kernel paging request at 6b6b6b6b
IP: [<dc87517b>] :authenc:crypto_authenc_genicv+0x23/0x109
*pde = 00000000
Oops: 0000 [#1] PREEMPT DEBUG_PAGEALLOC
Modules linked in: hifn_795x authenc esp4 aead xfrm4_mode_tunnel sha1_generic hmac crypto_hash]
Pid: 3074, comm: ping Not tainted (2.6.25 #4)
EIP: 0060:[<dc87517b>] EFLAGS: 00010296 CPU: 0
EIP is at crypto_authenc_genicv+0x23/0x109 [authenc]
EAX: daa04690 EBX: daa046e0 ECX: dab0a100 EDX: daa046b0
ESI: 6b6b6b6b EDI: dc872054 EBP: c033ff60 ESP: c033ff0c
DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
Process ping (pid: 3074, ti=c033f000 task=db883a80 task.ti=dab6c000)
Stack: 00000000 daa046b0 c0215a3e daa04690 dab0a100 00000000 ffffffff db9fd7f0
dba208c0 dbbb1720 00000001 daa04720 00000001 c033ff54 c0119ca9 dc852a75
c033ff60 c033ff60 daa046e0 00000000 00000001 c033ff6c dc87527b 00000001
Call Trace:
[<c0215a3e>] ? dev_alloc_skb+0x14/0x29
[<c0119ca9>] ? printk+0x15/0x17
[<dc87527b>] ? crypto_authenc_givencrypt_done+0x1a/0x27 [authenc]
[<dc850cca>] ? hifn_process_ready+0x34a/0x352 [hifn_795x]
[<dc8353c7>] ? rhine_napipoll+0x3f2/0x3fd [via_rhine]
[<dc851a56>] ? hifn_check_for_completion+0x4d/0xa6 [hifn_795x]
[<dc851ab9>] ? hifn_tasklet_callback+0xa/0xc [hifn_795x]
[<c011d046>] ? tasklet_action+0x3f/0x66
[<c011d230>] ? __do_softirq+0x38/0x7a
[<c0105a5f>] ? do_softirq+0x3e/0x71
[<c011d17c>] ? irq_exit+0x2c/0x65
[<c010e0c0>] ? smp_apic_timer_interrupt+0x5f/0x6a
[<c01042e4>] ? apic_timer_interrupt+0x28/0x30
[<dc851640>] ? hifn_handle_req+0x44a/0x50d [hifn_795x]
...
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit ab59859de1946a098b091308380179e92dc7683b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 1 02:47:38 2008 -0700
net: fix returning void-valued expression warnings
drivers/net/8390.c:37:2: warning: returning void-valued expression
drivers/net/bnx2.c:1635:3: warning: returning void-valued expression
drivers/net/xen-netfront.c:1806:2: warning: returning void-valued expression
net/ipv4/tcp_hybla.c:105:3: warning: returning void-valued expression
net/ipv4/tcp_vegas.c:171:3: warning: returning void-valued expression
net/ipv4/tcp_veno.c:123:3: warning: returning void-valued expression
net/sysctl_net.c:85:2: warning: returning void-valued expression
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c2a3b233450d5bc426c063ea2d8a74351db29ea4
Merge: e4c576b911e364737b1bf4f5bfdab1c440713f26 c0d43990768b6ca83604ff4be80425b89d317e2f
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 1 02:06:32 2008 -0700
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
commit e4c576b911e364737b1bf4f5bfdab1c440713f26
Author: Theodore Ts'o <tytso at MIT.EDU>
Date: Wed Apr 30 21:55:48 2008 -0400
Update .gitignore to include include/linux/bounds.h
(which is autogenerated by kbuild)
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ccc751841567816532874afcaeb449dbf6ca7d3a
Merge: 214b7049a7929f03bbd2786aaef04b8b79db34e2 809917903127804c2b2ac76342ab0f29f4b394d3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 20:13:22 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipv6: Compilation fix for compat MCAST_MSFILTER sockopts.
commit 214b7049a7929f03bbd2786aaef04b8b79db34e2
Author: Al Viro <viro at ZenIV.linux.org.uk>
Date: Thu May 1 03:52:22 2008 +0100
Fix dnotify/close race
We have a race between fcntl() and close() that can lead to
dnotify_struct inserted into inode's list *after* the last descriptor
had been gone from current->files.
Since that's the only point where dnotify_struct gets evicted, we are
screwed - it will stick around indefinitely. Even after struct file in
question is gone and freed. Worse, we can trigger send_sigio() on it at
any later point, which allows to send an arbitrary signal to arbitrary
process if we manage to apply enough memory pressure to get the page
that used to host that struct file and fill it with the right pattern...
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6d98ca736441029e4e87ad3b6dc4a8645dc4c6d3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 19:50:03 2008 -0700
x86: Mark OPTIMIZE_INLINING broken
So Ingo finally did figure out why UML broke with this option: UML
passes gcc the -fno-unit-at-a-time flag, and apparently that wreaks
havoc with gcc's inlining.
We could turn off -fno-unit-at-a-time for UML for gcc4+ (which is what
x86 does), but there's bad blood about this whole option, and it does
show that the thing is just fragile as heck.
So let tempers cool, and disable the thing, and we can revisit the
decision later.
Cc: Adrian Bunk <bunk at kernel.org>
Cc: David Miller <davem at davemloft.net>
Acked-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 57ce41d1d18279cc90223f3deadca70c7de1cfca
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date: Wed Apr 30 20:02:45 2008 -0700
IB/ipoib: Fix transmit queue stalling forever
Commit f56bcd80 ("IPoIB: Use separate CQ for UD send completions")
introduced a bug where the transmit queue could get stopped and never
woken up. The problem is that send completions are only polled at the
end of the xmit function, so if the send queue fills up and the xmit
path stops the queue, then there is no way for send completions to
ever get polled, and so the transmit queue stays stopped forever.
Fix this by arming the send CQ just before posting the last send
request that fills the send queue. Then, when the completion event
handler is called, drain the send CQ. Since it is possible that not
enough send completions are in the CQ, verify that the the net queue
has been woken up after draining the send CQ, and if not arm a timer
and drain again at the timer function.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 3ae15e1623b9d32eb410c2a23d90e47b16e6acd0
Author: Roland Dreier <rolandd at cisco.com>
Date: Wed Apr 30 19:52:55 2008 -0700
IB/mlx4: Fix off-by-one errors in calls to mlx4_ib_free_cq_buf()
When I merged bbf8eed1 ("IB/mlx4: Add support for resizing CQs") I
changed things around so that mlx4_ib_alloc_cq_buf() and
mlx4_ib_free_cq_buf() were used everywhere they could be. However, I
screwed up the number of entries passed into mlx4_ib_alloc_cq_buf()
in a couple places -- the function bumps the number of entries
internally, so the caller shouldn't add 1 as well.
Passing a too-big value for the number of entries to mlx4_ib_free_cq_buf()
can cause the cleanup to go off the end of an array and corrupt
allocator state in interesting ways.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 958a2f29a6520a1d2973077ce7854ea9a44f48a2
Merge: 6de3d58dcfbab516dbe9aff36ea9542f40cd1bf2 895d30935ebe05f192e844792668bf8d19deaae7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 19:31:52 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes3
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes3: (21 commits)
x86: numaq fix
x86: 8K stacks by default
x86: ioremap ram check fix
x86: fix HT cpu booting on 32-bit
x86: optimize inlining off
x86: CONFIG_X86_ELAN fix
x86: Kconfig fix
x86 PAT: fix performance drop for glx, use UC minus for ioremap(), ioremap_nocache() and pci_mmap_page_range()
x86: use defconfigs from x86/configs/*
toshiba: use ioremap_cached
revert: "x86: ioremap(), extend check to all RAM pages"
x86: don't bother printing compat vdso address
fix: x86: support for new UV apic
x86: fix early-BUG message
x86: iommu_sac_force can become static
x86: add proper header for reboot_force
x86 VISWS: build fix
x86, voyager: fix ioremap_nocache()
hpet: fix
x86: unexport kmap_atomic_to_page
...
commit c0d43990768b6ca83604ff4be80425b89d317e2f
Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
Date: Tue Apr 29 10:07:56 2008 +0200
libertas: fix use-before-check violation
According to Coverity (kudo's to Adrian Bunk), we had one use-before-check
bug in libe libertas driver. This patch fixes this issue.
Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 2e35af143a1380173ba292e48e9b4913ef16b4ee
Author: Michael Buesch <mb at bu3sch.de>
Date: Sun Apr 27 19:06:18 2008 +0200
b43: Fix dual-PHY devices
This fixes operation of dual-PHY (A/B/G) devices.
Do not anounce the A-PHY to mac80211, as that's not supported, yet.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 17f830459d6116ae13dbcfc9d09a406e6717b1a6
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Sun Apr 27 03:48:40 2008 -0700
mac80211: incorrect shift direction
Looks like 5d2cdcd4e85c5187db30a6b29f79fbbe59f39f78 ("mac80211: get a
TKIP phase key from skb") got the shifts wrong.
Noticed by sparse:
net/mac80211/tkip.c:234:25: warning: right shift by bigger than source value
net/mac80211/tkip.c:235:25: warning: right shift by bigger than source value
net/mac80211/tkip.c:236:25: warning: right shift by bigger than source value
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 636c5d488bc0b349e01cf5bfbf85588134af70a0
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Thu Apr 24 14:18:37 2008 +0200
mac80211: insert WDS peer after adding interface
This reorders the open code so that WDS peer STA info entries
are added after the corresponding interface is added to the
driver so that driver callbacks aren't invoked out of order.
Also make any master device startup fatal.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e94e106831403d5028e7bb73c3163951134de1ba
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Thu Apr 24 14:16:36 2008 +0200
mac80211: don't allow invalid WDS peer addresses
Rather than just disallowing the zero address, disallow all
invalid ones.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 8b808bf29bdafe9270cb283ea093bb87f5a3be19
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Wed Apr 23 23:35:09 2008 +0200
mac80211: assign conf.beacon_control for mesh
Drivers can rightfully assume that they get a beacon_control
if the beacon is set.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 51ceddade0fb1e15f080b2555f3b3e1d68c6707e
Author: Luis Carlos Cobo <luisca at cozybit.com>
Date: Wed Apr 23 12:15:29 2008 -0700
mac80211: use 4-byte mesh sequence number
This follows the new 802.11s/D2.0 draft.
Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4ba1c5bfd2e5a6c9528eb7777b66c297e70f61ca
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Fri Apr 18 15:03:59 2008 -0700
ocfs2: Use GFP_NOFS in kmalloc during localalloc window move
kmalloc() during a localalloc window move can trigger the mm to prune
the dcache which inturn can trigger the fs to delete an inode causing
it start a recursive transaction.
The fix also makes the change in kmalloc during localalloc shutdown
just to be safe.
Fixes oss bugzilla#901
http://oss.oracle.com/bugzilla/show_bug.cgi?id=901
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit bc535809c06ada210d89f5a43b335c68ecbb8e1b
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Fri Apr 18 10:23:53 2008 -0700
ocfs2: Allow uid/gid/perm changes of symlinks
This patch adds the ability to change attributes of a symlink.
Fixes oss bugzilla#963
http://oss.oracle.com/bugzilla/show_bug.cgi?id=963
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 95642e56647d84963428a1168baa8a73cb782ac3
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 11:49:37 2008 +0300
ocfs2/dlm: dlmdebug.c: make 2 functions static
This patch makes the following needlessly global functions static:
- stringify_lockname()
- dlm_debug_put()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 4af694e672aaa85940d6e29d27b7eeea5f6eb258
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 11:49:31 2008 +0300
ocfs2: make struct o2cb_stack_ops static
This patch makes the needlessly global struct o2cb_stack_ops static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 4d8755b5e667df8f01647773ba744a5ac97e68e6
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 11:49:26 2008 +0300
ocfs2: make struct ocfs2_control_device static
This patch makes the needlessly global struct ocfs2_control_device
static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 9d80f7539a91c0154e40fc9e4ae5e818dd8f102e
Author: Joel Becker <Joel.Becker at oracle.com>
Date: Tue Apr 22 11:46:44 2008 -0700
ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)
Commit 52f7c21b613f80cb425d115c9e5b4ed958a133c0 was intended to move
/sys/o2cb to /sys/fs/o2cb, providing /sys/o2cb as a symlink for
backwards compatibility. However, the merge apparently added the
symlink but failed to move the directory, resulting in a duplicate
filename error. It's a one-line change that was missing.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 6de3d58dcfbab516dbe9aff36ea9542f40cd1bf2
Merge: e0066c4ea9ffa420cb79814411ff74fdc7b7d98e c3bb7fadaf52de3637b834002dac27f6250b4b49
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 17:05:21 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
klist: fix coding style errors in klist.h and klist.c
driver core: remove no longer used "struct class_device"
pcmcia: remove pccard_sysfs_interface warnings
devres: support addresses greater than an unsigned long via dev_ioremap
kobject: do not copy vargs, just pass them around
sysfs: sysfs_update_group stub for CONFIG_SYSFS=n
DEBUGFS: Correct location of debugfs API documentation.
driver core: warn about duplicate driver names on the same bus
klist: implement klist_add_{after|before}()
klist: implement KLIST_INIT() and DEFINE_KLIST()
sysfs: Disallow truncation of files in sysfs
commit c3bb7fadaf52de3637b834002dac27f6250b4b49
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Apr 30 16:43:45 2008 -0700
klist: fix coding style errors in klist.h and klist.c
Finally clean up the odd spacing in these files.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c3b19ff06e0808555403491d61e8f0cbbb53e933
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed Mar 12 20:47:35 2008 +0100
driver core: remove no longer used "struct class_device"
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4356d73d028ad0726cfaf31ad30c5d28fcd98795
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Mon Apr 28 01:03:20 2008 -0700
pcmcia: remove pccard_sysfs_interface warnings
Make the PCMCIA core stop using class_interface to hide socket attribute
registration. This removes the associated section mismatch warnings, and
helps get to the point where that mechanism can finally be removed.
Simplify that attribute registration by using an attribute_group.
This is a net shrink in object size.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4f452e8aa492c0b8028ca9b4bdb4d018ba28c6c7
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Tue Apr 29 10:25:48 2008 -0500
devres: support addresses greater than an unsigned long via dev_ioremap
Use a resource_size_t instead of unsigned long since some arch's are
capable of having ioremap deal with addresses greater than the size of a
unsigned long.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Cc: Tejun Heo <htejun at gmail.com>
Cc: Jeff Garzik <jgarzik at pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a4ca6617421188f50774780cdc91c3782b7d08fe
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Wed Apr 30 02:06:29 2008 +0200
kobject: do not copy vargs, just pass them around
This prevents a few unneeded copies.
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 1cbfb7a5acd357de6c3f8e27e8d8f92b3867b1f3
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Apr 30 09:01:17 2008 -0700
sysfs: sysfs_update_group stub for CONFIG_SYSFS=n
scsi_transport_spi uses sysfs_update_group() when CONFIG_SYSFS=n,
so provide a stub for it.
next-20080423/drivers/scsi/scsi_transport_spi.c:1467: error: implicit declaration of function 'sysfs_update_group'
make[3]: *** [drivers/scsi/scsi_transport_spi.o] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 883ce42ec45c2dbef5be7c133ade9741ac978329
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Fri Apr 25 08:52:51 2008 -0400
DEBUGFS: Correct location of debugfs API documentation.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 16dc42e018c2868211b4928f20a957c0c216126c
Author: Stas Sergeev <stsp at aknet.ru>
Date: Sat Apr 26 19:52:35 2008 +0400
driver core: warn about duplicate driver names on the same bus
Currently an attempt to register multiple
drivers with the same name causes the
stack trace with some cryptic error message.
The attached patch adds the necessary check
and the clear error message.
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 93dd40013f4f7f4b18d19d0d77855f025bcc57c3
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Apr 22 18:58:46 2008 +0900
klist: implement klist_add_{after|before}()
Add klist_add_after() and klist_add_before() which puts a new node
after and before an existing node, respectively. This is useful for
callers which need to keep klist ordered. Note that synchronizing
between simultaneous additions for ordering is the caller's
responsibility.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 1da43e4a9ee942c9c967dbe8839476571df0c3ed
Author: Tejun Heo <htejun at gmail.com>
Date: Sat Apr 26 03:16:04 2008 +0900
klist: implement KLIST_INIT() and DEFINE_KLIST()
klist is missing static initializers and definition helper. Add them.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Peter Zijlstra <peterz at infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 40a2159abf3d0107bba359246554bd7d56f2171b
Author: Ben Hutchings <bhutchings at solarflare.com>
Date: Mon Apr 28 15:59:58 2008 +0100
sysfs: Disallow truncation of files in sysfs
sysfs allows attribute files to be truncated, e.g. using ftruncate(), with the
expected effect on their inode. For most attributes, this doesn't change the
"real" size of the file i.e. how much can be read from it. However, the
parameter validation for reading and writing binary attribute files is based
on the inode size and not the size specified in the file's bin_attribute, so it
can be broken by this. For example, if we try using dd to write to such a file:
# pwd
/sys/bus/pci/devices/0000:08:00.0
# ls -l config
-rw-r--r-- 1 root root 4096 Feb 1 17:35 config
# dd if=/dev/zero of=config bs=4 count=1
1+0 records in
1+0 records out
# ls -l config
-rw-r--r-- 1 root root 0 Feb 1 17:50 config
# dd if=/dev/zero of=config bs=4 count=1 seek=128
dd: writing `config': No space left on device
1+0 records in
0+0 records out
Also, after truncation to 0, parameter validation for read and write is
disabled. Most bin_attribute read and write methods also validate the size and
offset, but for some this will allow out-of-range access. This may be a
security issue, though access to such files is often limited to root. In any
case, the validation should remain for safety's sake!)
This was previously reported in Bugzilla as bug 9867.
sysfs should ignore size changes or else refuse them (by returning -EINVAL).
This patch makes it ignore them.
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e0066c4ea9ffa420cb79814411ff74fdc7b7d98e
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Thu May 1 04:10:02 2008 +0400
Fix ACPI vs proc_create_data() mismerge
acpi_device_dir() is NULL until all files are createst, so everyting is
created in straight in /proc/ and creation code warns.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 809917903127804c2b2ac76342ab0f29f4b394d3
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 14:49:54 2008 -0700
ipv6: Compilation fix for compat MCAST_MSFILTER sockopts.
The last hunk from the commit dae50295 (ipv4/ipv6 compat: Fix SSM
applications on 64bit kernels.) escaped from the compat_ipv6_setsockopt
to the ipv6_getsockopt (I guess due to patch smartness wrt searching
for context) thus breaking 32-bit and 64-bit-without-compat compilation.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: David L Stevens <dlstevens at us.ibm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 895d30935ebe05f192e844792668bf8d19deaae7
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 30 23:05:52 2008 +0200
x86: numaq fix
do not override the existing pci-y rule when adding visws or
numaq rules.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 6b8e1c7ec4af6defa7045ff3c9b266486124d9c5
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 30 20:45:40 2008 +0200
x86: 8K stacks by default
Switch back to 8K stacks as the safer default. Out-of-memory
situations are less problematic than silent and hard to debug
stack corruption.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit cb8ab687c32331fb548c613ae74df574bb0908c1
Author: Andres Salomon <dilinger at queued.net>
Date: Wed Apr 30 11:30:24 2008 -0400
x86: ioremap ram check fix
bdd3cee2e4b7279457139058615ced6c2b41e7de (x86: ioremap(), extend check
to all RAM pages) breaks OLPC's ioremap call. The ioremap that OLPC uses is:
romsig = ioremap(0xffffffc0, 16);
The commit that breaks it is basically:
- for (pfn = phys_addr >> PAGE_SHIFT; pfn < max_pfn_mapped &&
- (pfn << PAGE_SHIFT) < last_addr; pfn++) {
+ for (pfn = phys_addr >> PAGE_SHIFT;
+ (pfn << PAGE_SHIFT) < last_addr; pfn++) {
+
Previously, the 'pfn < max_pfn_mapped' check would've caused us to not
enter the loop. Removing that check means we loop infinitely. The
reason for that is because pfn is 0xfffff, and last_addr is 0xffffffcf.
The remaining check that is used to exit the loop is not sufficient;
when pfn<<PAGE_SHIFT is 0xfffff000, that is less than 0xffffffcf; when
we increment pfn and it overflows (pfn == 0x100000), pfn<<PAGE_SHIFT
ends up being 0. That, of course, is less than last_addr. In effect,
pfn<<PAGE_SHIFT is never lower than last_addr.
The simple fix for this is to limit the last_addr check to the PAGE_MASK;
a patch is below.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5f464707c8c18fccd3c6278ad46ac94b5cf15a98
Author: Hugh Dickins <hugh at veritas.com>
Date: Wed Apr 30 16:17:46 2008 +0100
x86: fix HT cpu booting on 32-bit
Since recent smpboot 32/64-bit merge, my dual Xeon with HT has been
booting only 2 of its 4 cpus (when running an i386 kernel; but x86_64
is okay). J.A. Magallón reports the same.
native_cpu_up: bad cpu 2
native_cpu_up: bad cpu 3
The mach-default cpu_present_to_apicid() was just returning cpu number
(2, 3) instead of apicid (6, 7): looks like we now need the x86_64 code
even for the i386 case.
Comparing with other versions of cpu_present_to_apicid(), it seems a
good idea to include an NR_CPUS test too, since cpu_present() doesn't
include that; but that wasn't a problem here, and may no problem at all.
Prior to that smpboot merge, my Xeon booted the two HT siblings on one
physical first, then the two siblings on the other physical after - when
i386, but alternated them when x86_64. Since the merge, the x86_64
sequence is unchanged, but the i386 sequence is now like x86_64.
I prefer this consistency, and I prefer the new sequence: booting with
maxcpus=2 then uses the independent physicals without HT sharing.
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5de8f68b43229cce3d457ca9ac6dab8372a35f18
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 30 10:29:13 2008 +0200
x86: optimize inlining off
default to inline optimizing off.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit acbaa93e3d38db0e67b070d97598f87a7a6779da
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 30 08:58:27 2008 +0200
x86: CONFIG_X86_ELAN fix
move the X86_CPU section out of the !X86_ELAN branch.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit c9af1e33231912cedae3e49e56621b6c765e57fe
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 30 08:48:45 2008 +0200
x86: Kconfig fix
Andrew noticed that OPTIMIZE_INLINING appeared in the toplevel
menu - fix it.
Reported-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit de33c442ed2a465d2d7804b26dafd2eec067aa34
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Fri Apr 25 17:07:22 2008 -0700
x86 PAT: fix performance drop for glx, use UC minus for ioremap(), ioremap_nocache() and pci_mmap_page_range()
Use UC_MINUS for ioremap(), ioremap_nocache() instead of strong UC.
Once all the X drivers move to ioremap_wc(), we can go back to strong
UC semantics for ioremap() and ioremap_nocache().
To avoid attribute aliasing issues, pci_mmap_page_range() will also
use UC_MINUS for default non write-combining mapping request.
Next steps:
a) change all the video drivers using ioremap() or ioremap_nocache()
and adding WC MTTR using mttr_add() to ioremap_wc()
b) for strict usage, we can go back to strong uc semantics
for ioremap() and ioremap_nocache() after some grace period for
completing step-a.
c) user level X server needs to use the appropriate method for setting
up WC mapping (like using resourceX_wc sysfs file instead of
adding MTRR for WC and using /dev/mem or resourceX under /sys)
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b9b39bfba5b0de3418305f01cfa7bc55a16004e1
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 12:48:15 2008 +0200
x86: use defconfigs from x86/configs/*
Daniel Drake <dsd at gentoo.org> reported:
In 2.6.23, if you unpacked a kernel source tarball and then
ran "make menuconfig" you'd be presented with this message:
# using defaults found in arch/i386/defconfig
and the default options would be set.
The same thing in 2.6.24 does not give you any "using defaults" message, and
the default config options within menuconfig are rather blank (e.g. no PCI
support). You can work around this by explicitly running "make defconfig"
before menuconfig, but it would be nice to have the behaviour the way it was
for 2.6.23 (and the way it still is for other archs).
Fixed by adding a x86 specific defconfig list to Kconfig.
Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=10470
Tested-by: dsd at gentoo.org
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 1dcf83fd0c42525dd36cfeb61fe0bfb12113c6b3
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Apr 29 14:20:23 2008 +0100
toshiba: use ioremap_cached
The switch of ioremap to default to uncached doesn't break this driver
but it does needlessly slow it down as BIOS space is cachable and this
driver is quite happy scanning cached ROM space.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2544a873ab2a1ee9196bb2f4b12c3afd44ec8a06
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue Apr 29 12:04:51 2008 +0200
revert: "x86: ioremap(), extend check to all RAM pages"
Vegard Nossum reported a large (150 seconds) boot delay during bootup,
and bisected it to "x86: ioremap(), extend check to all RAM pages"
(commit bdd3cee2e4b). Revert this commit for now.
Bisected-by: Vegard Nossum <vegard.nossum at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit a4c863f497e640e049083e1b3a1f3723cb766da9
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Apr 28 11:05:07 2008 -0700
x86: don't bother printing compat vdso address
The kernel prints the compat vdso address regardless of whether compat
vdso mode is enabled or not, which is confusing. Given that this
isn't very interesting information anyway, just remove the printk.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Cc: Gerhard Mack <gmack at innerfire.net>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit f6c133f7d5ee3b82f5b34b988e897ea38cd8219c
Author: Andi Kleen <andi at firstfloor.org>
Date: Fri Apr 25 11:45:26 2008 +0200
fix: x86: support for new UV apic
Don't warn in read_apic_id() when preemptible but only one CPU online.
Signed-off-by: Andi Kleen <andi at firstfloor.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 575ca7351bf0546919060071797cccb4a05960df
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Fri Apr 25 21:02:34 2008 +0200
x86: fix early-BUG message
The .asciz directive takes any number of strings, but each one is zero-
terminated, and string pasting is not done as in C. That results in only the
first line being output.
Replace .asciz with multiple .ascii directives and terminate with .asciz.
Signed-off-by: Vegard Nossum <vegard.nossum at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b4cdc4300de6ff7b8b366f23bed17c7d59c8117c
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Mon Apr 28 03:15:58 2008 +0400
x86: iommu_sac_force can become static
The iommu_sac_force variable is needlessly defined global,
and this patch makes it static. Additionally, this variable
needs not be explicitly initialized.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4412620fc2772af0fc7a94b2cfa28792a46b4fc8
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Mon Apr 28 03:15:59 2008 +0400
x86: add proper header for reboot_force
This patch fixes one sparse warning by including the appropriate
header for the reboot_force symbol.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 3e8f7e35f3fd17eadef44e4679abb39a3806cf01
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Apr 28 10:46:58 2008 +0200
x86 VISWS: build fix
the 'reboot_force' flag is a notion that non-PC subarchitectures do
not have.
also, unify the X86_BIOS_REBOOT option between 32-bit and 64-bit
and get rid of a few unnecessary Kconfig and Makefile complications
that way.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit ed5e233284bc4aff965df7351da8426aa188c8f9
Author: Ingo Molnar <mingo at elte.hu>
Date: Sun Apr 27 23:21:03 2008 +0200
x86, voyager: fix ioremap_nocache()
James Bottomley reported that the following commit:
| commit 6371b495991debfd1417b17c2bc4f7d7bae05739
| Author: Ingo Molnar <mingo at elte.hu>
| Date: Wed Jan 30 13:33:40 2008 +0100
|
| x86: change ioremap() to default to uncached
broke Voyager.
James says:
" it broke a class of voyager machines: those which
rely on the quad interrupt controller (QIC). The precis of why they
broke is because the QIC does IPIs (or CPIs in its terminology) via
cache line interference: you interrupt a processor by moving a
designated memory area to write exclusive in the cache (by simply
writing to the line) and the CPU acks the interrupt by moving it back to
read shared (by reading from it). That area, is, of course, mapped by
ioremap, so reversing the ioremap semantics and adding the uncached bit
completely breaks the QIC. "
Sorry about that!
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit fc3fbc45098e5aff59f06962dee79aba2e11430d
Author: Ingo Molnar <mingo at elte.hu>
Date: Sun Apr 27 14:04:14 2008 +0200
hpet: fix
Al Viro pointed out that there's a missing readl() of timer->hpet_config,
found by Sparse.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b9e017e04be672244502a0567fb752973556f388
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 11:51:44 2008 +0300
x86: unexport kmap_atomic_to_page
This patch removes the no longer used export of kmap_atomic_to_page.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 9cbfe20068878d597cfa064be9cab871875bea60
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 11:47:46 2008 +0300
x86: remove Xgt_desc_struct
The comment says it should have been removed in 2.6.25.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 6d3c51110819918617d9e2d1da7ff53f4b2c1187
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Wed Apr 30 16:50:55 2008 +0900
[IA64] fix section mismatch in arch/ia64/kernel/topology.c
This patch silences:
WARNING: vmlinux.o(.text+0x44672): Section mismatch in
reference from the function arch_register_cpu() to the
function .cpuinit.text:register_cpu()
Changes are based on codes in arch/x86/kernel/topology.c
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 9d4efae68714e24d40b628461bc4182e330969b1
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Wed Apr 30 16:50:22 2008 +0900
[IA64] fix section mismatch in arch/ia64/kernel/palinfo.c
This patch removes following warning:
WARNING: vmlinux.o(.exit.text+0xb1): Section mismatch in
reference from the function palinfo_exit() to the variable
.cpuinit.data:palinfo_cpu_notifier
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 751fc7849d623bcd5e77fd494b01662599a8dccf
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Wed Apr 30 16:50:43 2008 +0900
[IA64] fix section mismatch in arch/ia64/kernel/irq.c
This patch shuts up the following:
WARNING: vmlinux.o(.text+0x7102): Section mismatch in
reference from the function fixup_irqs() to the function
.devinit.text:ia64_disable_timer()
Removing ia64_disable_timer() is safe because there are no functions
calling it other than the fixup_irqs(),
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit c5b5a5993234d4db2079e57e456bda5278ef59cf
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Wed Apr 30 16:51:06 2008 +0900
[IA64] fix section mismatch in arch/ia64/kernel/acpi.c
This patch kills:
WARNING: vmlinux.o(.text+0x1702): Section mismatch in
reference from the function acpi_register_ioapic() to the
function .devinit.text:iosapic_init()
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 08acd4f8af42affd8cbed81cc1b69fa12ddb213f
Merge: ccf2779544eecfcc5447e2028d1029b6d4ff7bb6 008238b54ac2350babf195084ecedbcf7851a202
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 11:52:52 2008 -0700
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (179 commits)
ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
acpi: fix section mismatch warning in pnpacpi
intel_menlo: fix build warning
ACPI: Cleanup: Remove unneeded, multiple local dummy variables
ACPI: video - fix permissions on some proc entries
ACPI: video - properly handle errors when registering proc elements
ACPI: video - do not store invalid entries in attached_array list
ACPI: re-name acpi_pm_ops to acpi_suspend_ops
ACER_WMI/ASUS_LAPTOP: fix build bug
thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
ACPI: check a return value correctly in acpi_power_get_context()
#if 0 acpi/bay.c:eject_removable_drive()
eeepc-laptop: add hwmon fan control
eeepc-laptop: add backlight
eeepc-laptop: add base driver
ACPI: thinkpad-acpi: bump up version to 0.20
ACPI: thinkpad-acpi: fix selects in Kconfig
ACPI: thinkpad-acpi: use a private workqueue
ACPI: thinkpad-acpi: fluff really minor fix
ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
...
Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c
manually.
commit 008238b54ac2350babf195084ecedbcf7851a202
Merge: 96916090f488986a4ebb8e9ffa6a3b50881d5ccd dfd2e1b4e6eb46ff59c7e1c1111c967b8b5981c1
Author: Len Brown <len.brown at intel.com>
Date: Wed Apr 30 13:59:05 2008 -0400
Merge branch 'pnp' into release
commit 96916090f488986a4ebb8e9ffa6a3b50881d5ccd
Merge: 75a44ce00b312f57264f42a0a985d17cd9994b98 729b2bdbfa19dd9be98dbd49caf2773b3271cc24 2f67a0695dc389247c05041b05d2a2b06fc102a3 51ae796f7fa1d8034252628572053f477bc29913 ce52ddf58cbc2c40f5f08d37d2217945e4d5adf3 e1faa9da284d14487ed4280b4e87cfde8e1539af 36a913586597cab1cd565e9bf348d037f0df955b 9448b0d43e5509c6b7baca02510a92ef2de6e328 99bda83e8b3140b7e81572a5aabc7dedb455b272 1071695f17daf050638e0bc550db647f8237c3bb 7aa0f1a8b1f7072990c9dc37f238c96dc6d78911 68f12ae5d778279e13e406d3913c74c592307770 66fb9d120e91050093b8ce4c1daa2e440660152b
Author: Len Brown <len.brown at intel.com>
Date: Wed Apr 30 13:58:00 2008 -0400
Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla-9916', 'ec', 'eeepc', 'idle', 'misc', 'pm-legacy', 'sysfs-links-2.6.26', 'thermal', 'thinkpad' and 'video' into release
commit 36a913586597cab1cd565e9bf348d037f0df955b
Author: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Date: Wed Apr 30 13:57:15 2008 -0400
ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
acpi_processor_idle and "idle=" boot parameter interaction is broken.
The problem is that, at boot time acpi driver is checking for "idle=" boot
option and not registering the acpi idle handler. But, when there is a CST
changed callback (typically when switching AC <-> battery or suspend-resume)
there are no checks for boot_option_idle_override and acpi idle handler tries
to get installed with nasty side effects.
With CPU_IDLE configured this issue causes results in a nasty oops on CST
change callback and without CPU_IDLE there is no oops, but boot option
of "idle=" gets ignored and acpi idle handler gets installed.
Change the behavior to not do anything in acpi idle handler when there is a
"idle=" boot option.
Note that the problem is only there when "idle=" boot option is used.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 9448b0d43e5509c6b7baca02510a92ef2de6e328
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 22:52:01 2008 +0200
acpi: fix section mismatch warning in pnpacpi
Fix following section mismatch warning:
WARNING: vmlinux.o(.text+0x153d69): Section mismatch in reference from the function is_exclusive_device() to the variable .init.data:excluded_id_list
is_exclusive_device is only used from __init context so document
this with the __init annotation and get rid of the warning.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit ccf2779544eecfcc5447e2028d1029b6d4ff7bb6
Merge: 7cece14acd063dd1c4e8933461d44ec6a5a5517b fd403dc84f29aee613d13bde5656ba74cdee1e7b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 09:22:27 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc - neo1973_wm8753.c add suspend and shutdown hooks for lm4857 chip
[ALSA] soc - neo1973_wm8753.c change maintainer contact info
[ALSA] soc - neo1973_wm8753.c cleanup checkpatch issues
[ALSA] soc - ln2440sbc_alc650 - Fix checkpatch warnings
[ALSA] soc - s3c24xx-pcm - Fix checkpatch warnings
[ALSA] soc - s3c2443-ac97 - Fix checkpatch warnings
[ALSA] soc - wm8753 - Clean up checkpatch warnings
commit fd403dc84f29aee613d13bde5656ba74cdee1e7b
Author: Graeme Gregory <graeme at openmoko.org>
Date: Wed Apr 30 20:26:45 2008 +0200
[ALSA] soc - neo1973_wm8753.c add suspend and shutdown hooks for lm4857 chip
Patch taken from the openmoko bugtracker
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=781
This patch adds Suspend/Resume and Shutdown support for the lm4857 to
the driver.
Signed-off-by: Graeme Gregory <graeme at openmoko.org>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 443590e6f1823cd4bc1199cc658074bc3e30acbf
Author: Graeme Gregory <graeme at openmoko.org>
Date: Wed Apr 30 20:25:23 2008 +0200
[ALSA] soc - neo1973_wm8753.c change maintainer contact info
I have moved workplaces since I originally wrote this driver so update
the contact info for new employers.
Signed-off-by: Graeme Gregory <graeme at openmoko.org>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 8ba02ace943ce956606d1f6f2a5aad9498798c31
Author: Graeme Gregory <graeme at openmoko.org>
Date: Wed Apr 30 20:24:54 2008 +0200
[ALSA] soc - neo1973_wm8753.c cleanup checkpatch issues
Clean up a few issues with the file that checkpatch noted, no functionality
changes.
Signed-off-by: Graeme Gregory <graeme at openmoko.org>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 854e4af258e214345d675dc406d24769e32a04c8
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:19:57 2008 +0200
[ALSA] soc - ln2440sbc_alc650 - Fix checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5111c0753486fffde14de2b207e46760b9c05fd0
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:19:32 2008 +0200
[ALSA] soc - s3c24xx-pcm - Fix checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ccfdd6c2b2ad3f32c02175007a66c82e2233b75c
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:19:07 2008 +0200
[ALSA] soc - s3c2443-ac97 - Fix checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 60fc684adfed810fc36b41778aca8de467fc3206
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:18:43 2008 +0200
[ALSA] soc - wm8753 - Clean up checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7cece14acd063dd1c4e8933461d44ec6a5a5517b
Merge: 95dfec6ae1cb8c03406aac612a5642cbddb676b3 8cd0ae3acc0154f3f9dfa1b4a2b7c02c271533f6
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 08:46:16 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: remove duplicated include
sparc: Add kgdb support.
kgdbts: Sparc needs sstep emulation.
sparc32: Kill smp_message_pass() and related code.
sparc64: Kill PIL_RESERVED, unused.
sparc64: Split entry.S up into seperate files.
commit 95dfec6ae1cb8c03406aac612a5642cbddb676b3
Merge: ae3a0064e6d69068b1c9fd075095da062430bda9 159131149c2f56c1da5ae5e23ab9d5acef4916d1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 08:45:48 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
tcp: Overflow bug in Vegas
[IPv4] UFO: prevent generation of chained skb destined to UFO device
iwlwifi: move the selects to the tristate drivers
ipv4: annotate a few functions __init in ipconfig.c
atm: ambassador: vcc_sf semaphore to mutex
MAINTAINERS: The socketcan-core list is subscribers-only.
netfilter: nf_conntrack: padding breaks conntrack hash on ARM
ipv4: Update MTU to all related cache entries in ip_rt_frag_needed()
sch_sfq: use del_timer_sync() in sfq_destroy()
net: Add compat support for getsockopt (MCAST_MSFILTER)
net: Several cleanups for the setsockopt compat support.
ipvs: fix oops in backup for fwmark conn templates
bridge: kernel panic when unloading bridge module
bridge: fix error handling in br_add_if()
netfilter: {nfnetlink,ip,ip6}_queue: fix skb_over_panic when enlarging packets
netfilter: x_tables: fix net namespace leak when reading /proc/net/xxx_tables_names
netfilter: xt_TCPOPTSTRIP: signed tcphoff for ipv6_skip_exthdr() retval
tcp: Limit cwnd growth when deferring for GSO
tcp: Allow send-limited cwnd to grow up to max_burst when gso disabled
[netdrvr] gianfar: Determine TBIPA value dynamically
...
commit ae3a0064e6d69068b1c9fd075095da062430bda9
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 30 00:15:31 2008 +0200
inlining: do not allow gcc below version 4 to optimize inlining
fix the condition to match intention: always use the old inlining
behavior on all gcc versions below 4.
this should solve the UML build problem.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 53809d7eaef9503eb2589babdaba5ef0b661bb14
Author: S.Çağlar Onur <caglar at pardus.org.tr>
Date: Wed Apr 30 15:29:02 2008 +0300
Update .mailmap
I realize some of the maintainers email clients and/or scripts cannot
handle UTF-8 encoded names properly, as a result your ChangeLogs
displays me as two different person :).
Following patch adds correctly encoded name of mine into .mailmap, to
prevent appearing it not to be so or badly displayed.
Signed-off-by: S.Çağlar Onur <caglar at pardus.org.tr>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d67c6f869c0a7f275689855161c93d714197e052
Merge: ec31b2124158f60c515ed84bd5e40db1a883c7b6 1175cdc670f2d4197b033f823b32435031a6daa8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 08:38:30 2008 -0700
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Update default configuration.
[S390] use generic sys_ptrace
[S390] Remove self ptrace IEEE_IP hack.
[S390] Convert to SPARSEMEM & SPARSEMEM_VMEMMAP
[S390] System z large page support.
[S390] Convert machine feature detection code to C.
[S390] vmemmap: use clear_table to initialise page tables.
[S390] Move stfl to system.h and delete duplicated version.
[S390] uaccess_mvcos: #ifdef config dependent code.
[S390] cpu topology: Fix possible deadlock.
[S390] Add topology_core_siblings to topology.h
[S390] cio: Make isc handling more robust.
[S390] remove -traditional
[S390] Automatically detect added cpus.
[S390] smp: Fix locking order.
[S390] Add missing ifndef/define to include/asm-s390/sysinfo.h.
[S390] Move show_regs to traps.c.
[S390] cio: Use strict_strtoul() for attributes.
commit ec31b2124158f60c515ed84bd5e40db1a883c7b6
Merge: ca72cddfcb6afd75a808da4f027325fa63a1b856 eabd90944b3a00766e84da3d117ea0f3e0a3b1a3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 30 08:37:40 2008 -0700
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix crashkernel= handling when no crashkernel= specified
[POWERPC] Make emergency stack safe for current_thread_info() use
[POWERPC] spufs: add .gitignore for spu_save_dump.h & spu_restore_dump.h
[POWERPC] spufs: trace spu_acquire_saved events
[POWERPC] spufs: fix marker name for find_victim
[POWERPC] spufs: add marker for destroy_spu_context
[POWERPC] spufs: add sputrace marker parameter names
[POWERPC] spufs: add context switch notification log
[POWERPC] mpc5200: defconfigs for CM5200, Lite5200B, Motion-PRO and TQM5200
[POWERPC] mpc5200: Switch mpc5200 dts files to dts-v1 format
[POWERPC] mpc5200: Fix FEC error handling on FIFO errors
[POWERPC] mpc5200: add Phytec pcm030 board support
[POWERPC] mpc5200: add gpiolib support for mpc5200
[POWERPC] mpc5200: add interrupt type function
[POWERPC] mpc5200: Fix unterminated of_device_id table
commit ca72cddfcb6afd75a808da4f027325fa63a1b856
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 30 11:50:11 2008 +0200
fix drivers/media/common/tuners/ build bug
x86.git randconfig testing found a build failure on latest -git:
drivers/built-in.o: In function `set_type':
tuner-core.c:(.text+0x2a9a26): undefined reference to `tea5761_attach'
tuner-core.c:(.text+0x2a9d05): undefined reference to `tda9887_attach'
tuner-core.c:(.text+0x2a9d51): undefined reference to `xc2028_attach'
tuner-core.c:(.text+0x2a9e22): undefined reference to `tda829x_attach'
tuner-core.c:(.text+0x2a9e3f): undefined reference to `microtune_attach'
drivers/built-in.o: In function `tuner_probe':
tuner-core.c:(.text+0x2aa18a): undefined reference to `tda829x_probe'
tuner-core.c:(.text+0x2aa302): undefined reference to `tea5761_autodetection'
with the following config:
http://redhat.com/~mingo/misc/config-Wed_Apr_30_10_21_40_CEST_2008.bad
the problem is caused by the drivers/media/common/tuners/ subdirectory
not being part of the kbuild hierarchy anymore, due to commit
7c91f0624 ("V4L/DVB(7767): Move tuners to common/tuners").
this seems similar to the problem also reported by Mike Galbraith.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Acked-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5167464446e527b5a3b5618ba0baff93048bcbbe
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed Apr 30 00:55:17 2008 -0700
revert "memory hotplug: allocate usemap on the section with pgdat"
This:
commit 86f6dae1377523689bd8468fed2f2dd180fc0560
Author: Yasunori Goto <y-goto at jp.fujitsu.com>
Date: Mon Apr 28 02:13:33 2008 -0700
memory hotplug: allocate usemap on the section with pgdat
Usemaps are allocated on the section which has pgdat by this.
Because usemap size is very small, many other sections usemaps are allocated
on only one page. If a section has usemap, it can't be removed until removing
other sections. This dependency is not desirable for memory removing.
Pgdat has similar feature. When a section has pgdat area, it must be the last
section for removing on the node. So, if section A has pgdat and section B
has usemap for section A, Both sections can't be removed due to dependency
each other.
To solve this issue, this patch collects usemap on same section with pgdat.
If other sections doesn't have any dependency, this section will be able to be
removed finally.
Signed-off-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
broke davem's sparc64 bootup. Revert it while we work out what went wrong.
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3a902c5f6851cd0b64c33efaa3bd57aa27a82efb
Author: Nick Piggin <npiggin at suse.de>
Date: Wed Apr 30 00:55:16 2008 -0700
mm: fix warning on memory offline
KAMEZAWA Hiroyuki found a warning message in the buffer dirtying code that
is coming from page migration caller.
WARNING: at fs/buffer.c:720 __set_page_dirty+0x330/0x360()
Call Trace:
[<a000000100015220>] show_stack+0x80/0xa0
[<a000000100015270>] dump_stack+0x30/0x60
[<a000000100089ed0>] warn_on_slowpath+0x90/0xe0
[<a0000001001f8b10>] __set_page_dirty+0x330/0x360
[<a0000001001ffb90>] __set_page_dirty_buffers+0xd0/0x280
[<a00000010012fec0>] set_page_dirty+0xc0/0x260
[<a000000100195670>] migrate_page_copy+0x5d0/0x5e0
[<a000000100197840>] buffer_migrate_page+0x2e0/0x3c0
[<a000000100195eb0>] migrate_pages+0x770/0xe00
What was happening is that migrate_page_copy wants to transfer the PG_dirty
bit from old page to new page, so what it would do is set_page_dirty(newpage).
However set_page_dirty() is used to set the entire page dirty, wheras in
this case, only part of the page was dirty, and it also was not uptodate.
Marking the whole page dirty with set_page_dirty would lead to corruption or
unresolvable conditions -- a dirty && !uptodate page and dirty && !uptodate
buffers.
Possibly we could just ClearPageDirty(oldpage); SetPageDirty(newpage);
however in the interests of keeping the change minimal...
Signed-off-by: Nick Piggin <npiggin at suse.de>
Tested-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 969a19f1c405a8e9d15ceb9e75e3f4a321aaf56f
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Wed Apr 30 00:55:14 2008 -0700
Drop the exporting of empty <linux/byteorder/generic.h>
Fix up the contents of <linux/byteorder/> so that it doesn't export a
content-free generic.h to user space. This involves:
* Removing the __KERNEL__ tests from generic.h and dropping it from
Kbuild.
* Wrapping the inclusions of generic.h in both big_endian.h and
little_endian.h in __KERNEL__ tests.
* Shifting big_endian.h and little_endian.h from header-y to
unifdef-y in Kbuild.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ae50884f66fc93aa713feade8f87c03471241275
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Wed Apr 30 00:55:13 2008 -0700
remove __KERNEL__ tests of unexported headers under asm-generic/
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 735643ee6cc5249bfac07fcad0946a5e7aff4423
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Wed Apr 30 00:55:12 2008 -0700
Remove "#ifdef __KERNEL__" checks from unexported headers
Remove the "#ifdef __KERNEL__" tests from unexported header files in
linux/include whose entire contents are wrapped in that preprocessor
test.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Cc: David Woodhouse <dwmw2 at infradead.org>
Cc: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 71cc2c2152170b8166f59abb0604dc62073aeb92
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:55:10 2008 -0700
serial: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bf9d89295233ae2ba7b312c78ee5657307b09f4c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:55:10 2008 -0700
drivers/char: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8e24eea728068bbeb6a3c500b848f883a20bf225
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:55:09 2008 -0700
fs: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 530b6412786d7f83592c1a8e2445541ed73fca76
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:55:09 2008 -0700
afs: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 810304db75b0ca4e6ef071f86aa3e85fdaddee5e
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:55:08 2008 -0700
lib: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit af1f16d08f38ab6f17b5760e6ec9d2b7d3a5ff1a
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:55:08 2008 -0700
kernel: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d40cee245ff6ad05d3448401d7320be82c1c5af1
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:55:07 2008 -0700
mm: remove remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d7853d1f8932c847a8d7b3b38e6baedf77148cfb
Author: Laurent Vivier <Laurent.Vivier at bull.net>
Date: Wed Apr 30 00:55:06 2008 -0700
brd: modify ramdisk device to be able to manage partitions
This patch adds partition management for Block RAM Device (BRD).
This patch is done to keep in sync BRD and loop device drivers.
This patch adds a parameter to the module, max_part, to specify
the maximum number of partitions per RAM device.
Example:
# modprobe brd max_part=63
# ls -l /dev/ram*
brw-rw---- 1 root disk 1, 0 2008-04-03 13:39 /dev/ram0
brw-rw---- 1 root disk 1, 64 2008-04-03 13:39 /dev/ram1
brw-rw---- 1 root disk 1, 640 2008-04-03 13:39 /dev/ram10
brw-rw---- 1 root disk 1, 704 2008-04-03 13:39 /dev/ram11
brw-rw---- 1 root disk 1, 768 2008-04-03 13:39 /dev/ram12
brw-rw---- 1 root disk 1, 832 2008-04-03 13:39 /dev/ram13
brw-rw---- 1 root disk 1, 896 2008-04-03 13:39 /dev/ram14
brw-rw---- 1 root disk 1, 960 2008-04-03 13:39 /dev/ram15
brw-rw---- 1 root disk 1, 128 2008-04-03 13:39 /dev/ram2
brw-rw---- 1 root disk 1, 192 2008-04-03 13:39 /dev/ram3
brw-rw---- 1 root disk 1, 256 2008-04-03 13:39 /dev/ram4
brw-rw---- 1 root disk 1, 320 2008-04-03 13:39 /dev/ram5
brw-rw---- 1 root disk 1, 384 2008-04-03 13:39 /dev/ram6
brw-rw---- 1 root disk 1, 448 2008-04-03 13:39 /dev/ram7
brw-rw---- 1 root disk 1, 512 2008-04-03 13:39 /dev/ram8
brw-rw---- 1 root disk 1, 576 2008-04-03 13:39 /dev/ram9
# fdisk /dev/ram0
Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
Building a new DOS disklabel. Changes will remain in memory only,
until you decide to write them. After that, of course, the previous
content won't be recoverable.
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
Command (m for help): o
Building a new DOS disklabel. Changes will remain in memory only,
until you decide to write them. After that, of course, the previous
content won't be recoverable.
Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
Command (m for help): n
Command action
e extended
p primary partition (1-4)
p
Partition number (1-4): 1
First cylinder (1-2, default 1): 1
Last cylinder or +size or +sizeM or +sizeK (1-2, default 2): 2
Command (m for help): w
The partition table has been altered!
Calling ioctl() to re-read partition table.
Syncing disks.
# ls -l /dev/ram0*
brw-rw---- 1 root disk 1, 0 2008-04-03 13:40 /dev/ram0
brw-rw---- 1 root disk 1, 1 2008-04-03 13:40 /dev/ram0p1
# mkfs /dev/ram0p1
mke2fs 1.40-WIP (14-Nov-2006)
Filesystem label=
OS type: Linux
Block size=1024 (log=0)
Fragment size=1024 (log=0)
4016 inodes, 16032 blocks
801 blocks (5.00%) reserved for the super user
First data block=1
Maximum filesystem blocks=16515072
2 block groups
8192 blocks per group, 8192 fragments per group
2008 inodes per group
Superblock backups stored on blocks:
8193
Writing inode tables: done
Writing superblocks and filesystem accounting information: done
This filesystem will be automatically checked every 26 mounts or
180 days, whichever comes first. Use tune2fs -c or -i to override.
# mount /dev/ram0p1 /mnt
df /mnt
Filesystem 1K-blocks Used Available Use% Mounted on
/dev/ram0p1 15521 138 14582 1% /mnt
# ls -l /mnt
total 12
drwx------ 2 root root 12288 2008-04-03 13:41 lost+found
# umount /mnt
# rmmod brd
Signed-off-by: Laurent Vivier <Laurent.Vivier at bull.net>
Acked-by: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 237fc6e7a35076f584b9d0794a5204fe4bd9b9e5
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Wed Apr 30 00:55:04 2008 -0700
add hrtimer specific debugobjects code
hrtimers have now dynamic users in the network code. Put them under
debugobjects surveillance as well.
Add calls to the generic object debugging infrastructure and provide fixup
functions which allow to keep the system alive when recoverable problems have
been detected by the object debugging core code.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: Greg KH <greg at kroah.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c6f3a97f86a5c97be0ca255976110bb9c3cfe669
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Wed Apr 30 00:55:03 2008 -0700
debugobjects: add timer specific object debugging code
Add calls to the generic object debugging infrastructure and provide fixup
functions which allow to keep the system alive when recoverable problems have
been detected by the object debugging core code.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Acked-by: Ingo Molnar <mingo at elte.hu>
Cc: Greg KH <greg at kroah.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 691cc54c7d28542434d2b3ee4ddbad6a99312dec
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Wed Apr 30 00:55:02 2008 -0700
debugobjects: add documentation
Add a DocBook for debugobjects.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Acked-by: Ingo Molnar <mingo at elte.hu>
Cc: Greg KH <greg at kroah.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3ac7fe5a4aab409bd5674d0b070bce97f9d20872
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Wed Apr 30 00:55:01 2008 -0700
infrastructure to debug (dynamic) objects
We can see an ever repeating problem pattern with objects of any kind in the
kernel:
1) freeing of active objects
2) reinitialization of active objects
Both problems can be hard to debug because the crash happens at a point where
we have no chance to decode the root cause anymore. One problem spot are
kernel timers, where the detection of the problem often happens in interrupt
context and usually causes the machine to panic.
While working on a timer related bug report I had to hack specialized code
into the timer subsystem to get a reasonable hint for the root cause. This
debug hack was fine for temporary use, but far from a mergeable solution due
to the intrusiveness into the timer code.
The code further lacked the ability to detect and report the root cause
instantly and keep the system operational.
Keeping the system operational is important to get hold of the debug
information without special debugging aids like serial consoles and special
knowledge of the bug reporter.
The problems described above are not restricted to timers, but timers tend to
expose it usually in a full system crash. Other objects are less explosive,
but the symptoms caused by such mistakes can be even harder to debug.
Instead of creating specialized debugging code for the timer subsystem a
generic infrastructure is created which allows developers to verify their code
and provides an easy to enable debug facility for users in case of trouble.
The debugobjects core code keeps track of operations on static and dynamic
objects by inserting them into a hashed list and sanity checking them on
object operations and provides additional checks whenever kernel memory is
freed.
The tracked object operations are:
- initializing an object
- adding an object to a subsystem list
- deleting an object from a subsystem list
Each operation is sanity checked before the operation is executed and the
subsystem specific code can provide a fixup function which allows to prevent
the damage of the operation. When the sanity check triggers a warning message
and a stack trace is printed.
The list of operations can be extended if the need arises. For now it's
limited to the requirements of the first user (timers).
The core code enqueues the objects into hash buckets. The hash index is
generated from the address of the object to simplify the lookup for the check
on kfree/vfree. Each bucket has it's own spinlock to avoid contention on a
global lock.
The debug code can be compiled in without being active. The runtime overhead
is minimal and could be optimized by asm alternatives. A kernel command line
option enables the debugging code.
Thanks to Ingo Molnar for review, suggestions and cleanup patches.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Cc: Greg KH <greg at kroah.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 30327acf7846c5eb97c8e31c78317a2918d3e515
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Wed Apr 30 00:54:59 2008 -0700
slab: add a flag to prevent debug_free checks on a kmem_cache
This is a preperatory patch for the debugobjects infrastructure. The flag
prevents debug_free checks on kmem_caches. This is necessary to avoid
resursive calls into a debug mechanism which uses a kmem_cache itself.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Acked-by: Ingo Molnar <mingo at elte.hu>
Cc: Pekka Enberg <penberg at cs.helsinki.fi>
Cc: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 145980a0b07520f0f82cc40999acc92b349ea40c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:54:57 2008 -0700
drivers: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bdf4bbaaee3d4b8f555658333cbce1affe9070fb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:54:55 2008 -0700
Add macros similar to min/max/min_t/max_t
Also, change the variable names used in the min/max macros to avoid shadowed
variable warnings when min/max min_t/max_t are nested.
Small formatting changes to make all the macros have a similar form.
[akpm at linux-foundation.org: coding-style fixes]
[akpm at linux-foundation.org: fix v4l build]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Mauro Carvalho Chehab <mchehab at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Cc: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Cc: Jeff Garzik <jeff at garzik.org>
Cc: Tejun Heo <htejun at gmail.com>
Cc: Michael Buesch <mb at bu3sch.de>
Cc: "John W. Linville" <linville at tuxdriver.com>
Cc: Miklos Szeredi <miklos at szeredi.hu>
Cc: Dmitry Torokhov <dtor at mail.ru>
Cc: Jiri Kosina <jkosina at suse.cz>
Cc: Arnaldo Carvalho de Melo <acme at ghostprotocols.net>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 354a1f4d99240f53980275416ca3e1ac2ee73d5d
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed Apr 30 00:54:54 2008 -0700
alloc_uid: cleanup
Use kmem_cache_zalloc(), remove large amounts of initialisation code and
ifdeffery.
Note: this assumes that memset(*atomic_t, 0) correctly initialises the
atomic_t. This is true for all present archtiectures and if it becomes false
for a future architecture then we'll need to make large changes all over the
place anyway.
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 487798df6d25e76ed6558b3e17c44cf0458cc6f3
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed Apr 30 00:54:54 2008 -0700
hfsplus: fix warning with 64k PAGE_SIZE
fs/hfsplus/btree.c: In function 'hfsplus_bmap_alloc':
fs/hfsplus/btree.c:239: warning: comparison is always false due to limited range of data type
But this might hide a real bug?
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3e5a5097303eedb4ffae2719843eb064221b1db4
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed Apr 30 00:54:53 2008 -0700
hfs: fix warning with 64k PAGE_SIZE
fs/hfs/btree.c: In function 'hfs_bmap_alloc':
fs/hfs/btree.c:263: warning: comparison is always false due to limited range of data type
The patch makes the warning go away, but the code might actually be buggy?
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f735295b14ae073a8302d7b1da894bc597724557
Author: Markus Armbruster <armbru at redhat.com>
Date: Wed Apr 30 00:54:52 2008 -0700
printk: don't read beyond string arguments' terminating zero
Fix update_console_cmdline() not to to read beyond the terminating zero of its
name argument.
Signed-off-by: Markus Armbruster <armbru at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f7511d5f66f01fc451747b24e79f3ada7a3af9af
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Wed Apr 30 00:54:51 2008 -0700
Basic braille screen reader support
This adds a minimalistic braille screen reader support. This is meant to
be used by blind people e.g. on boot failures or when / cannot be mounted
etc and thus the userland screen readers can not work.
[akpm at linux-foundation.org: fix exports]
Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
Cc: Jiri Kosina <jikos at jikos.cz>
Cc: Dmitry Torokhov <dtor at mail.ru>
Acked-by: Alan Cox <alan at redhat.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 730f412c08c13858f7681bac0a2770fbc9159fed
Author: Jeff Dike <jdike at addtoit.com>
Date: Wed Apr 30 00:54:49 2008 -0700
asm-*/futex.h should include linux/uaccess.h
Lots of asm-*/futex.h call pagefault_enable and pagefault_disable, which
are declared in linux/uaccess.h, without including linux/uaccess.h.
They all include asm/uaccess.h, so this patch replaces asm/uaccess.h
with linux/uaccess.h.
Signed-off-by: Jeff Dike <jdike at linux.intel.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Cc: Ralf Baechle <ralf at linux-mips.org>
Cc: Kyle McMartin <kyle at mcmartin.ca>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Paul Mundt <lethal at linux-sh.org>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 07132922aac0caf807c56b9c2a388954b357a8c4
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Wed Apr 30 00:54:49 2008 -0700
sysv: [bl]e*_add_cpu conversion
replace all:
big/little_endian_variable = cpu_to_[bl]eX([bl]eX_to_cpu(big/little_endian_variable) +
expression_in_cpu_byteorder);
with:
[bl]eX_add_cpu(&big/little_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e3592b12f507d2c12c883d9c18084b72a5710db3
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Wed Apr 30 00:54:48 2008 -0700
quota: le*_add_cpu conversion
replace all:
little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) +
expression_in_cpu_byteorder);
with:
leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Acked-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 20c79e785ae3f813310261dde81b29ab0c3e28b4
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Wed Apr 30 00:54:47 2008 -0700
hfs/hfsplus: be*_add_cpu conversion
replace all:
big_endian_variable = cpu_to_beX(beX_to_cpu(big_endian_variable) +
expression_in_cpu_byteorder);
with:
beX_add_cpu(&big_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6369a4abb486692cd0f5fe592b48ec7419b7976c
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Wed Apr 30 00:54:47 2008 -0700
affs: be*_add_cpu conversion
replace all:
big_endian_variable = cpu_to_beX(beX_to_cpu(big_endian_variable) +
expression_in_cpu_byteorder);
with:
beX_add_cpu(&big_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 86098fa0115358abf5159093d11ddb306ce4b0da
Author: Christoph Hellwig <hch at lst.de>
Date: Wed Apr 30 00:54:46 2008 -0700
reiserfs: use open_bdev_excl
Use the proper helper to open a blockdevice by name for filesystem use,
this makes sure it's properly claimed (also added for open-by-number) and
gets rid of the struct file abuse.
Tested by mounting a reiserfs filesystem with external journal.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Cc: Chris Mason <chris.mason at oracle.com>
Cc: Jeff Mahoney <jeffm at suse.com>
Acked-by: Edward Shishkin <edward.shishkin at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4dbf930ed6c1f8aa992937d0461f8f70d4004aad
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:45 2008 -0700
fuse: fix sparse warnings
fs/fuse/dev.c:306:2: warning: context imbalance in 'wait_answer_interruptible' - unexpected unlock
fs/fuse/dev.c:361:2: warning: context imbalance in 'request_wait_answer' - unexpected unlock
fs/fuse/dev.c:1002:4: warning: context imbalance in 'end_io_requests' - unexpected unlock
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5559b8f4d1f630b8614b6c8e13b8bf6c9c45d7d7
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:45 2008 -0700
fuse: fix race in llseek
Fuse doesn't use i_mutex to protect setting i_size, and so
generic_file_llseek() can be racy: it doesn't use i_size_read().
So do a fuse specific llseek method, which does use i_size_read().
[akpm at linux-foundation.org: make `retval' loff_t]
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b48badf013018ef2aa4a46416454bdb18f77fb01
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:44 2008 -0700
fuse: fix node ID type
Node ID is 64bit but it is passed as unsigned long to some functions. This
breakage wasn't noticed, because libfuse uses unsigned long too.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e5d9a0df07484d6d191756878c974e4307fb24ce
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:44 2008 -0700
fuse: fix max i/o size calculation
Fix a bug that Werner Baumann reported: fuse can send a bigger write request
than the maximum specified. This only affected direct_io operation.
In addition set a sane minimum for the max_read and max_write tunables, so I/O
always makes some progress.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5c5c5e51b26413d50a9efae2ca7d6c5c6cd453ac
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:43 2008 -0700
fuse: update file size on short read
If the READ request returned a short count, then either
- cached size is incorrect
- filesystem is buggy, as short reads are only allowed on EOF
So assume that the size is wrong and refresh it, so that cached read() doesn't
zero fill the missing chunk.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ea9b9907b82a09bd1a708004454f7065de77c5b0
Author: Nick Piggin <npiggin at suse.de>
Date: Wed Apr 30 00:54:42 2008 -0700
fuse: implement perform_write
Introduce fuse_perform_write. With fusexmp (a passthrough filesystem), large
(1MB) writes into a backing tmpfs filesystem are sped up by almost 4 times
(256MB/s vs 71MB/s).
[mszeredi at suse.cz]:
- split into smaller functions
- testing
- duplicate generic_file_aio_write(), so that there's no need to add a
new ->perform_write() a_op. Comment from hch.
Signed-off-by: Nick Piggin <npiggin at suse.de>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 854512ec358f291bcadd7daea10d6bf3704933de
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:41 2008 -0700
fuse: clean up setting i_size in write
Extract common code for setting i_size in write functions into a common
helper.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3be5a52b30aa5cf9d795b7634f728f612197b1c4
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:41 2008 -0700
fuse: support writable mmap
Quoting Linus (3 years ago, FUSE inclusion discussions):
"User-space filesystems are hard to get right. I'd claim that they
are almost impossible, unless you limit them somehow (shared
writable mappings are the nastiest part - if you don't have those,
you can reasonably limit your problems by limiting the number of
dirty pages you accept through normal "write()" calls)."
Instead of attempting the impossible, I've just waited for the dirty page
accounting infrastructure to materialize (thanks to Peter Zijlstra and
others). This nicely solved the biggest problem: limiting the number of pages
used for write caching.
Some small details remained, however, which this largish patch attempts to
address. It provides a page writeback implementation for fuse, which is
completely safe against VM related deadlocks. Performance may not be very
good for certain usage patterns, but generally it should be acceptable.
It has been tested extensively with fsx-linux and bash-shared-mapping.
Fuse page writeback design
--------------------------
fuse_writepage() allocates a new temporary page with GFP_NOFS|__GFP_HIGHMEM.
It copies the contents of the original page, and queues a WRITE request to the
userspace filesystem using this temp page.
The writeback is finished instantly from the MM's point of view: the page is
removed from the radix trees, and the PageDirty and PageWriteback flags are
cleared.
For the duration of the actual write, the NR_WRITEBACK_TEMP counter is
incremented. The per-bdi writeback count is not decremented until the actual
write completes.
On dirtying the page, fuse waits for a previous write to finish before
proceeding. This makes sure, there can only be one temporary page used at a
time for one cached page.
This approach is wasteful in both memory and CPU bandwidth, so why is this
complication needed?
The basic problem is that there can be no guarantee about the time in which
the userspace filesystem will complete a write. It may be buggy or even
malicious, and fail to complete WRITE requests. We don't want unrelated parts
of the system to grind to a halt in such cases.
Also a filesystem may need additional resources (particularly memory) to
complete a WRITE request. There's a great danger of a deadlock if that
allocation may wait for the writepage to finish.
Currently there are several cases where the kernel can block on page
writeback:
- allocation order is larger than PAGE_ALLOC_COSTLY_ORDER
- page migration
- throttle_vm_writeout (through NR_WRITEBACK)
- sync(2)
Of course in some cases (fsync, msync) we explicitly want to allow blocking.
So for these cases new code has to be added to fuse, since the VM is not
tracking writeback pages for us any more.
As an extra safetly measure, the maximum dirty ratio allocated to a single
fuse filesystem is set to 1% by default. This way one (or several) buggy or
malicious fuse filesystems cannot slow down the rest of the system by hogging
dirty memory.
With appropriate privileges, this limit can be raised through
'/sys/class/bdi/<bdi>/max_ratio'.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b88473f73e6d7b6af9cfc4ecc349d82c75d9a6af
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:39 2008 -0700
mm: document missing fields for /proc/meminfo
A few fields in /proc/meminfo were not documented. Fix.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fc3ba692a4d19019387c5acaea63131f9eab05dd
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:38 2008 -0700
mm: Add NR_WRITEBACK_TEMP counter
Fuse will use temporary buffers to write back dirty data from memory mappings
(normal writes are done synchronously). This is needed, because there cannot
be any guarantee about the time in which a write will complete.
By using temporary buffers, from the MM's point if view the page is written
back immediately. If the writeout was due to memory pressure, this
effectively migrates data from a full zone to a less full zone.
This patch adds a new counter (NR_WRITEBACK_TEMP) for the number of pages used
as temporary buffers.
[Lee.Schermerhorn at hp.com: add vmstat_text for NR_WRITEBACK_TEMP]
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dd5656e59ca7b25fb60a22f9079905ed0da5ed0c
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:37 2008 -0700
mm: bdi: export bdi_writeout_inc()
Fuse needs this for writable mmap support.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e4ad08fe64afca4ef79ecc4c624e6e871688da0d
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:37 2008 -0700
mm: bdi: add separate writeback accounting capability
Add a new BDI capability flag: BDI_CAP_NO_ACCT_WB. If this flag is
set, then don't update the per-bdi writeback stats from
test_set_page_writeback() and test_clear_page_writeback().
Misc cleanups:
- convert bdi_cap_writeback_dirty() and friends to static inline functions
- create a flag that includes all three dirty/writeback related flags,
since almst all users will want to have them toghether
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 76f1418b485da2707531178e517bbb5cf06b3c76
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:36 2008 -0700
mm: bdi: move statistics to debugfs
Move BDI statistics to debugfs:
/sys/kernel/debug/bdi/<bdi>/stats
Use postcore_initcall() to initialize the sysfs class and debugfs,
because debugfs is initialized in core_initcall().
Update descriptions in ABI documentation.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a42dde04152750426cc620fd277e80fffae2f65a
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Wed Apr 30 00:54:36 2008 -0700
mm: bdi: allow setting a maximum for the bdi dirty limit
Add "max_ratio" to /sys/class/bdi. This indicates the maximum percentage of
the global dirty threshold allocated to this bdi.
[mszeredi at suse.cz]
- fix parsing in max_ratio_store().
- export bdi_set_max_ratio() to modules
- limit bdi_dirty with bdi->max_ratio
- document new sysfs attribute
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 189d3c4a94ef19fca2a71a6a336e9fda900e25e7
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Wed Apr 30 00:54:35 2008 -0700
mm: bdi: allow setting a minimum for the bdi dirty limit
Under normal circumstances each device is given a part of the total write-back
cache that relates to its current avg writeout speed in relation to the other
devices.
min_ratio - allows one to assign a minimum portion of the write-back cache to
a particular device. This is useful in situations where you might want to
provide a minimum QoS. (One request for this feature came from flash based
storage people who wanted to avoid writing out at all costs - they of course
needed some pdflush hacks as well)
max_ratio - allows one to assign a maximum portion of the dirty limit to a
particular device. This is useful in situations where you want to avoid one
device taking all or most of the write-back cache. Eg. an NFS mount that is
prone to get stuck, or a FUSE mount which you don't trust to play fair.
Add "min_ratio" to /sys/class/bdi. This indicates the minimum percentage of
the global dirty threshold allocated to this bdi.
[mszeredi at suse.cz]
- fix parsing in min_ratio_store()
- document new sysfs attribute
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b6f2fcbcfca9db2bd7aa24940224fcd3bbdbb8aa
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:34 2008 -0700
mm: bdi: expose the BDI object in sysfs for FUSE
Register FUSE's backing_dev_info under sysfs with the name "fuse-MAJOR:MINOR"
Make the fuse control filesystem use s_dev instead of a fuse specific ID.
This makes it easier to match directories under /sys/fs/fuse/connections/ with
directories under /sys/class/bdi, and with actual mounts.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fa799759f9801137f665dbedda2c0815f1bf6f1b
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Apr 30 00:54:33 2008 -0700
mm: bdi: expose the BDI object in sysfs for NFS
Register NFS' backing_dev_info under sysfs with the name "nfs-MAJOR:MINOR"
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Trond Myklebust <trond.myklebust at fys.uio.no>
Cc: "J. Bruce Fields" <bfields at fieldses.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cf0ca9fe5dd9e3693d935757a7b2fc50fc576554
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Wed Apr 30 00:54:32 2008 -0700
mm: bdi: export BDI attributes in sysfs
Provide a place in sysfs (/sys/class/bdi) for the backing_dev_info object.
This allows us to see and set the various BDI specific variables.
In particular this properly exposes the read-ahead window for all relevant
users and /sys/block/<block>/queue/read_ahead_kb should be deprecated.
With patient help from Kay Sievers and Greg KH
[mszeredi at suse.cz]
- split off NFS and FUSE changes into separate patches
- document new sysfs attributes under Documentation/ABI
- do bdi_class_init as a core_initcall, otherwise the "default" BDI
won't be initialized
- remove bdi_init_fmt macro, it's not used very much
[akpm at linux-foundation.org: fix ia64 warning]
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Acked-by: Greg KH <greg at kroah.com>
Cc: Trond Myklebust <trond.myklebust at fys.uio.no>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit caafa4324335aeb11bc233d5f87aca8cce30beba
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:54:31 2008 -0700
pidns: make pid->level and pid_ns->level unsigned
These values represent the nesting level of a namespace and pids living in it,
and it's always non-negative.
Turning this from int to unsigned int saves some space in pid.c (11 bytes on
x86 and 64 on ia64) by letting the compiler optimize the pid_nr_ns a bit.
E.g. on ia64 this removes the sign extension calls, which compiler adds to
optimize access to pid->nubers[ns->level].
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ab883af53ec1b87add43b32a28d8347f17d5155b
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Apr 30 00:54:30 2008 -0700
make marker_debug static
With the needlessly global marker_debug being static gcc can optimize the
unused code away.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 148ff86b11ec51d7d2f7ff863bd85d0dd5aa908c
Author: Christoph Hellwig <hch at lst.de>
Date: Wed Apr 30 00:54:29 2008 -0700
mxser: convert large macros to functions
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 12a3de0a965826096d8adc593bcf4392a7d5b459
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:54:29 2008 -0700
pids: sys_getpgid: fix unsafe *pid usage, s/tasklist/rcu/
1. sys_getpgid() needs rcu_read_lock() to derive the pgrp _nr, even if
the task is current, otherwise we can race with another thread which
does sys_setpgid().
2. Use rcu_read_lock() instead of tasklist_lock when pid != 0, make sure
that we don't use the NULL pid if the task exits right after successful
find_task_by_vpid().
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1dd768c0815334d2319d6377f0750ace075b6142
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:54:28 2008 -0700
pids: sys_getsid: fix unsafe *pid usage, fix possible 0 instead of -ESRCH
1. sys_getsid() needs rcu_read_lock() to derive the session _nr, even if
the task is current, otherwise we can race with another thread which
does sys_setsid().
2. The task can exit between find_task_by_vpid() and task_session_vnr(),
in that unlikely case sys_getsid() returns 0 instead of -ESRCH.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7d8da0962eaee30b4a380ded177349bfbdd6ac46
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:54:27 2008 -0700
pids: __set_special_pids: use change_pid() helper
Use change_pid() instead of detach_pid() + attach_pid() in
__set_special_pids().
This way task_session() is not NULL in between.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 83beaf3c6c75b36b7c9be7f555c8cf7797842cc5
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:54:27 2008 -0700
pids: sys_setpgid: use change_pid() helper
Use change_pid() instead of detach_pid() + attach_pid() in sys_setpgid().
This way task_pgrp() is not NULL in between.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 24336eaeecea860b2a82530e07c80bc7e0558b73
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:54:26 2008 -0700
pids: introduce change_pid() helper
Based on Eric W. Biederman's idea.
Without tasklist_lock held task_session()/task_pgrp() can return NULL if the
caller races with setprgp()/setsid() which does detach_pid() + attach_pid().
This can happen even if task == current.
Intoduce the new helper, change_pid(), which should be used instead. This way
the caller always sees the special pid != NULL, either old or new.
Also change the prototype of attach_pid(), it always returns 0 and nobody
check the returned value.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 65450cebc6a2efde80ed45514f727e6e4dc1eafd
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:54:25 2008 -0700
pids: de_thread: don't clear session/pgrp pids for the old leader
Based on Eric W. Biederman's idea.
Unless task == current, without tasklist_lock held task_session()/task_pgrp()
can return NULL if the caller races with de_thread() which switches the group
leader.
Change transfer_pid() to not clear old->pids[type].pid for the old leader.
This means that its .pid can point to "nowhere", but this is already true for
sub-threads, and the old leader is not group_leader() any longer. IOW, with
or without this change we can't trust task's special pids unless it is the
group leader.
With this change the following code
rcu_read_lock();
task = find_task_by_xxx();
do_something(task_pgrp(task), task_session(task));
rcu_read_unlock();
can't race with exec and hit the NULL pid.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5cd204550b1a006f2b0c986b0e0f53220ebfd391
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:54:24 2008 -0700
Deprecate find_task_by_pid()
There are some places that are known to operate on tasks'
global pids only:
* the rest_init() call (called on boot)
* the kgdb's getthread
* the create_kthread() (since the kthread is run in init ns)
So use the find_task_by_pid_ns(..., &init_pid_ns) there
and schedule the find_task_by_pid for removal.
[sukadev at us.ibm.com: Fix warning in kernel/pid.c]
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cb41d6d068716b2b3666925da34d3d7e658bf4f3
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:54:23 2008 -0700
Use find_task_by_vpid in taskstats
The pid to lookup a task by is passed inside taskstats code via genetlink
message.
Since netlink packets are now processed in the context of the sending task,
this is correct to lookup the task with find_task_by_vpid() here.
Besides, I fix the call to fill_pid() from taskstats_exit(), since the
tsk->pid is not required in fill_pid() in this case, and the pid field on
task_struct is going to be deprecated as well.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Jay Lan <jlan at engr.sgi.com>
Cc: Jonathan Lim <jlim at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b7127aa4547d8cc8a5b569631e2b6ef613af1bb7
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:54:22 2008 -0700
free_pidmap: turn it into free_pidmap(struct upid *)
The callers of free_pidmap() pass 2 members of "struct upid", we can just
pass "struct upid *" instead. Shaves off 10 bytes from pid.o.
Also, simplify the alloc_pid's "out_free:" error path a little bit. This
way it looks more clear which subset of pid->numbers[] we are freeing.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc :Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 718a916338e821a10961e6a7a17430c18e5e58d9
Author: Sukadev Bhattiprolu <sukadev at us.ibm.com>
Date: Wed Apr 30 00:54:21 2008 -0700
devpts: factor out PTY index allocation
Factor out the code used to allocate/free a pts index into new interfaces,
devpts_new_index() and devpts_kill_index(). This localizes the external data
structures used in managing the pts indices.
[akpm at linux-foundation.org: undo accidental mutex2sem conversion]
Signed-off-by: Sukadev Bhattiprolu <sukadev at us.ibm.com>
Signed-off-by: Serge Hallyn <serue at us.ibm.com>
Signed-off-by: Matt Helsley <matthltc at us.ibm.com>
Acked-by: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4f8f9d66cdac4845409f7520e4f287a1907a6bf9
Author: Sukadev Bhattiprolu <sukadev at us.ibm.com>
Date: Wed Apr 30 00:54:20 2008 -0700
devpts: propagate error code from devpts_pty_new
Have ptmx_open() propagate any error code returned by devpts_pty_new()
(which returns either 0 or -ENOMEM anyway).
Signed-off-by: Sukadev Bhattiprolu <sukadev at us.ibm.com>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Acked-by: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 86a96538178f923aa1aa43c1e7cfec5951df7f8a
Author: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
Date: Wed Apr 30 00:54:20 2008 -0700
tty: fix routine name in ptmx_open()
At ptmx_open(), the 2nd parameter for check_tty_count() should
be "ptmx_open".
Signed-off-by: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 24cb233520f01971d6d873cb52c64bbbb0665ac0
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:19 2008 -0700
char serial: switch drivers to ioremap_nocache
Simple search/replace except for synclink.c where I noticed a real bug and
fixed it too. It was doing NULL + offset, then checking for NULL if the remap
failed.
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Paul Fulghum <paulkf at microgate.com>
Acked-by: Jiri Slaby <jirislaby at gmail.com>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a6fc819ebe2d70c92e43e14adbb93a5bd8ea5aa3
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:18 2008 -0700
ip2: switch remaining direct call of ops->flush_buffer
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 39c2e60f8c584c1b29b5c4375dd49df7995386bb
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:18 2008 -0700
tty: add throttle/unthrottle helpers
Something Arjan suggested which allows us to clean up the code nicely
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Arjan van de Ven <arjan at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8cd64518a3d166a21f5c69ac7860b3add0369dd0
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:17 2008 -0700
isicom: fix buffer allocation
Fix the rather strange buffer management on open that turned up while auditing
for BKL dependencies.
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fb100b6ea7bf8a95e52b90cc0dc0ea5744a0a40a
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:16 2008 -0700
esp: clean up to modern coding style
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 191260a01257793ad76cc35b7f9e1508d27bdd4b
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:16 2008 -0700
epca: coding style
Clean up the epca driver
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9492e13516f00340d7d01d81551eea8deb0b8d0e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:15 2008 -0700
riscom8: coding style
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8e8bcf16c2b2f949dfafa3e8e94a51fd37bfc3ef
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:14 2008 -0700
strip: Fix up strip for the new order
- Use the tty baud functions
- Call driver termios methods directly holding the right locking
- Check for a write method
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: David S. Miller <davem at davemloft.net>
Cc: Jeff Garzik <jeff at garzik.org>
Cc: "John W. Linville" <linville at tuxdriver.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f34d7a5b7010b82fe97da95496b9971435530062
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:13 2008 -0700
tty: The big operations rework
- Operations are now a shared const function block as with most other Linux
objects
- Introduce wrappers for some optional functions to get consistent behaviour
- Wrap put_char which used to be patched by the tty layer
- Document which functions are needed/optional
- Make put_char report success/fail
- Cache the driver->ops pointer in the tty as tty->ops
- Remove various surplus lock calls we no longer need
- Remove proc_write method as noted by Alexey Dobriyan
- Introduce some missing sanity checks where certain driver/ldisc
combinations would oops as they didn't check needed methods were present
[akpm at linux-foundation.org: fix fs/compat_ioctl.c build]
[akpm at linux-foundation.org: fix isicom]
[akpm at linux-foundation.org: fix arch/ia64/hp/sim/simserial.c build]
[akpm at linux-foundation.org: fix kgdb]
Signed-off-by: Alan Cox <alan at redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 251b8dd7eee30fda089a1dc088abf4fc9a0dee9c
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:12 2008 -0700
isicom: bring into coding style
[akpm at linux-foundation.org: fix arm, cleanups]
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 23d22cea85ba9114a59a32ca8dfb1e2aef52a278
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:11 2008 -0700
serial: switch the serial core to int put_char methods
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 56dbbb9a5704f665068778d4d2c1bdf757756e60
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:10 2008 -0700
pc300: Update to tty_set_operations
This driver somehow escaped the tty operations changes way back when. Update
it so that we can switch to tty->ops shortly.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3e8e88ca053150efdbecb45d8f481cf560ec808d
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:10 2008 -0700
pty: prepare for tty->ops changes
We are about to change the tty layer to avoid keeping private copies of all
the methods in each tty. We have to update the pty layer first as it
currently patches the ioctl method according to the tty type. Use multiple
tty operations sets instead.
Signed-off-by: Alan Cox <alan at redhat.com>
Acked-by: "H. Peter Anvin" <hpa at zytor.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f2545a75632d18d62aa287b9e5d207255cc8bffc
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:09 2008 -0700
isdn: switch to int put_char method
Signed-off-by: Alan Cox <alan at redhat.com>
Acked-by: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5d19f546e7b6f0976f957780f2687c55668f4495
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:08 2008 -0700
consoles: switch to int put_char method
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Antonino Daplas <adaplas at pol.net>
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Cc: Kelly Daly <kelly at au.ibm.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Jiri Slaby <jirislaby at gmail.com>
Cc: Samuel Thibault <samuel.thibault at ens-lyon.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 55da77899c1472d83452c914fa179d00ea96df65
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:07 2008 -0700
synclink series: switch to int put_char method
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Paul Fulghum <paulkf at microgate.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6ae045767b2adae4e8fc054b980326a971ac4c8e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:07 2008 -0700
specialix: Switch to int put_char method
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a5b08c66194fba02a865b397579b7204688bcb1e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:05 2008 -0700
serial167: switch to int put_char method
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Cc: Jeff Dike <jdike at addtoit.com>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bbbbb96f5ea84971545ecae5a9ec50387cd9c6a3
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:05 2008 -0700
riscom/rocket: switch to int put_char method
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d7e752e2757fba49178f4b1af4778ca64d305cbb
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:04 2008 -0700
pcmcia: serial to int put_char method
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Dominik Brodowski <linux at dominikbrodowski.net>
Cc: Paul Fulghum <paulkf at microgate.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0be2eadee7baff96d2c7339be4bc2a0f5c96e4f5
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:03 2008 -0700
mxser: switch to put_char being int
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 76b25a5509bbafdbfc7d7d6b41a3c64947d59360
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:03 2008 -0700
char: switch gs, cyclades and esp to return int for put_char
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 257afa3cb6beaad60849655cb272d4b9de74cf63
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:02 2008 -0700
amiserial: Switch put char to return success/fail
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4cd55ab1f991e4d4f3551a711f0f87441a57cd1b
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:01 2008 -0700
usb gadget: switch to put_char returning int
Signed-off-by: Alan Cox <alan at redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 09a6ffa84c8e893d9656296b322dc8145e09e186
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:01 2008 -0700
serial m68k: put_char returns
Signed-off-by: Alan Cox <alan at redhat.com>
Acked-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9e7c9a19c1df8a7450c56c41b9c7405eca7eda07
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:54:00 2008 -0700
s390 tty: Prepare for put_char to return success/fail
Put the changes into the drivers first. This will still compile/work but
produce a warning if bisected so can still be debugged
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Christian Borntraeger <borntraeger at de.ibm.com>
Cc: Peter Oberparleiter <peter.oberparleiter at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 978e595f88a1fba5869aa42a4af4fba36f33ecac
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:59 2008 -0700
tty/serial: lay the foundations for the next set of reworks
- Stop drivers calling their own flush method indirectly, it obfuscates code
and it will change soon anyway
- A few more lock_kernel paths temporarily needed in some driver internal
waiting code
- Remove private put_char method that does a write call for one char - we
have that anyway
- Most but not yet all of the termios copy under lock fixing (some has other
dependencies to follow)
- Note a few locking bugs in drivers found in the process
- Kill remaining [ab]users of TIOCG/SSOFTCAR in the driver, these must go to
fix the termios locking
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ac0e4b7d319bf284bb64bc7e1c051417386b34a4
Author: Julia Lawall <julia at diku.dk>
Date: Wed Apr 30 00:53:58 2008 -0700
drivers/char/ds1286.c: use time_before, time_before_eq, etc
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ change_compare_np @
expression E;
@@
(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)
@ include depends on change_compare_np @
@@
#include <linux/jiffies.h>
@ no_include depends on !include && change_compare_np @
@@
#include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d6f6341a6475eb7f9c2b948a7d0fd56fd16ad675
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:57 2008 -0700
Char: rio, fix cirrus defines
Rename defines to be in RIO* namespace to not to collide with other defines in
tree. This broke (as akpm correctly pointed out) some allmodconfig builds,
e.g. on ppc:
In file included from drivers/char/rio/rio_linux.c:81:
drivers/char/rio/cirrus.h:202:1: warning: "COMPLETE" redefined
In file included from include/net/netns/ipv4.h:8,
from include/net/net_namespace.h:13,
from include/linux/seq_file.h:7,
from include/asm/machdep.h:12,
from include/asm/pci.h:17,
from include/linux/pci.h:951,
from drivers/char/rio/rio_linux.c:50:
include/net/inet_frag.h:28:1: warning: this is the location of the previous definition
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cd989b3a8c30148c872c7677c7a0415584f1658c
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:56 2008 -0700
cyclades: use ioremap_nocache for clarity as proposed
Signed-off-by: Alan Cox <alan at redhat.com>
Acked-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 15ed6cc0ba6b7beaf31c6756b0c838188800051b
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:55 2008 -0700
cyclades: coding style & review
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Arnaldo Carvalho de Melo <acme at ghostprotocols.net>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e5b393e4f1178faaf3d7c22ef63e70c79633bd66
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:54 2008 -0700
istallion: TIOCG/SSOFTCAR handling removal
This is handled (and correctly) by the core code so does not belong
incorrectly in the driver.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cf1c63c3e68679dcac1cc6a37e619d9106ebc0ca
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:54 2008 -0700
Char: ip2, macros cleanup
- remove i2os.h -- there was only macro to macro renaming or useless
stuff
- remove another uselless stuf (NULLFUNC, NULLPTR, YES, NO)
- use outb/inb directly
- use locking functions directly
- don't define another ROUNDUP, use roundup(x, 2) instead
- some comments and whitespace cleanup
- remove some commented crap
- prepend the rest by I2 prefix to not collide with rest of the world
like in following output (pointed out by akpm)
In file included from drivers/char/ip2/ip2main.c:128:
drivers/char/ip2/i2ellis.h:608:1: warning: "COMPLETE" redefined
In file included from include/net/netns/ipv4.h:8,
from include/net/net_namespace.h:13,
from include/linux/seq_file.h:7,
from include/asm/machdep.h:12,
from include/asm/pci.h:17,
from include/linux/pci.h:951,
from drivers/char/ip2/ip2main.c:95:
include/net/inet_frag.h:28:1: warning: this is the location of the previous definition
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 83e422b7649267067975cbb17a878b5f9dfd2de3
Author: Jon Schindler <jkschind at gmail.com>
Date: Wed Apr 30 00:53:53 2008 -0700
drivers/char/ip2/ip2main.c: replace init_module&cleanup_module with module_init&module_exit
Replace init_module and cleanup_module with static functions and
module_init/module_exit.
Signed-off-by: Jon Schindler <jkschind at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 11fb09bfabd699a94555b69d6e6c4fa6c3febde8
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:53:52 2008 -0700
epca.c: static functions and integer as NULL pointer fixes
drivers/char/epca.c:926:28: warning: Using plain integer as NULL pointer
drivers/char/epca.c:1841:2: warning: Using plain integer as NULL pointer
Forward declarations were already marked static, mark the definitions too.
drivers/char/epca.c:2493:6: warning: symbol 'digi_send_break' was not declared. Should it be static?
drivers/char/epca.c:2881:12: warning: symbol 'init_PCI' was not declared. Should it be static?
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:53:52 2008 -0700
cyclades.c: fix sparse shadowed variable warnings
Nested min() macros.
drivers/char/cyclades.c:2750:7: warning: symbol '_x' shadows an earlier one
drivers/char/cyclades.c:2750:7: originally declared here
drivers/char/cyclades.c:2750:7: warning: symbol '_x' shadows an earlier one
drivers/char/cyclades.c:2750:7: originally declared here
drivers/char/cyclades.c:2750:7: warning: symbol '_y' shadows an earlier one
drivers/char/cyclades.c:2750:7: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 709107fcd3c4ad82ff7c8137c27aa951d671706f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:53:51 2008 -0700
char: rocket.c: fix sparse variable shadowing and int as NULL pointer
Nested min() macros shadow _x, separate into two lines.
drivers/char/rocket.c:451:7: warning: symbol '_x' shadows an earlier one
drivers/char/rocket.c:451:7: originally declared here
drivers/char/rocket.c:451:7: warning: symbol '_x' shadows an earlier one
drivers/char/rocket.c:451:7: originally declared here
drivers/char/rocket.c:451:7: warning: symbol '_y' shadows an earlier one
drivers/char/rocket.c:451:7: originally declared here
drivers/char/rocket.c:1754:7: warning: symbol '_x' shadows an earlier one
drivers/char/rocket.c:1754:7: originally declared here
drivers/char/rocket.c:1754:7: warning: symbol '_x' shadows an earlier one
drivers/char/rocket.c:1754:7: originally declared here
drivers/char/rocket.c:1754:7: warning: symbol '_y' shadows an earlier one
drivers/char/rocket.c:1754:7: originally declared here
drivers/char/rocket.c:1751:20: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d3ceb6562bfbe8f27fa32d1e24eea0e2d4de0347
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:53:50 2008 -0700
char: esp.c: fix possible double-unlock
Hitting either of the break statements in the while loop would cause a
double-unlock of info->lock.
[Jiri Slaby suggested simply returning is safe here, rather than a goto]
Noticed by sparse:
drivers/char/esp.c:2042:2: warning: context imbalance in 'rs_wait_until_sent' - unexpected unlock
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f5592268a5aa5e02f36f396de47c94a1506e3678
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Apr 30 00:53:50 2008 -0700
char: fix sparse shadowed variable warnings in esp.c
flags only use was in spin_lock_irqsave/spin_lock_irgrestore pairs, no
need to redeclare for each one.
drivers/char/esp.c:1599:17: warning: symbol 'flags' shadows an earlier one
drivers/char/esp.c:1517:16: originally declared here
drivers/char/esp.c:1615:17: warning: symbol 'flags' shadows an earlier one
drivers/char/esp.c:1517:16: originally declared here
drivers/char/esp.c:1631:17: warning: symbol 'flags' shadows an earlier one
drivers/char/esp.c:1517:16: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ec09cd562135158dcb8a6c08e5a9efa36febedb1
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:49 2008 -0700
Char: moxa, add firmware loading fix
Be more verbose on fw load fail as noted by Oyvind.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Cc: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b9705b603d1d29471aa2977e6310f4f9a4e85925
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:48 2008 -0700
Char: moxa, update credits
- update version
- update maintainers
- copyright the stuff
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bb9f910a1153101a2f92620f1e7d0fda786c9812
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:48 2008 -0700
Char: moxa, notify about board readiness
Drop a message to dmesg about card being ready.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 08d01c792568ba07d2bcf5202dbc8484dbff6747
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:47 2008 -0700
Char: moxa, introduce MOXA_IS_320 macro
It allows to simplify the code, especially MoxaPortSetBaud.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 92d30a9372040a6411e6ed1234fea6153e750874
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:47 2008 -0700
Char: moxa, remove useless tty functions
- moxa_flush_chars -- no code; ldics handle this well
- moxa_put_char -- only wrapper to moxa_write (same code), tty does this
the same way if tty->driver->put_char is NULL
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eaa95a8da6366c34d3a61e93109e5f8f8a4e72a0
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:46 2008 -0700
Char: moxa, little cleanup
Cleanup of
- whitespace
- macros
- useless casts
- return (sth); -> return sth;
- types
- superfluous parenthesis and braces
- init tmp directly in moxa_get_serial_info
- commented defunct code
- commented prototypes
- MOXA/moxa printk case
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a8f5cda067e2eeefe49fe386caf0f61fc5c825e0
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:45 2008 -0700
Char: moxa, rework open/close
- add locking to open/close/hangup and ioctl (tiocm)
- add pci hot-un-plug support (hangup on board remove, wait for openers)
- cleanup block_till_ready
- move close code common to close/hangup into separate function to be
able to call it from open when hangup occurs while block_till_ready
- let ldisc flush on tty layer, it will do it after we return
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2a5413416b6b2fd8a5a38601a4fe3b56a52cfb86
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:45 2008 -0700
Char: moxa, serialise timer
- del timer after we are sure it won't be fired again
- make timer scheduling atomic
- don't reschedule timer when all cards have gone
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2108eba5c531c12f5ae2ed2ef4cee7bf4246897b
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:44 2008 -0700
Char: moxa, cleanup rx/tx
- cleanup types
- use tty_prepare_flip_string and io memcpys
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7bcf97d1dd88135b58c7adb7c3bfebab55b21a20
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:43 2008 -0700
Char: moxa, merge 2 poll functions
- merge 2 timers into one -- one can handle the emptywait as good as the other
- merge 2 separated poll functions into one, this allows handle the actions
directly and simplifies the code
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 74d7d97b9e2a090a4b1812b5074ac6c539234ebb
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:43 2008 -0700
Char: moxa, ioctl cleanup
- allow stats only for sys_admin
- move TCSBRK* processing to .break_ctl tty op
- let TIOCGSOFTCAR and TIOCSSOFTCAR be processed by ldisc
- remove MOXA_GET_MAJOR, MOXA_GET_CUMAJOR
- fix jiffies subtraction by time_after
- move moxa ioctl numbers into the header; still not exported to userspace,
needs _IOC and 32/64 compat cleanup anyways
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0bcc4caadc8f5396b52950ee03c67b76875602df
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:42 2008 -0700
Char: moxa, timer cleanup
- schedule timer even after some card is installed, not after insmod
- cleanup timer functions
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 810ab09b2f3a4e9a6f553e3d1e84a27f4074de9c
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:41 2008 -0700
Char: moxa, centralize board readiness
The only relevant sign of port being ready is its board->ready since now.
Remove all other flags for this purpose which are set almost on the same
place. Move ports inside the board to be sure that nobody will grab reference
to the port without being sure that it exists.
[jirislaby at gmail.com: fix unused var warning]
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 97506056bdf0f230854142ffa986c616a0a5536e
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:41 2008 -0700
Char: moxa, remove unused port entries
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b4173f45758a5b5185acb302c507289e661d9419
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:40 2008 -0700
Char: moxa, remove port->port
We don't need to hold a reference to port index. In most cases we need port
structure anyway and index is available in port->tty->index.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5292bcd38e4bcd147905941b5e37b5b0da1a5577
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:39 2008 -0700
Char: moxa, merge c2xx and c320 firmware loading
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 037182346f0991683cc7320a257c3f6089432cee
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:39 2008 -0700
Char: moxa, add firmware loading
Substitute ioctl load firmware interface by kernel firmware api.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9e9fc313ffa3cb92f7f81a8e076566bc9d582351
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:38 2008 -0700
Char: moxa, fix TIOC(G/S)SOFTCAR param
according to ioctl_list, both have int * as a param, not ulong *.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e46a5e3ff06b70690d567bdc81faf6c1c32e742f
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:37 2008 -0700
Char: moxa, pci io space fixup
- request region before remapping pci io space
- use ioremap, iounmap istead of iomap interface, because we use
readX/writeX for accessing this space because of isa support
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d353eca4e0480fddcb088c4692e1edba0a82eac9
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:37 2008 -0700
Char: moxa, cleanup module-param passed isa init
Make the code more readable, remap the base address directly. Describe module
parameters.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 37794952a685538f20ac9792e98f1c9b161dbdfe
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Apr 30 00:53:36 2008 -0700
Char: moxa, remove static isa support
Static ISA field is empty and probably will never be filled in, remove it.
The driver still supports ISA cards passed through module parameter. This
actually fixes one bug inside the initialization of module-param passed cards
initialization.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cbacdd9572285c86848dd323dc764abb3681ddbc
Author: Dimitri Sivanich <sivanich at sgi.com>
Date: Wed Apr 30 00:53:35 2008 -0700
SGI Altix mmtimer: allow larger number of timers per node
The purpose of this patch to the SGI Altix specific mmtimer (posix timer)
driver is to allow a virtually infinite number of timers to be set per
node.
Timers will now be kept on a sorted per-node list and a single node-based
hardware comparator is used to trigger the next timer.
[akpm at linux-foundation.org: mark things static]
[akpm at linux-foundation.org: fix warning]
Signed-off-by: Dimitri Sivanich <sivanich at sgi.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d17468c73e138e1108b279acf892dd35937d43ed
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:34 2008 -0700
tty: drop the BKL for driver/ldisc ioctl methods
Now we have pushed the lock down we can stop wrapping the call with a lock in
the tty layer.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1c2630ccf922b7ea2c54c184243d4fb2bd2cf3c6
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:34 2008 -0700
tty_ioctl: soft carrier handling
First cut at moving the soft carrier handling knowledge entirely into the core
code. One or two drivers still needed to snoop these functions to track
CLOCAL internally. Instead make TIOCSSOFTCAR generate the same driver calls
as other termios ioctls changing the clocal flag. This allows us to remove
any driver knowledge and special casing. Also while we are at it we can fix
the error handling.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0ee9cbb3c705903db9c258047d9ce87096e6a1a1
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:32 2008 -0700
tty_ioctl: locking for tty_wait_until_sent
This function still depends on the big kernel lock in some cases. Push
locking into the function ready for removal of the BKL from ioctl call paths.
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Andi Kleen <andi at firstfloor.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5d0fdf1e01899805b6c2c0b789a707dcb731b1ea
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:31 2008 -0700
tty_io: fix remaining pid struct locking
This fixes the last couple of pid struct locking failures I know about.
[oleg at tv-sign.ru: clean up do_task_stat()]
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 575537b3248ee9b7578a3bb3df33fcdda2bfc4d5
Author: Joe Peterson <joe at skyrush.com>
Date: Wed Apr 30 00:53:30 2008 -0700
Resume TTY on SUSP and fix CRNL order in N_TTY line discipline
Refine these behaviors in the N_TTY line discipline:
1) Handle the signal characters consistently when received in a stopped TTY
so that SUSP (typically ctrl-Z) behaves like INTR and QUIT in resuming a
stopped TTY.
2) Adjust the order in which the IGNCR/ICRNL/INLCR processing is applied to
be more logical and consistent with the behavior of other Unix systems.
Signed-off-by: Joe Peterson <joe at skyrush.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 47f86834bbd4193139d61d659bebf9ab9d691e37
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:30 2008 -0700
redo locking of tty->pgrp
Historically tty->pgrp and friends were pid_t and the code "knew" they were
safe. The change to pid structs opened up a few races and the removal of the
BKL in places made them quite hittable. We put tty->pgrp under the ctrl_lock
for the tty.
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 04f378b198da233ca0aca341b113dc6579d46123
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:29 2008 -0700
tty: BKL pushdown
- Push the BKL down into the line disciplines
- Switch the tty layer to unlocked_ioctl
- Introduce a new ctrl_lock spin lock for the control bits
- Eliminate much of the lock_kernel use in n_tty
- Prepare to (but don't yet) call the drivers with the lock dropped
on the paths that historically held the lock
BKL now primarily protects open/close/ldisc change in the tty layer
[jirislaby at gmail.com: a couple of fixes]
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e52384426064bca0669a954736206adca7595d48
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:28 2008 -0700
serial_core: Prepare for BKL push down
Instead of checking for the BKL in these methods, take it ourselves. That
avoids propogating it into the serial drivers and we can then fix them later
on.
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c0754c99a6bcfcba7e1d68b75e3f25cb367af0fa
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:27 2008 -0700
68360serial: Note that there isn't any info->mcr locking
Noticed while auditing the code for the BKL elimination project
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6e4d376c664ded7cb9cc1c7d0cae67c9672e46b1
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:27 2008 -0700
isdn_tty: Prepare for BKL push down
Three things here
- Remove softcar handler
- Correct termios change detection logic
- Wrap break/ioctl in lock_kernel ready to drop it in the caller
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9cc3c22bf017f33612748aeb466fdc3695fb1e1d
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:26 2008 -0700
vt_ioctl: Prepare for BKL push down
This one could do with some eyeballs on it. In theory it simply wraps the
ioctl handler in lock/unlock_kernel ready for the lock/unlocks to be pushed
into specific switch values. To do that means changing the code to return via
a common exit path not all over the place as it does now, hence the big diff
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dd9a451aad4fd7d5f46d2300c0e4fb70d8914453
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:25 2008 -0700
viocons: BKL locking
For some weird reason I can't ascertain (translation "I think its
broken") the viocons driver calls directly into the n_tty ldisc code even
if another ldisc is in use. It'll probably break if you do that but I'm
just fixing the locking and adding a comment that its horked.
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1f8cabb7055b98300aa0798ee0f6513dfc130cc2
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:24 2008 -0700
synclink series: Prepare for BKL pushdown
As these are quite complex I've simply pushed the BKL down into the ioctl
handler not tried to do anything neater.
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Paul Fulghum <paulkf at microgate.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 341339e7aff33e3aa73d6c49dbd5a79be0bbec04
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:24 2008 -0700
sx: prepare for BKL pushdown
Wrap the ioctl handler, and in this case the break handler also in the
BKL. Remove bogus softcar handlers.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f433c65b8acb5346e6fefff4e4b97711c987ccf9
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:23 2008 -0700
stallion: Prepare for BKL push down
Remove broken softcar functions, wrap ioctl handler in BKL
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b190e178f63e8dad7755054e02dc18a24ea6f0ac
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:22 2008 -0700
specialix: Prepare for BKL pushdown
Lock the ioctl handlers and remove bogus softcar handling.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 638157bc1461f6718eeca06bedd9a09cf1f35c36
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:22 2008 -0700
serial167: prepare to push BKL down into drivers
Kill the softcar handlers again, wrap the ioctl handler in the BKL
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bdf183aa47dcb46782e22ebd4d1061e47ad74b14
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:21 2008 -0700
rocket: Prepare for BKL pushdown
Wrap the ioctl code in lock_kernel calls
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eb1745529622f204733139bde2201eb4ee994c03
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:21 2008 -0700
riscom8: Prepare for BKL pushdown
Push the locking down into a couple of functions that need it and remove
bogus TIOCG/SSOFTCAR handling
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9d6d162d495d7abf2bfcdffc73c0892f1179579a
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:20 2008 -0700
mxser: prepare for BKL pushdown
Push the BKL down into various internal routines in the driver ready to
remove it from the break, ioctl and other call points.
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3736113654165b5f4b8658b6a34d74631e0b7d81
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:19 2008 -0700
isicom: istallion prepare for lock_kernel pushdown
This is an ancient driver so just wrap it in lock_kernel internally and
be done.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1eac494738a0447ef0c423ee2066f85a44ab59f5
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:19 2008 -0700
isicom: prepare for lock_kernel push down
Again lock the bits we can't trivially prove are safe without the BKL and
remove the broken TIOCS/GSOFTCAR handler.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5a4bc8c1bde7bcb7f02950764e37e9d6bbdb3e32
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:18 2008 -0700
esp: lock_kernel push down
Push the BKL down into a few internal bits of code in this driver.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 37925e050379ef4db9f4ed251786b6d43da6ec71
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:17 2008 -0700
epca: lock_kernel push down
Prepare epca for removing the lock from above. Most of epca is internally
locked so we can trivially push it down to a few bits of code. Drop the TIOCG/SSOFTCAR handling as that is done *properly* with locks by the mid layer.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7b130c0efd7acbdc3cf9b2e7cc9a26e923feec93
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:16 2008 -0700
cyclades: Prepare for relaxed locking in callers
Basically wrap it in lock_kernel where it is hard to prove the locking is
ok.
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: "John Stoffel" <john at stoffel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e18ce49b5b8f957fb99d66990ff49d527f823210
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:53:16 2008 -0700
amiserial: prepare for locking relaxation in caller
Just wrap this one in a lock_kernel. As I understand it there is no M68K
SMP anyway.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 00cd5c37afd5f431ac186dd131705048c0a11fdb
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:15 2008 -0700
ptrace: permit ptracing of /sbin/init
Afaics, currently there are no kernel problems with ptracing init, it can't
lose SIGNAL_UNKILLABLE flag and be killed/stopped by accident.
The ability to strace/debug init can be very useful if you try to figure out
why it does not work as expected.
However, admin should know what he does, "gdb /sbin/init 1" stops init, it
can't reap orphaned zombies or take care of /etc/inittab until continued. It
is even possible to crash init (and thus the whole system) if you wish,
ptracer has full control.
See also the long discussion: http://marc.info/?t=120628018600001
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Acked-by: Roland McGrath <roland at redhat.com>
Acked-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 33e9fc7d01269737cd5a3b6de1db9d0e796ab708
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:14 2008 -0700
ptrace: ptrace_attach: use send_sig_info() instead force_sig_specific()
Nobody can block/ignore SIGSTOP, no need to use force_sig_specific() in
ptrace_attach. Use the "regular" send_sig_info().
With this patch stracing of /sbin/init doesn't clear its SIGNAL_UNKILLABLE,
but not that this makes ptracing of init safe.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 68cb94786630b34196713794a2880ade17fca887
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:14 2008 -0700
ptrace: __ptrace_unlink: use the ptrace_reparented() helper
Currently __ptrace_unlink() checks list_empty(->ptrace_list) to figure out
whether the child was reparented. Change the code to use ptrace_reparented()
to make this check more explicit and consistent.
No functional changes.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Acked-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 53b6f9fbd3b63af14b4f6268e8b5b80d178d05bc
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:13 2008 -0700
ptrace: introduce ptrace_reparented() helper
Add another trivial helper for the sake of grep. It also auto-documents the
fact that ->parent != real_parent implies ->ptrace.
No functional changes.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Acked-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2800d8d19e51414403df8144eaa214bb03400b87
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:12 2008 -0700
document de_thread() with exit_notify() connection
Add a couple of small comments, it is not easy to see what this code does.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 376e1d2531860358c8a79fecf5f4f42994d03c4d
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:12 2008 -0700
reparent_thread: use same_thread_group()
Trivial, use same_thread_group() in reparent_thread().
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d839fd4d2e95a5fbc4d50aa9d17eed6a5f2094e6
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:11 2008 -0700
ptrace: introduce task_detached() helper
exit.c has numerous "->exit_signal == -1" comparisons, this check is subtle
and deserves a helper. Imho makes the code more parseable for humans. At
least it's surely more greppable.
Also, a couple of whitespace cleanups. No functional changes.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5a8da0ea82db6fa9737041381079fd16f25dcce2
Author: Roland McGrath <roland at redhat.com>
Date: Wed Apr 30 00:53:10 2008 -0700
signals: x86 TS_RESTORE_SIGMASK
Replace TIF_RESTORE_SIGMASK with TS_RESTORE_SIGMASK and define our own
set_restore_sigmask() function. This saves the costly SMP-safe set_bit
operation, which we do not need for the sigmask flag since TIF_SIGPENDING
always has to be set too.
Signed-off-by: Roland McGrath <roland at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f3de272b821accbc8387211977c2de4f38468d05
Author: Roland McGrath <roland at redhat.com>
Date: Wed Apr 30 00:53:09 2008 -0700
signals: use HAVE_SET_RESTORE_SIGMASK
Change all the #ifdef TIF_RESTORE_SIGMASK conditionals in non-arch code to
#ifdef HAVE_SET_RESTORE_SIGMASK. If arch code defines it first, the generic
set_restore_sigmask() using TIF_RESTORE_SIGMASK is not defined.
Signed-off-by: Roland McGrath <roland at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 49eaeb4bc4c901c327ee259c7768be20fd020a30
Author: akpm at linux-foundation.org <akpm at linux-foundation.org>
Date: Wed Apr 30 00:53:09 2008 -0700
signals: ia64 renumber TIF_RESTORE_SIGMASK
TIF_RESTORE_SIGMASK no longer needs to be in the _TIF_WORK_* masks.
Those low bits are scarce. Renumber TIF_RESTORE_SIGMASK to free one up.
Signed-off-by: Roland McGrath <roland at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 02a029b325854a98e76f0a79ab38bec13e66bd38
Author: Roland McGrath <roland at redhat.com>
Date: Wed Apr 30 00:53:08 2008 -0700
signals: s390: renumber TIF_RESTORE_SIGMASK
TIF_RESTORE_SIGMASK no longer needs to be in the _TIF_WORK_* masks. Those low
bits are scarce, and are all used up now. Renumber TIF_RESTORE_SIGMASK to
free one up.
Signed-off-by: Roland McGrath <roland at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7648d961fcb454d38e864d2d850bc30e078bf7e6
Author: Roland McGrath <roland at redhat.com>
Date: Wed Apr 30 00:53:07 2008 -0700
signals: set_restore_sigmask TIF_SIGPENDING
Set TIF_SIGPENDING in set_restore_sigmask. This lets arch code take
TIF_RESTORE_SIGMASK out of the set of bits that will be noticed on return to
user mode. On some machines those bits are scarce, and we can free this
unneeded one up for other uses.
It is probably the case that TIF_SIGPENDING is always set anyway everywhere
set_restore_sigmask() is used. But this is some cheap paranoia in case there
is an arcane case where it might not be.
Signed-off-by: Roland McGrath <roland at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4e4c22c71144c1b2e22c257ec6cf08ccb5be1165
Author: Roland McGrath <roland at redhat.com>
Date: Wed Apr 30 00:53:06 2008 -0700
signals: add set_restore_sigmask
This adds the set_restore_sigmask() inline in <linux/thread_info.h> and
replaces every set_thread_flag(TIF_RESTORE_SIGMASK) with a call to it. No
change, but abstracts the details of the flag protocol from all the calls.
Signed-off-by: Roland McGrath <roland at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 80fe728d593e3a048a56610de932919f7d6d968a
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:05 2008 -0700
signals: allow the kernel to actually kill /sbin/init
Currently the buggy /sbin/init hangs if SIGSEGV/etc happens. The kernel sends
the signal, init dequeues it and ignores, returns from the exception, repeats
the faulting instruction, and so on forever.
Imho, such a behaviour is not good. I think that the explicit loud death of
the buggy /sbin/init is better than the silent hang.
Change force_sig_info() to clear SIGNAL_UNKILLABLE when the task should be
really killed.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7a5e873f096e04e6d8719e4ecb7b70d2decca503
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:04 2008 -0700
signals: de_thread: simplify the ->child_reaper switching
Now that we rely on SIGNAL_UNKILLABLE flag, de_thread() doesn't need the nasty
hack to kill the old ->child_reaper during the mt-exec.
This also means we can avoid taking tasklist_lock around zap_other_threads().
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fae5fa44f1fd079ffbed8e0add929dd7bbd1347f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:03 2008 -0700
signals: fix /sbin/init protection from unwanted signals
The global init has a lot of long standing problems with the unhandled fatal
signals.
- The "is_global_init(current)" check in get_signal_to_deliver()
protects only the main thread. Sub-thread can dequee the fatal
signal and shutdown the whole thread group except the main thread.
If it dequeues SIGSTOP /sbin/init will be stopped, this is not
right too. Note that we can't use is_global_init(->group_leader),
this breaks exec and this can't solve other problems we have.
- Even if afterwards ignored, the fatal signals sets SIGNAL_GROUP_EXIT
on delivery. This breaks exec, has other bad implications, and this
is just wrong.
Introduce the new SIGNAL_UNKILLABLE flag to fix these problems. It also helps
to solve some other problems addressed by the subsequent patches.
Currently we use this flag for the global init only, but it could also be used
by kthreads and (perhaps) by the sub-namespace inits.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Acked-by: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 193191035ad6268db9f561e81e3474b8be89a5ba
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:02 2008 -0700
signals: check_kill_permission: remove tasklist_lock
Now that task_session() can't return a false NULL, check_kill_permission()
doesn't need tasklist_lock.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2e2ba22ea4fd4bb85f0fa37c521066db6775cbef
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:01 2008 -0700
signals: check_kill_permission: check session under tasklist_lock
This wasn't documented, but as Atsushi Tsuji pointed out
check_kill_permission() needs tasklist_lock for task_session_nr(). I missed
this fact when removed tasklist from the callers.
Change check_kill_permission() to take tasklist_lock for the SIGCONT case.
Re-order security checks so that we take tasklist_lock only if/when it is
actually needed. This is a minimal fix for now, tasklist will be removed
later.
Also change the code to use task_session() instead of task_session_nr().
Also, remove the SIGCONT check from cap_task_kill(), it is bogus (and the
whole function is bogus. Serge, Eric, why it is still alive?).
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Acked-by: Atsushi Tsuji <a-tsuji at bk.jp.nec.com>
Cc: Roland McGrath <roland at redhat.com>
Cc: Serge Hallyn <serue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 53c30337f2c61aff6eecf2a446e839641172f9bd
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:00 2008 -0700
signals: send_signal: be paranoid about signalfd_notify()
send_signal() shouldn't call signalfd_notify() if it then fails with -EAGAIN.
Harmless, just a paranoid cleanup.
Also remove the comment. It is obsolete, signalfd_notify() was simplified and
does a simple wakeup.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Acked-by: Davide Libenzi <davidel at xmailserver.org>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 021e1ae3d85a76ce962a300c96813f04ae50c87c
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:53:00 2008 -0700
signals: document CLD_CONTINUED notification mechanics
A couple of small comments about how CLD_CONTINUED notification works.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7e695a5ef5c1c768d7feb75cc61e42f13d763623
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:59 2008 -0700
signals: fold sig_ignored() into handle_stop_signal()
Rename handle_stop_signal() to prepare_signal(), make it return a boolean, and
move the callsites of sig_ignored() into it.
No functional changes for now. But it would be nice to factor out the "should
we drop this signal" checks as much as possible, before we try to fix the bugs
with the sub-namespace init's signals (actually the global /sbin/init has some
problems with signals too).
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2dce81bff28dceb2153c901883a56f278d91db65
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:58 2008 -0700
signals: cleanup the usage of print_fatal_signal()
Move the callsite of print_fatal_signal() down, under "if
(sig_kernel_coredump(signr))", so we don't need to check signr != SIGKILL.
We are only interested in the sig_kernel_coredump() signals anyway, and due to
the previous changes we almost never can see other fatal signals here except
SIGKILL.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 34c8f07b9ac499a807918eda377193a55f64f8df
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:58 2008 -0700
signals: handle_stop_signal: don't worry about SIGKILL
handle_stop_signal() clears SIGNAL_STOP_DEQUEUED when sig == SIGKILL. Remove
this nasty special case. It was needed to prevent the race with group stop
and exit caused by thread-specific SIGKILL. Now that we use complete_signal()
for private signals too this is not needed, complete_signal() will notice
SIGKILL and abort the soon-to-begin group stop.
Except: the target thread is dead (has PF_EXITING). But in that case we
should not just clear SIGNAL_STOP_DEQUEUED and nothing more. We should either
kill the whole thread group, or silently ignore the signal.
I suspect we are not right wrt zombie leaders, but this is another issue which
and should be fixed separately. Note that this check can't abort the group
stop if it was already started/finished, this check only adds a subtle side
effect if we race with the thread which has already dequeued sig_kernel_stop()
signal and temporary released ->siglock.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ac5c215383f43a106ba4ef298126bf78c126f5e9
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:57 2008 -0700
signals: join send_sigqueue() with send_group_sigqueue()
We export send_sigqueue() and send_group_sigqueue() for the only user,
posix_timer_event(). This is a bit silly, because both are just trivial
helpers on top of do_send_sigqueue() and because the we pass the unused
.si_signo parameter.
Kill them both, rename do_send_sigqueue() to send_sigqueue(), and export it.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e62e6650e99a3dffcd0bf0d063cd818fbc13fa95
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:56 2008 -0700
signals: unify send_sigqueue/send_group_sigqueue completely
Suggested by Pavel Emelyanov.
send_sigqueue/send_group_sigqueue are only differ in how they lock ->siglock.
Unify them. send_group_sigqueue() uses spin_lock() because it knows the task
can't exit, but in that case lock_task_sighand() can't fail and doesn't hurt.
Note that the "sig" argument is ignored, it is always equal to ->si_signo.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4cd4b6d4e0372075f846feb85aea016cbdbfec4c
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:52:55 2008 -0700
signals: fold complete_signal() into send_signal/do_send_sigqueue
Factor out complete_signal() callsites. This change completely unifies the
helpers sending the specific/group signals.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5fcd835bf8c2cde06404559b1904e2f1dfcb4567
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:55 2008 -0700
signals: use __group_complete_signal() for the specific signals too
Based on Pavel Emelyanov's suggestion.
Rename __group_complete_signal() to complete_signal() and use it to process
the specific signals too. To do this we simply add the "int group" argument.
This allows us to greatly simply the signal-sending code and adds a useful
behaviour change. We can avoid the unneeded wakeups for the private signals
because wants_signal() is more clever than sigismember(blocked), but more
importantly we now take into account the fatal specific signals too.
The latter allows us to kill some subtle checks in handle_stop_signal() and
makes the specific/group signal's behaviour more consistent. For example,
currently sigtimedwait(FATAL_SIGNAL) behaves differently depending on was the
signal sent by kill() or tkill() if the signal was not blocked.
And. This allows us to tweak/fix the behaviour when the specific signal is
sent to the dying/dead ->group_leader.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2ca3515aa57224edf0151e05a8c9f21a76bf5957
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:54 2008 -0700
signals: change send_signal/do_send_sigqueue to take "boolean group" parameter
send_signal() is used either with ->pending or with ->signal->shared_pending.
Change it to take "int group" instead, this argument will be re-used later.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 71f11dc025055cb2ef9226424f26b3287efadd26
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:53 2008 -0700
signals: move the definition of __group_complete_signal() up
Move the unchanged definition of __group_complete_signal() so that send_signal
can see it. To simplify the reading of the next patches.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit db51aeccd7097ce19a522a4c5ff91c320f870e2b
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:52 2008 -0700
signals: microoptimize the usage of ->curr_target
Suggested by Roland McGrath.
Initialize signal->curr_target in copy_signal(). This way ->curr_target is
never == NULL, we can kill the check in __group_complete_signal's hot path.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 08d2c30ce98d274137f12b0a9b9c74137455922c
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:51 2008 -0700
signals: send_sig_info: don't take tasklist_lock
The comment in send_sig_info() is wrong, tasklist_lock can't help.
The caller must ensure the task can't go away, otherwise ->sighand can be NULL
even before we take the lock.
p->sighand could be changed by exec(), but I can't imagine how it is possible
to prevent exit(), but not exec().
Since the things seem to work, I assume all callers are correct. However,
drm_vbl_send_signals() looks broken. block_all_signals() which is solely used
by drm is definitely broken.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3547ff3aefbe092ca35506c60c02e2d17a4f2199
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:51 2008 -0700
signals: do_tkill: don't use tasklist_lock
Convert do_tkill() to use rcu_read_lock() + lock_task_sighand() to avoid
taking tasklist lock.
Note that we don't return an error if lock_task_sighand() fails, we pretend
the task dies after receiving the signal. Otherwise, we should fight with the
nasty races with mt-exec without having any advantage.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6e65acba7ca8169e38ab55d62d52f29a75fb141f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:50 2008 -0700
signals: move handle_stop_signal() into send_signal()
Move handle_stop_signal() into send_signal(). This factors out a couple of
callsites and allows us to do further unifications.
Also, with this change specific_send_sig_info() does handle_stop_signal().
Not that this is really important, we never send STOP/CONT via send_sig() and
friends, but still this looks more consistent.
The only (afaics) special case is get_signal_to_deliver(). If the traced task
dequeues SIGCONT, it can re-send it to itself after ptrace_stop() if the
signal was blocked by debugger. In that case handle_stop_signal() is
unnecessary, but hopefully not a problem.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c99fcf28b87d8cab592db7571e3164f5cb54c5b3
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:49 2008 -0700
signals: send_group_sigqueue: don't take tasklist_lock
handle_stop_signal() was changed, now send_group_sigqueue() doesn't need
tasklist_lock.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f8c5b5c06f63fe9aaebefbf9f0b79909066b1b6c
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:49 2008 -0700
signals: __group_complete_signal: cache the value of p->signal
Cosmetic, cache p->signal to make the code a bit more readable.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5fc894bb4fb1de8373d1d5fb6db19204a16859e8
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:48 2008 -0700
signals: send_sigqueue: don't forget about handle_stop_signal()
send_group_sigqueue() calls handle_stop_signal(), send_sigqueue() doesn't.
This is not consistent and in fact I'd say this is (minor) bug.
Move handle_stop_signal() from send_group_sigqueue() to do_send_sigqueue(),
the latter is called by send_sigqueue() too.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5c193e8871b76f3bf8ed1e31f7af7c70890ebc4f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:48 2008 -0700
signals: send_sigqueue: don't take rcu lock
lock_task_sighand() was changed, send_sigqueue() doesn't need rcu_read_lock()
any longer.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f6b76d4fb0039e077824be85ed4ac94e96beef86
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:47 2008 -0700
get_signal_to_deliver: use the cached ->signal/sighand values
Cache the values of current->signal/sighand. Shrinks .text a bit and makes
the code more readable. Also, remove "sigset_t *mask", it is pointless
because in fact we save the constant offset.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ad16a4606939ce1bedb79c87e412467be803e990
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:46 2008 -0700
handle_stop_signal: use the cached p->signal value
Cache the value of p->signal, and change the code to use while_each_thread()
helper.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fc321d2e60d6f4eee17206612d0b50519f526daf
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:46 2008 -0700
handle_stop_signal: unify partial/full stop handling
Now that handle_stop_signal() doesn't drop ->siglock, we can't see both
->group_stop_count && SIGNAL_STOP_STOPPED. Merge two "if" branches.
As Roland pointed out, we never actually needed 2 do_notify_parent_cldstop()
calls.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6ca25b551309eb1b1b41f83414a92f7472e0b23d
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:45 2008 -0700
kill_pid_info: don't take now unneeded tasklist_lock
Previously handle_stop_signal(SIGCONT) could drop ->siglock. That is why
kill_pid_info(SIGCONT) takes tasklist_lock to make sure the target task can't
go away after unlock. Not needed now.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e442055193e4584218006e616c9bdce0c5e9ae5c
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:44 2008 -0700
signals: re-assign CLD_CONTINUED notification from the sender to reciever
Based on discussion with Jiri and Roland.
In short: currently handle_stop_signal(SIGCONT, p) sends the notification to
p->parent, with this patch p itself notifies its parent when it becomes
running.
handle_stop_signal(SIGCONT) has to drop ->siglock temporary in order to notify
the parent with do_notify_parent_cldstop(). This leads to multiple problems:
- as Jiri Kosina pointed out, the stopped task can resume without
actually seeing SIGCONT which may have a handler.
- we race with another sig_kernel_stop() signal which may come in
that window.
- we race with sig_fatal() signals which may set SIGNAL_GROUP_EXIT
in that window.
- we can't avoid taking tasklist_lock() while sending SIGCONT.
With this patch handle_stop_signal() just sets the new SIGNAL_CLD_CONTINUED
flag in p->signal->flags and returns. The notification is sent by the first
task which returns from finish_stop() (there should be at least one) or any
other signalled thread from get_signal_to_deliver().
This is a user-visible change. Say, currently kill(SIGCONT, stopped_child)
can't return without seeing SIGCHLD, with this patch SIGCHLD can be delayed
unpredictably. Another difference is that if the child is ptraced by another
process, CLD_CONTINUED may be delivered to ->real_parent after ptrace_detach()
while currently it always goes to the tracer which doesn't actually need this
notification. Hopefully not a problem.
The patch asks for the futher obvious cleanups, I'll send them separately.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3b5e9e53c6f31b5a5a0f5c43707503c62bdefa46
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:42 2008 -0700
signals: cleanup security_task_kill() usage/implementation
Every implementation of ->task_kill() does nothing when the signal comes from
the kernel. This is correct, but means that check_kill_permission() should
call security_task_kill() only for SI_FROMUSER() case, and we can remove the
same check from ->task_kill() implementations.
(sadly, check_kill_permission() is the last user of signal->session/__session
but we can't s/task_session_nr/task_session/ here).
NOTE: Eric W. Biederman pointed out cap_task_kill() should die, and I think
he is very right.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Serge Hallyn <serue at us.ibm.com>
Cc: Roland McGrath <roland at redhat.com>
Cc: Casey Schaufler <casey at schaufler-ca.com>
Cc: David Quigley <dpquigl at tycho.nsa.gov>
Cc: Eric Paris <eparis at redhat.com>
Cc: Harald Welte <laforge at gnumonks.org>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9e3bd6c3fb2334be171e69b432039cd18bce4458
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:52:41 2008 -0700
signals: consolidate send_sigqueue and send_group_sigqueue
Both functions do the same thing after proper locking, but with
different sigpending structs, so move the common code into a helper.
After this we have 4 places that look very similar: send_sigqueue: calls
do_send_sigqueue and signal_wakeup send_group_sigqueue: calls
do_send_sigqueue and __group_complete_signal __group_send_sig_info:
calls send_signal and __group_complete_signal specific_send_sig_info:
calls send_signal and signal_wakeup
Besides, send_signal performs actions similar to do_send_sigqueue's
and __group_complete_signal - to signal_wakeup.
It looks like they can be consolidated gracefully.
Oleg said:
Personally, I think this change is very good. But send_sigqueue() and
send_group_sigqueue() have a very subtle difference which I was never able
to understand.
Let's suppose that sigqueue is already queued, and the signal is ignored
(the latter means we should re-schedule cpu timer or handle overrruns). In
that case send_sigqueue() returns 0, but send_group_sigqueue() returns 1.
I think this is not the problem (in fact, I think this patch makes the
behaviour more correct), but I hope Thomas can take a look and confirm.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c5363d03637885310f1101b95cbbd26d067b4c8d
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:52:40 2008 -0700
signals: clean dequeue_signal from excess checks and assignments
The signr variable may be declared without initialization - it is set ro the
return value from __dequeue_signal() right at the function beginning.
Besides, after recalc_sigpending() two checks for signr to be not 0 may be
merged into one. Both if-s become easier to read.
Thanks to Oleg for pointing out mistakes in the first version of this patch.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 93585eeaf3d42d608cd7232e7420c93fb676bba1
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:52:39 2008 -0700
signals: consolidate checks for whether or not to ignore a signal
Both sig_ignored() and do_sigaction() check for signr to be explicitly or
implicitly ignored. Introduce a helper for them.
This patch is aimed to help handling signals by pid namespace's init, and was
derived from one of Oleg's patches
https://lists.linux-foundation.org/pipermail/containers/2007-December/009308.html
so, if he doesn't mind, he should be considered as an author.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 06fffb1267c9d986687b69d74a46ee332a50575e
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:38 2008 -0700
do_task_stat: don't take rcu_read_lock()
lock_task_sighand() was changed, and do_task_stat() doesn't need
rcu_read_lock any longer. sighand->siglock protects all "interesting"
fields.
Except: it doesn't protect ->tty->pgrp, but neither does rcu_read_lock(), this
should be fixed.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
Cc: Roland McGrath <roland at redhat.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Cc: Pavel Emelyanov <xemul at sw.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d6cf723a142f63ccb92272bc0e9bfffd3c3a5cac
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:38 2008 -0700
k_getrusage: don't take rcu_read_lock()
Just a trivial example, more to come.
k_getrusage() holds rcu_read_lock() because it was previously required by
lock_task_sighand(). Unneeded now.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1406f2d321bae5ac5ff729dcb773336d9c05ec74
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:37 2008 -0700
lock_task_sighand: add rcu lock/unlock
Most of the callers of lock_task_sighand() doesn't actually need rcu_lock().
lock_task_sighand() needs it only to safely play with tsk->sighand, it can
take the lock itself.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bfc4b0890af566940de6e7aeb4b5faf46d3c3513
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:36 2008 -0700
signals: do_group_exit(): use signal_group_exit() more consistently
do_group_exit() checks SIGNAL_GROUP_EXIT to avoid taking sighand->siglock.
Since ed5d2cac114202fe2978a9cbcab8f5032796d538 exec() doesn't set this
flag, we should use signal_group_exit().
This is not needed for correctness, but can speedup the multithreaded exec
and makes the code more consistent.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 573cf9ad72c13750e86c91de43477e9dfb440523
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Wed Apr 30 00:52:36 2008 -0700
signals: do_signal_stop(): use signal_group_exit()
do_signal_stop() needs signal_group_exit() but checks sig->group_exit_task.
This (optimization) is correct, SIGNAL_STOP_DEQUEUED and SIGNAL_GROUP_EXIT
are mutually exclusive, but looks confusing. Use signal_group_exit(), this
is not fastpath, the code clarity is more important.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2acb024d5524eda305523c1d6061fe5ef1949165
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:52:35 2008 -0700
signals: consolidate checking for ignored/legacy signals
Two callers for send_signal() - the specific_send_sig_info and the
__group_send_sig_info - both check for sig to be ignored or already queued.
Move these checks into send_signal() and make it return 1 to indicate that the
signal is dropped, but there's no error in this.
Besides, merge comments and spell-check them.
[oleg at tv-sign.ru: simplifications]
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit af7fff9c13d56657dc328c75590f401c99bcecd9
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:52:34 2008 -0700
signals: turn LEGACY_QUEUE macro into static inline function
This makes the code more readable, due to less brackets and small letters in
name.
I also move it above the send_signal() as a preparation for the 3rd patch.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: Roland McGrath <roland at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e1401c6bbb289d154eb0d0c292cc9f8259e4af73
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 30 00:52:34 2008 -0700
signals: remove unused variable from send_signal()
This function doesn't change the ret's value and thus always returns 0, with a
single exception of returning -EAGAIN explicitly.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: Roland McGrath <roland at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2deb1acc653cbd5384b107d050d2deba089db2bd
Author: Jan Kara <jack at suse.cz>
Date: Wed Apr 30 00:52:33 2008 -0700
isofs: fix access to unallocated memory when reading corrupted filesystem
When a directory on isofs is corrupted, we did not check whether length of the
name in a directory entry and the length of the directory entry itself are
consistent. This could lead to possible access beyond the end of buffer when
the length of the name was too big. Add this sanity check to directory
reading code.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6bfe0b499082fd3950429017cd8ebf2a6c458aa5
Author: Dan Williams <dan.j.williams at intel.com>
Date: Wed Apr 30 00:52:32 2008 -0700
md: support blocking writes to an array on device failure
Allows a userspace metadata handler to take action upon detecting a device
failure.
Based on an original patch by Neil Brown.
Changes:
-added blocked_wait waitqueue to rdev
-don't qualify Blocked with Faulty always let userspace block writes
-added md_wait_for_blocked_rdev to wait for the block device to be clear, if
userspace misses the notification another one is sent every 5 seconds
-set MD_RECOVERY_NEEDED after clearing "blocked"
-kill DoBlock flag, just test mddev->external
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 11e2ede0228ee0f81ccacd15894908c3bf241f73
Author: Dan Williams <dan.j.williams at intel.com>
Date: Wed Apr 30 00:52:32 2008 -0700
md: prevent duplicates in bind_rdev_to_array
Found when trying to reassemble an active externally managed array. Without
this check we hit the more noisy "sysfs duplicate" warning in the later call
to kobject_add.
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 242b363e2207d14125f52a6701cfda7376a2a2fc
Author: Dan Williams <dan.j.williams at intel.com>
Date: Wed Apr 30 00:52:31 2008 -0700
md: remove a stray command from a copy and paste error in resync_start_store
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 648b629ed406233b0a607a3cf29d8a169876131f
Author: NeilBrown <neilb at suse.de>
Date: Wed Apr 30 00:52:30 2008 -0700
md: fix up switching md arrays between read-only and read-write
When setting an array to 'readonly' or to 'active' via sysfs, we must make the
appropriate set_disk_ro call too.
Also when switching to "read_auto" (which is like readonly, but blocks on the
first write so that metadata can be marked 'dirty') we need to be more careful
about what state we are changing from.
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 31a59e3425d32743738e043c1df1668e0f22bbab
Author: NeilBrown <neilb at suse.de>
Date: Wed Apr 30 00:52:30 2008 -0700
md: fix 'safemode' handling for external metadata.
'safemode' relates to marking an array as 'clean' if there has been no write
traffic for a while (a couple of seconds), to reduce the chance of the array
being found dirty on reboot.
->safemode is set to '1' when there have been no write for a while, and it
gets set to '0' when the superblock is updates with the 'clean' flag set.
This requires a few fixes for 'external' metadata:
- When an array is set to 'clean' via sysfs, 'safemode' must be cleared.
- when we write to an array that has 'safemode' set (there must have been
some delay in updating the metadata), we need to clear safemode.
- Don't try to update external metadata in md_check_recovery for safemode
transitions - it won't work.
Also, don't try to support "immediate safe mode" (safemode==2) for external
metadata, it cannot really work (the safemode timeout can be set very low if
this is really needed).
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d897dbf91490f26dccef3d7056ffd09eb83a15a5
Author: NeilBrown <neilb at suse.de>
Date: Wed Apr 30 00:52:29 2008 -0700
md: reinitialise more mddev fields in do_md_stop.
I keep finding problems where an mddev gets reused and some fields has a value
from a previous usage that confuses the new usage. So clear all fields that
could possible need clearing when calling do_md_stop.
Also initialise the 'level' of a new array to LEVEL_NONE (which isn't 0).
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8377bc808029251c2c0f52116cf87d80291b25bf
Author: NeilBrown <neilb at suse.de>
Date: Wed Apr 30 00:52:28 2008 -0700
md: skip all metadata update processing when using external metadata.
All the metadata update processing for external metadata is on in user-space
or through the sysfs interfaces, so make "md_update_sb" a no-op in that case.
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6a51830e14529063cb2685921e1177d9af50e49a
Author: Dan Williams <dan.j.williams at intel.com>
Date: Wed Apr 30 00:52:28 2008 -0700
md: fix use after free when removing rdev via sysfs
rdev->mddev is no longer valid upon return from entry->store() when the
'remove' command is given.
Cc: <stable at kernel.org>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7f1133cbf20bc308d73ba49f971180924e12119b
Author: Eric Miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:27 2008 -0700
pxafb: preliminary smart panel interface support (update)
FB_PXA_SMARTPANEL defaults to "n" and removed the cast to void *.
Signed-off-by: Daniel Mack <daniel at caiaq.de>
Acked-by: Eric Miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3c42a449107bf76c59b8e0b6a30d070e9696e49c
Author: Eric Miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:26 2008 -0700
pxafb: preliminary smart panel interface support
Signed-off-by: Daniel Mack <daniel at caiaq.de>
Signed-off-by: Eric Miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 90eabbf0ec0c626cf5d186214cf8fc79150a7a29
Author: Eric Miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:25 2008 -0700
pxafb: move parallel LCD timing setup into dedicate function
the new_regs stuff has been removed, and all the setup (modification to those
fbi->reg_*) is protected with IRQ disabled
* disable IRQ is too heavy here, provided that no IRQ context will
touch the fbi->reg_* and the only possible contending place is
in the CPUFREQ_POSTCHANGE (task context), a mutex will be better,
leave this for future improvement
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2ba162b9335c6e3ba90c77637372fc9f078aae67
Author: Eric Miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:24 2008 -0700
pxafb: use completion for LCD disable wait code
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a7535ba730e13db037bd22c79c3805690d0945a2
Author: Eric Miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:24 2008 -0700
pxafb: introduce lcd_{read,write}l() to wrap the __raw_{read,write}l()
using __raw_{read,write}l() everywhere looks messy, introduce
lcd_{read,write}l() to get this cleaned up a bit
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0454bd09de7380aac464c09018e6a533f7247b0d
Author: eric miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:23 2008 -0700
pxafb: make lubbock/mainstone/zylonite/littleton to use new LCD connection type
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 84f43c308b73a6a12128288721a1007ba4f1a8da
Author: eric miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:22 2008 -0700
pxafb: introduce register independent LCD connection type for pxafb
Reasons:
1. straight forward: the name "LCD_COLOR_DSTN_16BPP" is much better
than "LCCR0_Pas | LCCR0_Color | LCCR0_Dual"
2. by defining LCD connection types as constants, it allows only
valid possibilities
3. by removing the dependency of register bits definitions, those
can be later moved into the body of pxafb.c, instead of having
a regs-lcd.h around
Currently, only lubbock, mainstone, zylonite and littleton have been
modified to support these types (see coming patches after this).
Other platforms are encouraged to change their way describing the
LCD controller connections.
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2c42dd8ebdd92ad59d9a68f88f0e20ad9f45270a
Author: eric miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:21 2008 -0700
pxafb: introduce "struct pxafb_dma_buff" for palette and dma descriptors
Use structure and array for palette buffer and dma descriptors to:
1. better organize code for future expansion like overlays
2. separate palette and dma descriptors from frame buffer
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ce4fb7b892a6d6c6a0f87366b26fd834d2923dd7
Author: eric miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:21 2008 -0700
pxafb: convert fb driver to use ioremap() and __raw_{readl, writel}
This is part of the effort moving peripheral registers outside of pxa-regs.h,
and using ioremap() make it possible the same IP can be re-used on different
processors with different registers space
As a result, the fixed mapping in pxa_map_io() is removed.
The regs-lcd.h can actually moved to where closer to pxafb.c but some of its
bit definitions are directly used by various platform code, though this is not
a good style.
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 92ac73c1e4b4e039162f5d3980c2da8192b28060
Author: eric miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:20 2008 -0700
pxafb: sanitize the usage of #ifdef .. processing pxafb parameters
So to get a better coding style and centralize the pxafb parameters
handling code.
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ded245b67f0a412b75052a285a0b0d1798650a63
Author: eric miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:19 2008 -0700
pxafb: purge unnecessary pr_debug and comments from pxafb
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b0086efba5ad4905090b1e2e62a7e84d9473287f
Author: eric miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:19 2008 -0700
pxafb: fix various coding style issues for pxafb
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 817daf14a5fa77d4e2c3b63c9be12fbf6eada37d
Author: eric miao <eric.miao at marvell.com>
Date: Wed Apr 30 00:52:18 2008 -0700
pxafb: un-nest pxafb_parse_options() to cleanup the coding style issue
pxafb_parse_options() has very long lines exceeding far beyond 80 characters,
which makes the function looks bad. Un-nest it into smaller functions and use
a temporary string for only what has been overridden instead of the whole
dev_info() message to reduce the line a bit more.
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 592e7bf80566bf5ac3ed073d4e198dd5b0824c04
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Wed Apr 30 00:52:17 2008 -0700
atmel_spi: clean up baud rate divisor calculation
Make the baud rate divisor calculation code a bit more readable and add a
few comments.
Also fix wrong debug information being displayed when !new_1 and
max_speed_hz == 0.
[david-b at pacbell.net: fix it]
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Cc: "Janesh Ramakrishnan" <jramakrishnan at neuropace.com>
Acked-by David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c6495aaabfaa8256c292c54b48ab081f4d86ad79
Author: Bryan Wu <cooloney at kernel.org>
Date: Wed Apr 30 00:52:16 2008 -0700
kallsyms: nuke all ChangeLog, this should be logged by git
Pointed out by Paulo:
"When I wrote this initially, it was a mistake to add a Changelog in
the first place, but I didn't know better at the time.
If you're going to make changes to this file, please remove all the
Changelog, instead of adding more entries to it. The 'Changelog'
should be kept by the version control system, and not the source code
itself."
Cc: Paulo Marques <pmarques at grupopie.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Acked-by: Paulo Marques <pmarques at grupopie.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 41b25a3784c137ad52c71619c73b925860b1b3a2
Author: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Date: Wed Apr 30 00:52:13 2008 -0700
/proc/pagetypeinfo: fix output for memoryless nodes
on memoryless node, /proc/pagetypeinfo is displayed slightly funny output.
this patch fix it.
output example (header is outputed, but no data is outputed)
--------------------------------------------------------------
Page block order: 14
Pages per block: 16384
Free pages count per migrate type at order 0 1 2 3 4 5 \
6 7 8 9 10 11 12 13 14 15 16
Number of blocks type Unmovable Reclaimable Movable Reserve Isolate
Page block order: 14
Pages per block: 16384
Free pages count per migrate type at order 0 1 2 3 4 5 \
6 7 8 9 10 11 12 13 14 15 16
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Acked-by: Mel Gorman <mel at csn.ul.ie>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2f3517418dc0684a32318f2c5b53257416448b1e
Author: Bryan Wu <bryan.wu at analog.com>
Date: Wed Apr 30 00:52:12 2008 -0700
Blackfin serial driver: this driver enable SPORTs on Blackfin emulate UART
Signed-off-by: Bryan Wu <bryan.wu at analog.com>
Cc: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4e68852dca7a16271d09269f643a8e0eb8bb500d
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Apr 30 00:52:11 2008 -0700
MAINTAINERS: sort ordering
Seems we have various confused entries around S and T. Sort them all out and
also add myself as tty maintainer (which is how I noticed it).
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 64275ea4f33636de198da5c78d0dbe31522555b0
Author: David Chinner <dgc at sgi.com>
Date: Wed Apr 30 17:11:16 2008 +1000
[XFS] Include linux/random.h in all builds, not just debug.
Noted-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Dave Chinner <dgc at sgi.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1175cdc670f2d4197b033f823b32435031a6daa8
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Wed Apr 30 13:38:50 2008 +0200
[S390] Update default configuration.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 941af343e2e25ff7afce43a3c7e2922643b8cd48
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Wed Apr 30 13:38:49 2008 +0200
[S390] use generic sys_ptrace
After the PT_IEEE_IP hack has been removed s390 can now use
the common code sys_ptrace function.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 613e1def6b52c399a8b72a5e11bc2e57d2546fb8
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Wed Apr 30 13:38:48 2008 +0200
[S390] Remove self ptrace IEEE_IP hack.
The self referential PT_IEEE_IP ptrace peek & poke calls have been
broken for that last 6 years. For peek the code always returns 0
instead of the last ieee fault and for poke the code does nothing.
Since nobody noticed the code seems to be superfluous. So lets
remove it.
Cc: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 17f345808563d2f425b2b15d60c4a5b00112e9eb
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:47 2008 +0200
[S390] Convert to SPARSEMEM & SPARSEMEM_VMEMMAP
Convert s390 to SPARSEMEM and SPARSEMEM_VMEMMAP. We do a select
of SPARSEMEM_VMEMMAP since it is configurable. This is because
SPARSEMEM without SPARSEMEM_VMEMMAP gives us a hell of broken
include dependencies that I don't want to fix.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 53492b1de46a7576170e865062ffcfc93bb5650b
Author: Gerald Schaefer <geraldsc at de.ibm.com>
Date: Wed Apr 30 13:38:46 2008 +0200
[S390] System z large page support.
This adds hugetlbfs support on System z, using both hardware large page
support if available and software large page emulation on older hardware.
Shared (large) page tables are implemented in software emulation mode,
by using page->index of the first tail page from a compound large page
to store page table information.
Signed-off-by: Gerald Schaefer <geraldsc at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 2e5061e40af88070984e3769eafb5a06022375fd
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:45 2008 +0200
[S390] Convert machine feature detection code to C.
From: Heiko Carstens <heiko.carstens at de.ibm.com>
From: Carsten Otte <cotte at de.ibm.com>
This lets us use defines for the magic bits in machine flags instead
of using plain numbers all over the place.
In addition on newer machines features/facilities are indicated by the
result of the stfl instruction. So we use these bits instead of trying
to execute new instructions and check wether we get an exception or
not.
Also the mvpg instruction is always available when in zArch mode,
whereas the idte instruction is only available in zArch mode. This
results in some minor optimizations.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 8fc63658681f32e6e29f6d1138de933d7272e0ec
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:44 2008 +0200
[S390] vmemmap: use clear_table to initialise page tables.
Always use clear_table to initialise page tables. The overlapping
memcpy is just a leftover of a previous version that wasn't fully
converted to clear_table.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 484875b11f355b1b54d508a3f4671888f07e643c
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:43 2008 +0200
[S390] Move stfl to system.h and delete duplicated version.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit ccf183e469be89e065ed389da9d3f50bd2faa215
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:42 2008 +0200
[S390] uaccess_mvcos: #ifdef config dependent code.
arch/s390/lib/uaccess_mvcos.c:166:
warning: 'strnlen_user_mvcos' defined but not used
arch/s390/lib/uaccess_mvcos.c:186:
warning: 'strncpy_from_user_mvcos' defined but not used
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit fd781fa25c9e9c6fd1599df060b05e7c4ad724e5
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:41 2008 +0200
[S390] cpu topology: Fix possible deadlock.
When we get a notification that cpu topology changed, we schedule a
work struct which just calls arch_reinit_sched_domains. This function
in turn calls get_online_cpus() which results int the lockdep warning
below.
After all it turnded out that it's not legal to call get_online_cpus()
from the context of a multi-threaded work queue.
It could deadlock this way:
process 0 (events/cpu-x):
-> run_workqueue
-> removes my work_struct from the work queue
-> calls work_struct->fn
-> get_online_cpus()
-> locks on cpu_hotplug.lock since process 1 below is doing cpu hotplug
process 1:
-> cpu_down (for cpu-x)
-> cpu_hotplug_begin (holds cpu_hotplug.lock now)
-> cpu-x dead
-> notifier_call_chain with CPU_DEAD
-> cleanup_workqueue_thread
-> flush_cpu_workqueue (succeeds)
-> kthread_stop for events/cpu-x
-> now kthread_stop waits for my work_struct to complete from within
process 0. -> dead.
A single threaded workqueue wouldn't have such problems, however there is
no such common queue available and it's not worth to create one for the
very rare calls to arch_reinit_sched_domains.
So we just create a kernel thread from our work struct which calls
arch_reinit_sched_domains and are done with it.
Thanks to Oleg Nesterov and Peter Zijlstra for helping me figuring out
that this isn't a false positive lockdep warning:
=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.25-03562-g3dc5063-dirty #12
-------------------------------------------------------
events/3/14 is trying to acquire lock:
(&cpu_hotplug.lock){--..}, at: [<0000000000076094>] get_online_cpus+0x50/0x78
but task is already holding lock:
(topology_work){--..}, at: [<0000000000059cde>] run_workqueue+0x106/0x278
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (topology_work){--..}:
[<000000000006fc74>] __lock_acquire+0x1010/0x111c
[<000000000006fe40>] lock_acquire+0xc0/0xf8
[<0000000000059d48>] run_workqueue+0x170/0x278
[<0000000000059edc>] worker_thread+0x8c/0xf0
[<000000000005f5bc>] kthread+0x68/0xa0
[<000000000001a33e>] kernel_thread_starter+0x6/0xc
[<000000000001a338>] kernel_thread_starter+0x0/0xc
-> #1 (events){--..}:
[<000000000006fc74>] __lock_acquire+0x1010/0x111c
[<000000000006fe40>] lock_acquire+0xc0/0xf8
[<000000000005a23c>] cleanup_workqueue_thread+0x60/0xa8
[<00000000003b2ab8>] workqueue_cpu_callback+0xbc/0x170
[<00000000003bba80>] notifier_call_chain+0x5c/0xa4
[<00000000000655a2>] __raw_notifier_call_chain+0x26/0x38
[<00000000000655e2>] raw_notifier_call_chain+0x2e/0x40
[<0000000000075e00>] cpu_down+0x228/0x31c
[<00000000003b1dd8>] store_online+0x64/0xb8
[<00000000001e7128>] sysdev_store+0x48/0x58
[<0000000000121cd2>] sysfs_write_file+0x126/0x1c0
[<00000000000c1944>] vfs_write+0xb0/0x15c
[<00000000000c20e6>] sys_write+0x56/0x88
[<0000000000027a68>] sys32_write+0x34/0x4c
[<0000000000023f70>] sysc_noemu+0x10/0x16
[<0000000077f3f186>] 0x77f3f186
-> #0 (&cpu_hotplug.lock){--..}:
[<000000000006fa84>] __lock_acquire+0xe20/0x111c
[<000000000006fe40>] lock_acquire+0xc0/0xf8
[<00000000003b701c>] mutex_lock_nested+0xd0/0x364
[<0000000000076094>] get_online_cpus+0x50/0x78
[<000000000003a03e>] arch_reinit_sched_domains+0x26/0x58
[<000000000002700e>] topology_work_fn+0x26/0x34
[<0000000000059d4e>] run_workqueue+0x176/0x278
[<0000000000059edc>] worker_thread+0x8c/0xf0
[<000000000005f5bc>] kthread+0x68/0xa0
[<000000000001a33e>] kernel_thread_starter+0x6/0xc
[<000000000001a338>] kernel_thread_starter+0x0/0xc
other info that might help us debug this:
2 locks held by events/3/14:
#0: (events){--..}, at: [<0000000000059cde>] run_workqueue+0x106/0x278
#1: (topology_work){--..}, at: [<0000000000059cde>] run_workqueue+0x106/0x278
stack backtrace:
CPU: 3 Not tainted 2.6.25-03562-g3dc5063-dirty #12
Process events/3 (pid: 14, task: 000000002fb04038, ksp: 000000002fb0bd70)
0400000000000000 000000002fb0ba40 0000000000000002 0000000000000000
000000002fb0bae0 000000002fb0ba58 000000002fb0ba58 0000000000016488
0000000000000000 000000002fb0bd70 0000000000000000 0000000000000000
000000002fb0ba40 000000000000000c 000000002fb0ba40 000000002fb0bab0
00000000003c99e0 0000000000016488 000000002fb0ba40 000000002fb0ba90
Call Trace:
([<00000000000163fc>] show_trace+0x138/0x158)
[<00000000000164e2>] show_stack+0xc6/0xf8
[<0000000000016624>] dump_stack+0xb0/0xc0
[<000000000006cd36>] print_circular_bug_tail+0xa2/0xb4
[<000000000006fa84>] __lock_acquire+0xe20/0x111c
[<000000000006fe40>] lock_acquire+0xc0/0xf8
[<00000000003b701c>] mutex_lock_nested+0xd0/0x364
[<0000000000076094>] get_online_cpus+0x50/0x78
[<000000000003a03e>] arch_reinit_sched_domains+0x26/0x58
[<000000000002700e>] topology_work_fn+0x26/0x34
[<0000000000059d4e>] run_workqueue+0x176/0x278
[<0000000000059edc>] worker_thread+0x8c/0xf0
[<000000000005f5bc>] kthread+0x68/0xa0
[<000000000001a33e>] kernel_thread_starter+0x6/0xc
[<000000000001a338>] kernel_thread_starter+0x0/0xc
INFO: lockdep is turned off.
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Peter Zijlstra <peterz at infradead.org>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit d00aa4e7d0129983fc4389c85e15a066eb4e69a9
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:40 2008 +0200
[S390] Add topology_core_siblings to topology.h
This exposes the core siblings to user space via sysfs.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
commit edf2209692769d3e461c0351553098bc017c2caf
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date: Wed Apr 30 13:38:39 2008 +0200
[S390] cio: Make isc handling more robust.
Introduce an ->isc field in the subchannel to store the desired
interruption subclass, since sch->schib.pmcw.isc may be overwritten
by the hardware on stsch() after machine checks.
Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 47494f6a84cdae2740b62e1d86a1860df85d9bbb
Author: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Date: Wed Apr 30 13:38:38 2008 +0200
[S390] remove -traditional
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
CC: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 1e489518da2a49604df2c3281034097274324be9
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:37 2008 +0200
[S390] Automatically detect added cpus.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 0b18d318b80a7f350648ca8f7cc00a2f688104cb
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:36 2008 +0200
[S390] smp: Fix locking order.
On some smp sysfs store attributes get_online_cpus() may block on
cpu_hotplug.lock, but we hold already smp_cpu_state_mutex. Since the
locking order on cpu hotplug via arch_update_cpu_topology is inverse
this might lead to deadlocks.
So make sure locking order is always the same.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit f291e17227cf30432ca7c402220f62e6924dd97d
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:35 2008 +0200
[S390] Add missing ifndef/define to include/asm-s390/sysinfo.h.
In order to protect against compile breakage in case the header file
gets included twice.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 4e83be7b24ba4fe40acf0b967bd6ae8c9ac79bde
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Wed Apr 30 13:38:34 2008 +0200
[S390] Move show_regs to traps.c.
This is where it should be and we can get rid of some externs
and a static inline function.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 2f972202315cf71fd60e890ebbed7d5bcf620ba4
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date: Wed Apr 30 13:38:33 2008 +0200
[S390] cio: Use strict_strtoul() for attributes.
Make parsing of attribute writes handle incorrect input better.
Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit aecb2b6eac6ee596f34a54fb164138756895c78a
Author: Jason Jin <Jason.jin at freescale.com>
Date: Sat Apr 19 15:07:56 2008 +0800
[POWERPC] 86xx: Fix the wrong serial1 interrupt for 8610 board
Signed-off-by: Jason Jin <Jason.jin at freescale.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit eabd90944b3a00766e84da3d117ea0f3e0a3b1a3
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Wed Apr 30 14:47:12 2008 +1000
[POWERPC] Fix crashkernel= handling when no crashkernel= specified
Commit edd8ce67436851a62f99f1d9707b40ea6a8e5323 (Use extended crashkernel
command line on ppc64), changed the logic in reserve_crashkernel()
which deals with the crashkernel= command line option.
This introduced a bug in the case when there is no crashkernel= option,
or it is incorrect. We would fall through and calculate the crash_size
based on the existing values in crashk_res. If both start and end are 0,
the default, we calculate the crash_size as 1 byte - which is wrong.
Rework the logic so that we use crashk_res, regardless of whether it's
set by the command line or via the device tree (see prom.c). Then check
if we have an empty range (end == start), and if so make sure to set
both end and start to zero (this is checked in machine_kexec_64.c). Then
we calculate the crash_size once we know we have a non-zero range.
Finally we always want to warn the user if they specify a base != 32MB,
so remove the special case for that in the command line parsing case.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 3243d87441bf7f97c5c9f7dd46b35f5783ec6740
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Wed Apr 30 13:21:45 2008 +1000
[POWERPC] Make emergency stack safe for current_thread_info() use
The current_thread_info() macro, used by preempt_count(), assumes the
base address and size of the stack are THREAD_SIZE aligned.
The emergency stack currently isn't either of these things, which
could potentially cause problems anytime we're running on the
emergency stack. That includes when we detect a bad kernel stack
pointer, and also during early_setup_secondary().
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 159131149c2f56c1da5ae5e23ab9d5acef4916d1
Author: Lachlan Andrew <lachlan.andrew at gmail.com>
Date: Wed Apr 30 01:04:03 2008 -0700
tcp: Overflow bug in Vegas
From: Lachlan Andrew <lachlan.andrew at gmail.com>
There is an overflow bug in net/ipv4/tcp_vegas.c for large BDPs
(e.g. 400Mbit/s, 400ms). The multiplication (old_wnd *
vegas->baseRTT) << V_PARAM_SHIFT overflows a u32.
[ Fix tcp_veno.c too, it has similar calculations. -DaveM ]
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 595f403c1af37b1339e64b89040528b8cd48c5a3
Merge: 822252521651ad74a6d41e712d790e2f10838a67 d0eb801c60c20c2fbfc70e677415122798c472d2
Author: Paul Mackerras <paulus at samba.org>
Date: Wed Apr 30 16:53:17 2008 +1000
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs
commit d0eb801c60c20c2fbfc70e677415122798c472d2
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Fri Apr 25 11:03:03 2008 +1000
[POWERPC] spufs: add .gitignore for spu_save_dump.h & spu_restore_dump.h
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit be9164e769d57aa10b2bbe15d103edc041b9e7de
Author: Kostya B <bkostya at hotmail.com>
Date: Tue Apr 29 22:36:30 2008 -0700
[IPv4] UFO: prevent generation of chained skb destined to UFO device
Problem: ip_append_data() could wrongly generate a chained skb for
devices which support UFO. When sk_write_queue is not empty
(e.g. MSG_MORE), __instead__ of appending data into the next nr_frag
of the queued skb, a new chained skb is created.
I would normally assume UFO device should get data in nr_frags and not
in frag_list. Later the udp4_hwcsum_outgoing() resets csum to NONE
and skb_gso_segment() has oops.
Proposal:
1. Even length is less than mtu, employ ip_ufo_append_data()
and append data to the __existed__ skb in the sk_write_queue.
2. ip_ufo_append_data() is fixed due to a wrong manipulation of
peek-ing and later enqueue-ing of the same skb. Now, enqueuing is
always performed, because on error the further
ip_flush_pending_frames() would release the queued skb.
Signed-off-by: Kostya B <bkostya at hotmail.com>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3a8209d19dd791aaac3668be2fa51a9b42113efd
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 22:29:59 2008 -0700
iwlwifi: move the selects to the tristate drivers
This patch moves the following select's:
- RFKILL : IWLWIFI_RFKILL -> IWLCORE
- RFKILL_INPUT : IWLWIFI_RFKILL -> IWLCORE
- MAC80211_LEDS : IWL4965_LEDS -> IWLCORE
- LEDS_CLASS : IWL4965_LEDS -> IWLCORE
- MAC80211_LEDS : IWL3945_LEDS -> IWL3945
- LEDS_CLASS : IWL3945_LEDS -> IWL3945
The effects are:
- with IWLCORE=m and/or IWL3945=m RFKILL/RFKILL_INPUT/MAC80211_LEDS/LEDS_CLASS
are no longer wrongly forced to y
- fixes a build error with IWLCORE=y, IWL4965=m
might be a bug in kconfig causing it, but doing this change that is
anyway the right thing fixes it
Reported-by: Carlos R. Mafra <crmafra2 at gmail.com>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3734dfc68b64d8ca202c799280daf28c2424659d
Author: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Date: Wed Apr 30 15:21:17 2008 +1000
[POWERPC] spufs: trace spu_acquire_saved events
The sputrace module contained a trace entry for spu_acquire_saved, but
this marker was not placed anywhere. Fix this by adding a marker to the
routine.
Signed-off-by: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 8a476d49555cb7e8d4222782f695048b46692731
Author: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Date: Wed Apr 30 15:16:14 2008 +1000
[POWERPC] spufs: fix marker name for find_victim
Fix a typo in the marker for the find_victim function, which prevented
it from being traced. It previously read find_vitim.
Signed-off-by: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 534578816f028b0dc675fdcc3314016d98588327
Author: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Date: Wed Apr 30 15:12:30 2008 +1000
[POWERPC] spufs: add marker for destroy_spu_context
The sputrace module contained a reference to a marker for
destroy_spu_context, but this marker did not appear in the code. Fix
this by adding a marker in the function.
Signed-off-by: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit d6508aaf27ccef0d7e986aaa220ad4d098bca260
Author: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Date: Wed Apr 30 15:06:39 2008 +1000
[POWERPC] spufs: add sputrace marker parameter names
The markers facility defines the marker parameters to be of the form
'name %format'. Add parameter names to sputrace, to specify the context
and %spu paramerters, instead of just specifying the '%format' part.
Signed-off-by: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 5158e9b5218bd3799c9fa8c401ad24d7f0c0a0a1
Author: Christoph Hellwig <hch at lst.de>
Date: Tue Apr 29 17:08:38 2008 +1000
[POWERPC] spufs: add context switch notification log
There are userspace instrumentation tools that need to monitor spu
context switches. This patch adds a new file called 'switch_log' to
each spufs context directory that can be used to monitor the context
switches.
Context switch in/out and exit from spu_run are monitored after the
file was first opened and can be read from it.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 45e741b89000519bedd4da4e7075a35acf5c655b
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 20:58:15 2008 -0700
ipv4: annotate a few functions __init in ipconfig.c
A few functions are only used from __init context.
So annotate these with __init for consistency and silence
the following warnings:
WARNING: net/ipv4/built-in.o(.text+0x2a876): Section mismatch
in reference from the function ic_bootp_init() to
the variable .init.data:bootp_packet_type
WARNING: net/ipv4/built-in.o(.text+0x2a907): Section mismatch
in reference from the function ic_bootp_cleanup() to
the variable .init.data:bootp_packet_type
Note: The warnings only appear with CONFIG_DEBUG_SECTION_MISMATCH=y
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 957d33fc1a3793e9ca8c24c6400271b924e46e19
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Tue Apr 29 20:10:55 2008 -0700
docbook: fix fatal rapidio yet again (and more to come)
Don't refer to file that no longer exists:
docproc: linux-2.6.25-git14/arch/powerpc/kernel/rio.c: No such file or directory
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0ff5ce7f30b45cc2014cec465c0e96c16877116e
Merge: c4755d16fce9a4cdbb316c17657444856821bd4b ba7cc365f50cee0758e89217875e56ca3d972ed3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 20:37:59 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (7798): tuners/Kconfig: Change config name and help to reflect dynamic load for tuners
V4L/DVB (7794): cx88: Fix a warning
V4L/DVB (7792): ivtv: correct misspelled "HIMEM4G" to "HIGHMEM4G" in error message
V4L/DVB (7791): ivtv: POLLHUP must be returned on eof
V4L/DVB (7789b): Fix merge conflicts
commit c4755d16fce9a4cdbb316c17657444856821bd4b
Merge: c15a2434ed4868cad99278ac4d4ae4de9de62e02 f1fa3342e271029f93d323ca664809b94594fe04
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 20:34:49 2008 -0700
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (48 commits)
ext4: fix hot spins in mballoc after err_freebuddy and err_freemeta
ext4: fix test ext_generic_write_end() copied return value
ext3: fix test ext_generic_write_end() copied return value
ext4: Move mballoc headers/structures to a seperate header file mballoc.h
ext4: cleanup for compiling mballoc with verification and debugging #defines
ext4: don't use ext4_error in ext4_check_descriptors
ext4: mark inode dirty after initializing the extent tree
ext4: update ctime and mtime for truncate with extents.
ext4: Don't do GFP_NOFS allocations after taking ext4_lock_group
ext4: move headers out of include/linux
ext4: fix wrong gfp type under transaction
ext4: Fix hang on umount with quotas when journal is aborted
ext4: Fix update of mtime and ctime on rename
jdb2: replace remaining __FUNCTION__ occurrences
ext4: replace remaining __FUNCTION__ occurrences
jbd2: only create debugfs and stats entries if init is successful
jbd2: fix kernel-doc notation
jbd2: replace potentially false assertion with if block
jbd2: eliminate duplicated code in revocation table init/destroy functions
jbd2: tidy up revoke cache initialisation and destruction
...
commit c15a2434ed4868cad99278ac4d4ae4de9de62e02
Merge: a94a630a4c69430bb4562ab8252104449bba9a67 adaa693b845373296631766176ebf0f73a342e10
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 20:34:17 2008 -0700
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: (24 commits)
[XFS] Fix build failure after enabling CONFIG_XFS_DEBUG
[XFS] remove dmapi cruft in xfs_file.c
[XFS] remove sendfile leftovers
[XFS] allow enabling CONFIG_XFS_DEBUG
[XFS] Don't initialise new inode generation numbers to zero
[XFS] Fix check for block zero access in xfs_write_iomap_allocate()
[XFS] Don't double count reserved block changes on UP.
[XFS] remove xfs_log_ticket_zone on rmmod
[XFS] fix non-smp xfs build
[XFS] Fix broken HAVE_SPLICE removal commit.
[XFS] kill XFS_ICSB_SB_LOCKED
[XFS] split xfs_icsb_balance_counter
[XFS] Add xfs_icsb_sync_counters_locked for when m_sb_lock already held
[XFS] Cleanup xfs_attr a bit with xfs_name and remove cred
[XFS] kill usesless IHOLD calls in xfs_remove and xfs_rmdir
[XFS] kill parent == child checks in xfs_remove and xfs_rmdir
[XFS] kill usesless IHOLD calls in xfs_rename
[XFS] remove manual lookup from xfs_rename and simplify locking
[XFS] shrink mrlock_t
[XFS] simplify xfs_lookup
...
commit ba7cc365f50cee0758e89217875e56ca3d972ed3
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Wed Apr 30 03:19:33 2008 -0300
V4L/DVB (7798): tuners/Kconfig: Change config name and help to reflect dynamic load for tuners
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c17bf5db76f19211eaed4d01614414f179a06554
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Wed Apr 30 02:17:14 2008 -0300
V4L/DVB (7794): cx88: Fix a warning
drivers/media/video/cx88/cx88-i2c.c: In function 'attach_inform':
drivers/media/video/cx88/cx88-i2c.c:102: warning: unused variable 'tun_setup'
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit dab2ea48dcd3f75fda7ea25479666693321636be
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Apr 28 20:16:20 2008 -0300
V4L/DVB (7792): ivtv: correct misspelled "HIMEM4G" to "HIGHMEM4G" in error message
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 16928be301b0881f7b7afcf95e0ee7dc3214de8d
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Mon Apr 28 12:18:00 2008 -0300
V4L/DVB (7791): ivtv: POLLHUP must be returned on eof
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a94a630a4c69430bb4562ab8252104449bba9a67
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Wed Apr 30 11:16:16 2008 +1000
pasemi_edac needs to include linux/edac.h
Commit c3c52bce6993c6d37af2c2de9b482a7013d646a7 ("edac: fix module
initialization on several modules 2nd time") added a call to opstate_init
but did not include linux/edac.h that declares it.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Acked-by: Olof Johansson <olof at lixom.net>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ff138171ec6f84f311fe8c0395ad7f9e6d04feec
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 29 23:02:33 2008 -0300
V4L/DVB (7789b): Fix merge conflicts
Some Kconfig names were changed. This patch reapplies the rename script,
fixing for those drivers merged after the patch that renamed those
items.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f1fa3342e271029f93d323ca664809b94594fe04
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Tue Apr 29 22:01:15 2008 -0400
ext4: fix hot spins in mballoc after err_freebuddy and err_freemeta
In ext4_mb_init_backend() 'i' is of type ext4_group_t. Since unsigned, i
>= 0 is always true, so fix hot spins after err_freebuddy: and -meta:
and prevent decrements when zero.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit f8a87d89304c1eea8e4a8dc02d134f57590913c6
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Tue Apr 29 22:01:18 2008 -0400
ext4: fix test ext_generic_write_end() copied return value
'copied' is unsigned, whereas 'ret2' is not. The test (copied < 0) fails
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 7c2f3d6f89aab04c5c66a0a757888d3a77a5e899
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Tue Apr 29 22:01:27 2008 -0400
ext3: fix test ext_generic_write_end() copied return value
'copied' is unsigned, whereas 'ret2' is not. The test (copied < 0) fails
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 8f6e39a7ade8a5329c5651a2bc07010b3011da6a
Author: Mingming Cao <cmm at us.ibm.com>
Date: Tue Apr 29 22:01:31 2008 -0400
ext4: Move mballoc headers/structures to a seperate header file mballoc.h
Move function and structure definiations out of mballoc.c and put it under
a new header file mballoc.h
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 60bd63d1928c65abd71d8b9b45672cf6e3101845
Author: Solofo Ramangalahy <Solofo.Ramangalahy at bull.net>
Date: Tue Apr 29 21:59:59 2008 -0400
ext4: cleanup for compiling mballoc with verification and debugging #defines
This patch allows compiling mballoc with:
#define AGGRESSIVE_CHECK
#define DOUBLE_CHECK
#define MB_DEBUG
It fixes:
Compilation errors:
fs/ext4/mballoc.c: In function '__mb_check_buddy':
fs/ext4/mballoc.c:605: error: 'struct ext4_prealloc_space' has no member named 'group_list'
fs/ext4/mballoc.c:606: error: 'struct ext4_prealloc_space' has no member named 'pstart'
fs/ext4/mballoc.c:608: error: 'struct ext4_prealloc_space' has no member named 'len'
Compilation warnings:
fs/ext4/mballoc.c: In function 'ext4_mb_normalize_group_request':
fs/ext4/mballoc.c:2863: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'int'
fs/ext4/mballoc.c: In function 'ext4_mb_use_inode_pa':
fs/ext4/mballoc.c:3103: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'int'
Sparse check:
fs/ext4/mballoc.c:3818:2: warning: context imbalance in 'ext4_mb_show_ac' - different lock contexts for basic block
Signed-off-by: Solofo Ramangalahy <Solofo.Ramangalahy at bull.net>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit c19204b0ae3f8a125118fd5d425d3c7a5f8fda9b
Author: Josef Bacik <jbacik at redhat.com>
Date: Tue Apr 29 22:00:28 2008 -0400
ext4: don't use ext4_error in ext4_check_descriptors
Because ext4_check_descriptors is called at mount time you can't use ext4_error
as it calls ext4_commit_sb, which since the sb isn't all the way initialized
causes bad things to happen (ie a panic). This patch changes the ext4_error's
to printk's to keep this problem from happening. Thanks much,
Signed-off-by: Josef Bacik <jbacik at redhat.com>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 8753e88f1b4345677620ec68f847222a6301e2fd
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Tue Apr 29 22:00:36 2008 -0400
ext4: mark inode dirty after initializing the extent tree
We should mark the inode dirty only after initializing the extent
tree. Also if we fail during extent initialization we need
to call DQUOT_FREE_INODE.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit ef7377289a1510d638004158e43878643bc75dc5
Author: Solofo Ramangalahy <Solofo.Ramangalahy at bull.net>
Date: Tue Apr 29 22:00:41 2008 -0400
ext4: update ctime and mtime for truncate with extents.
The recently announced "Linux POSIX file system test suite"
caught a truncate issue when using extents:
mtime and ctime are not updated when truncate is successful.
This is the single issue caught with "default" ext4 (mkfs and mount
with minimal options).
The testsuite does not report failure with -o noextents.
With the following patch, all tests of the testsuite pass.
Signed-off-by: Solofo Ramangalahy <Solofo.Ramangalahy at bull.net>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit c83617db76353ff30e825874be2c15c185b95759
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Tue Apr 29 22:00:47 2008 -0400
ext4: Don't do GFP_NOFS allocations after taking ext4_lock_group
We can't do GFP_NOFS allocation after taking ext4_lock_group
BUG: sleeping function called from invalid context at mm/slab.c:3054
in_atomic():1, irqs_disabled():0
1 lock held by vi/2426:
#0: (&ei->i_data_sem){----}, at: [<c01cf665>] ext4_release_file+0x23/0x66
Pid: 2426, comm: vi Not tainted 2.6.25-rc7 #24
[<c011a3dc>] __might_sleep+0xbe/0xc5
[<c01620c9>] kmem_cache_alloc+0x22/0xa6
[<c01e382a>] ext4_mb_release_inode_pa+0x73/0x1b3
[<c01e6adf>] ext4_mb_discard_inode_preallocations+0x22d/0x2d4
[<c013000a>] ? param_set_ushort+0x32/0x39
[<c01ceba1>] ext4_discard_reservation+0x27/0x6a
[<c01cf66c>] ext4_release_file+0x2a/0x66
[<c0165bd6>] __fput+0xae/0x155
[<c0165e46>] fput+0x17/0x19
[<c0163756>] filp_close+0x50/0x5a
[<c01647c0>] sys_close+0x71/0xad
[<c0104aba>] sysenter_past_esp+0x5f/0xa5
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 127ce971adeb4514bc4edc5bf45f79beb0c94aa5
Author: bo yang <bo.yang at lsi.com>
Date: Tue Apr 29 03:55:33 2008 -0400
[SCSI] megaraid_sas; Update the Version and Changelog
Update the Version and Changelog for megaraid_sas Driver
Signed-off-by: Bo Yang<bo.yang at lsi.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit c3a3b55ae80a0d595445064159c69f8e80911e85
Author: Brian King <brking at linux.vnet.ibm.com>
Date: Fri Apr 25 16:58:29 2008 -0500
[SCSI] ibmvscsi: Handle non SCSI error status
Adds support to the ibmvscsi driver to handle non SCSI error
status. This is needed to support some new VIOS enhancements.
Signed-off-by: Brian King <brking at linux.vnet.ibm.com>
Signed-off-by: Santiago Leon <santil at us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 61d7416a286e840d905c18b1e6b0977c036c8656
Author: Alan D. Brunelle <Alan.Brunelle at hp.com>
Date: Tue Apr 29 16:12:51 2008 -0400
[SCSI] bug fix for free list handling
commit:
commit 542bd1377a963070bc4a03ff7d2690ddf3920596
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Mon Apr 21 10:57:20 2008 -0500
[SCSI] fix SLUB WARN_ON
Fixed another problem in free list handling by moving list allocation
from scsi_host_alloc() to scsi_add_host(). Unfortunately it
introduced a new failure mode in that hosts can pass straight from
alloc to put without going through add, leaving the free list
uninitialised.
Fix by checking shost->cmd_pool on the release path to see if it got
initialised.
Signed-off-by: Alan D. Brunelle <alan.brunelle at hp.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 49dd09613cf8ae3b697c341c501b7526b462cfeb
Author: Brian King <brking at linux.vnet.ibm.com>
Date: Mon Apr 28 17:36:20 2008 -0500
[SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions
Due to recent device model changes it now no longer tolerates name
collisions. This causes a problem for ipr whose "state" attribute
collides with an identically named one in the SCSI mid-layer. Rename
the ipr driver attribute to be more specific.
Signed-off-by: Brian King <brking at linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 69cd39e94669e2994277a29249b6ef93b088ddbb
Author: Hannes Reinecke <hare at suse.de>
Date: Fri Apr 18 13:57:20 2008 -0700
[SCSI] megaraid_mbox: fix Dell CERC firmware problem
Newer Dell CERC firmware (>= 6.62) implement a random deletion handling
compatible with the legacy megaraid driver. The legacy handling shifted
the target ID by 0x80 only for I/O commands (READ/WRITE/etc), whereas
megaraid_mbox shifts the target ID always if random deletion is supported.
The resulted in megaraid_mbox sending an INQUIRY to the wrong channel, and
not finding any devices, obviously.
So we disable the random deletion support if the offending firmware is
found.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=6695
Signed-off-by: Hannes Reinecke <hare at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: "Yang, Bo" <Bo.Yang at lsi.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 33ae0cdd3eaba219e7c2f0647b6db4be540e2130
Merge: f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259 fe086a7bea7ab714930bd48addba961ceeef7634
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 16:50:49 2008 -0700
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id
[IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO
[IA64] allocate multiple contiguous pages via uncached allocator
[IA64] bugfix: nptcg breaks cpu-hotadd
commit f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259
Merge: c65a3500b2947d344862da8cce626b7cc7ec5758 d20bdda6d45a4035e48ca7ae467a0d955c1ffc60
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 15:58:24 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
Smack: Integrate Smack with Audit
Security: Typecast CAP_*_SET macros
Security: Make secctx_to_secid() take const secdata
commit d20bdda6d45a4035e48ca7ae467a0d955c1ffc60
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Wed Apr 30 08:34:10 2008 +1000
Smack: Integrate Smack with Audit
Setup the new Audit hooks for Smack. SELinux Audit rule fields are recycled
to avoid `auditd' userspace modifications. Currently only equality testing
is supported on labels acting as a subject (AUDIT_SUBJ_USER) or as an object
(AUDIT_OBJ_USER).
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: Casey Schaufler <casey at schaufler-ca.com>
commit 70b9f7dc1435412ca2b89b13a8353bd9915a7189
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Mon Apr 28 16:27:23 2008 -0700
x86/pci: remove flag in pci_cfg_space_size_ext
so let pci_cfg_space_size call it directly without flag.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 780db6c104de48104501f5943361f2371564b85d
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 20:54:28 2008 +0100
Security: Typecast CAP_*_SET macros
Cast the CAP_*_SET macros to be of kernel_cap_t type to avoid compiler
warnings.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit e52c1764f18a62776a0f2bc6752fb76b6e345827
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 20:52:51 2008 +0100
Security: Make secctx_to_secid() take const secdata
Make secctx_to_secid() take constant secdata.
Signed-off-by: David Howells <dhowells at redhat.com>
Acked-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit c65a3500b2947d344862da8cce626b7cc7ec5758
Merge: d973664992d814d93db161b28c0cc9a4c7e68f42 f7e989301b6c232dec5489e94ee7741c85cb11ba
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 15:19:09 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] linux/libata.h: reorganize ata_device struct members a bit
ahci: SB600 ahci can't do MSI, blacklist that capability
libata: More TSSTcorp pain, keep in sync with legacy IDE
pata_via: Fix 6410 misdetect
[libata] pata_atiixp: fix PIO timing data misprogramming
commit d973664992d814d93db161b28c0cc9a4c7e68f42
Merge: 2d5e3e8d28a7820de1eb7b18a7c15d645bb26992 9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 15:18:06 2008 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (26 commits)
[ARM] pxa: fix 1c104e0e4f6ab396960c058e95e18bdedcac945b
[ARM] serial: s3c2410: platform_get_irq() may return signed unnoticed
[ARM] am79c961a: platform_get_irq() may return signed unnoticed
[ARM] Feroceon: Feroceon-specific WA-cache compatible {copy,clear}_user_page()
[ARM] Feroceon: fix function alignment in proc-feroceon.S
[ARM] Orion: catch a couple more alternative spellings of PCIe
[ARM] Orion: fix orion-ehci platform resource end addresses
[ARM] Orion: fix ->map_irq() PCIe bus number check
[ARM] Orion: fix ioremap() optimization
[ARM] feroceon: remove CONFIG_CPU_CACHE_ROUND_ROBIN check
[ARM] feroceon: remove CONFIG_CPU_DCACHE_WRITETHROUGH check
kprobes/arm: fix decoding of arithmetic immediate instructions
kprobes/arm: fix cache flush address for instruction stub
[ARM] 5022/1: Race in ARM MMCI PL18x driver, V2
[ARM] 5021/1: at91: buildfix for sam9263 + PM
[ARM] 5018/1: RealView: Fix the ARM11MPCore Oprofile compilation
[ARM] 5016/1: AT91: typo in mci configuration for at91cap at91sam9263
[ARM] 5017/1: pxa3xx: Report unsupported wakeup sources in pxa3xx_set_wake()
[ARM] 5020/1: magician: remove __devinit marker from pasic3_leds_info
[ARM] 5014/1: Cleanup reset state before entering suspend or resetting.
...
commit 3dcf54515aa4981a647ad74859199032965193a5
Author: Christoph Hellwig <hch at lst.de>
Date: Tue Apr 29 18:13:32 2008 -0400
ext4: move headers out of include/linux
Move ext4 headers out of include/linux. This is just the trivial move,
there's some more thing that could be done later.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 216553c4b7f3e3e2beb4981cddca9b2027523928
Author: Josef Bacik <jbacik at redhat.com>
Date: Tue Apr 29 22:02:02 2008 -0400
ext4: fix wrong gfp type under transaction
This fixes the allocations with GFP_KERNEL while under a transaction problems
in ext4. This patch is the same as its ext3 counterpart, just switches these
to GFP_NOFS.
Signed-off-by: Josef Bacik <jbacik at redhat.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 2887df139c40512cdc147d1a84d95d4f3d261bd1
Author: Jan Kara <jack at suse.cz>
Date: Tue Apr 29 22:02:07 2008 -0400
ext4: Fix hang on umount with quotas when journal is aborted
Call dquot_drop() from ext4_dquot_drop() even if we fail to start a
transaction. Otherwise we never get to dropping references to quota structures
from the inode and umount will hang indefinitely. Thanks to Payphone LIOU for
spotting the problem.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
CC: Payphone LIOU <lioupayphone at gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 53b7e9f6807c1274eee19201396b4c2b5f721553
Author: Jan Kara <jack at suse.cz>
Date: Tue Apr 29 22:02:11 2008 -0400
ext4: Fix update of mtime and ctime on rename
The patch below makes ext4 update mtime and ctime of the directory
into which we move file even if the directory entry already exists.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit fe086a7bea7ab714930bd48addba961ceeef7634
Author: Alex Chiang <achiang at hp.com>
Date: Tue Apr 29 15:05:29 2008 -0700
[IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id
Legacy HP ia64 platforms currently cannot provide
/proc/cpuinfo/physical_id due to legacy SAL/PAL implementations.
However, that physical topology information can be obtained
via ACPI.
Provide an interface that gives ACPI one last chance to provide
physical_id for these legacy platforms. This logic only comes
into play iff:
- ACPI actually provides slot information for the CPU
- we lack a valid socket_id
Otherwise, we don't do anything.
Since x86 uses the ACPI processor driver as well, we provide a nop
stub function for arch_fix_phys_package_id() in asm-x86/topology.h
Signed-off-by: Alex Chiang <achiang at hp.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 2d5e3e8d28a7820de1eb7b18a7c15d645bb26992
Merge: b57ab7632b8fc1eef139bbbb7a89002be61f99e1 aed6abd662c2903733bea7fcd3856c306e650680
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 14:53:40 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits)
V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver
V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules
V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static
V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip
V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix
V4L/DVB (7782): pvrusb2: Driver is no longer experimental
V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text
V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2
V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug
Rename common tuner Kconfig names to use the same
Fix V4L/DVB core help messages
V4L/DVB (7769): Move other terrestrial tuners to common/tuners
V4L/DVB (7768): reorganize some DVB-S Kconfig items
V4L/DVB(7767): Move tuners to common/tuners
V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6
V4L/DVB (7765): Add support for Beholder BeholdTV H6
V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116
V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc
V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
V4L/DVB (7759): ivtv: increase version number to 1.2.1
...
commit b57ab7632b8fc1eef139bbbb7a89002be61f99e1
Merge: f12c03722045882a50c270f6332cf2c7b16a83d2 3760f736716f74bdc62a4ba5406934338da93eb2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 14:48:31 2008 -0700
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Convert most new-style drivers to use module aliasing
i2c: Add support for device alias names
i2c-amd756-s4882: Fix an error path
i2c: Drop unused RTC driver IDs
i2c/tps65010: Add missing intialization of client data
i2c-sis5595: Minor cleanups in sis5595_access
i2c-piix4: Minor cleanups
i2c: Spelling fix (successful)
i2c-stub: No newline in parameter description
commit f7e989301b6c232dec5489e94ee7741c85cb11ba
Author: Jeff Garzik <jeff at garzik.org>
Date: Tue Apr 29 17:47:34 2008 -0400
[libata] linux/libata.h: reorganize ata_device struct members a bit
Put the big stuff at the end, to prepare for upcoming changes (and
also hopefully achieve nicer packing of remaining members).
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 22b5e7a74280deae560c20ee1a9b502b35181327
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Apr 29 16:09:22 2008 +0900
ahci: SB600 ahci can't do MSI, blacklist that capability
This fixes bz#10507.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Shane Huang <Shane.Huang at amd.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit aed6abd662c2903733bea7fcd3856c306e650680
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 29 21:38:51 2008 -0300
V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver
LD drivers/media/video/built-in.o
drivers/media/video/cx18/built-in.o: In function `get_service_set':
/home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:118: multiple definition of `get_service_set'
drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:119: first defined here
drivers/media/video/cx18/built-in.o: In function `expand_service_set':
/home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:92: multiple definition of `expand_service_set'
drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:92: first defined here
drivers/media/video/cx18/built-in.o: In function `service2vbi':
/home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:44: multiple definition of `service2vbi'
drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:42: first defined here
make[2]: ** [drivers/media/video/built-in.o] Erro 1
make[1]: ** [drivers/media/video] Erro 2
make: ** [drivers/media/] Erro 2
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a07c8779fd212dcbad886a2824ef5f8b42cd5a06
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 29 03:54:19 2008 -0300
V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4407a463dd6afc892aedfbdc4237c42136d9f848
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 28 17:13:51 2008 -0300
V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static
This patch makes the needlessly global mt9{m001,v022}_controls[] static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1c1e45d17b663d4749af456ab7c2fc1f36405ef8
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Mon Apr 28 20:24:33 2008 -0300
V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip
Many thanks to Steve Toth from Hauppauge and Nattu Dakshinamurthy from
Conexant for their support. I am in particular thankful to Hauppauge
since without their help this driver would not exist. It should also
be noted that Steve did the work to get the DVB part up and running.
Thank you!
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: G. Andrew Walls <awalls at radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d74bee8b4776b5051c650a90f49a2022d46d8588
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 28 08:54:56 2008 -0300
V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix
drivers/media/dvb/frontends/s5h1420.c: In function `s5h1420_setsymbolrate':
drivers/media/dvb/frontends/s5h1420.c:484: warning: long long unsigned int format, u64 arg (arg 2)
We do not know what type the architecture uses for u64.
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f4d2782411d502c39f2c21376377c745c0f09061
Author: Mike Isely <isely at pobox.com>
Date: Sun Apr 27 21:37:33 2008 -0300
V4L/DVB (7782): pvrusb2: Driver is no longer experimental
This driver has been in-kernel and reasonably stable for well over a
year. It is in a stable form and is known to work well. Remove its
experimental status.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8ed3c844040e492239609c9559de04d5397a6b2b
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun Apr 27 19:22:45 2008 -0300
V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 749b6a77b0cb43b12b51f62735f948e9ccc34ba6
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun Apr 27 19:12:29 2008 -0300
V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2
This was a build option in the past, to avoid conflicts with the cxusb module
for digital televsion support. Now that dtv mode support has been merged into
pvrusb2, the OnAir devices are fully supported by this single module. This no
longer should be a build option.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 485fcaed25ed42d064445f9a65faa79a1faa6b0c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sat Apr 26 19:44:59 2008 -0300
V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug
Get rid of the noise in dmesg during dvb feed changes,
unless the appropriate debug trace flag is enabled.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Reviewed-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 149ef72deeba57078216c9fa678baff392295853
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 29 21:38:46 2008 -0300
Rename common tuner Kconfig names to use the same
namespace for all of them.
commit f1784354f774e1fa4863fc6382296ef6ede26dc5
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 29 21:38:45 2008 -0300
Fix V4L/DVB core help messages
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b094516f9589245617eb5d0452769826063f72ac
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 29 21:38:45 2008 -0300
V4L/DVB (7769): Move other terrestrial tuners to common/tuners
Those tuners are currently used only under media/dvb. However,
they can support also analog TV. Better to move them to the same place
as the other hybrid tuners. This would make easier to use those tuners also
by analog drivers.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit df7aaaf3a74016cbc72382b6388c7c62f3df49b2
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sat Apr 26 16:19:58 2008 -0300
V4L/DVB (7768): reorganize some DVB-S Kconfig items
There are some DVB-S tuners together with DVB-S tags, while
others together with tuners. Better to have all of them together.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7c91f0624a9a2b8b9b122cf94fef34bc7f7347a6
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 29 21:38:44 2008 -0300
V4L/DVB(7767): Move tuners to common/tuners
There were several issues in the past, caused by the hybrid tuner design, since
now, the same tuner can be used by drivers/media/dvb and drivers/media/video.
Kconfig items were rearranged, to split V4L/DVB core from their drivers.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5fe95e0b865060839449e1a61c1d5c67a4faab9a
Author: Igor Kuznetsov <igk at igk.ru>
Date: Sat Apr 26 14:59:08 2008 -0300
V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6
Signed-off-by: Igor Kuznetsov <igk at igk.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 025052716d124ab6e5f23d6a535e843a31fb8b35
Author: Igor Kuznetsov <igk at igk.ru>
Date: Sat Apr 26 14:53:48 2008 -0300
V4L/DVB (7765): Add support for Beholder BeholdTV H6
Signed-off-by: Igor Kuznetsov <igk at igk.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 136531dac435828c4aa9ca694a7693b63a573be1
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat Apr 26 14:16:18 2008 -0300
V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a0bdd273a2fdb2a0debc90d5f8826073e2ddea4d
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat Apr 26 12:10:58 2008 -0300
V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2968e31361a2687cebeda6f558f82a3ec9354ca6
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat Apr 26 11:22:11 2008 -0300
V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
When there is a lot of DMA traffic this timeout might sometimes be too low.
Increase it to be on the safe side.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fcbbf6fb07aa020088d5a35c289c80449a8e684b
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat Apr 26 09:43:22 2008 -0300
V4L/DVB (7759): ivtv: increase version number to 1.2.1
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 94dee760823606ff6e191efc60e5bb98b81f1676
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat Apr 26 09:26:13 2008 -0300
V4L/DVB (7758): ivtv: fix oops when itv->speed == 0 and VIDEO_CMD_PLAY is called
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 22f23fcc13e34a1efde8e7c37d157516fc1aa24f
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat Apr 26 09:19:44 2008 -0300
V4L/DVB (7757): ivtv: add autodetect for the AVermedia M104 card
Note that this card is only detected and not yet working.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit cebfadff4a5c877c524ae6014613edab9f50a2a9
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat Apr 26 08:51:51 2008 -0300
V4L/DVB (7756): ivtv: use strlcpy instead of strcpy
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ecfcc83b8d6ff8ac65b072b309a1774ca52d955e
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat Apr 26 08:48:26 2008 -0300
V4L/DVB (7755): ivtv: add support for card comments and detected but unsupported cards
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d86e2ee98eeef61bdab8ca1bf4837c5709173790
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat Apr 26 08:43:50 2008 -0300
V4L/DVB (7754): ivtv: change initialization order to fix an oops when device registration failed
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c117d05cd4c09342f97ba1c6ef63f0bae3239a39
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sat Apr 26 14:05:58 2008 -0300
V4L/DVB (7753): saa7134: fix tuner setup
Tuner setup were happening during i2c attach callback. This means that it would
happen on two conditions:
1) if tuner module weren't load, it will happen at request_module("tuner");
2) if tuner is not compiled as a module, or it is already loaded
(for example, on setups with more than one tuner), it will happen
when saa7134 registers I2C bus.
Due to that, if tuner were loaded, tuner setup will happen _before_ reading
the proper values at tuner eeprom. Since set_addr refuses to change for a tuner
that were previously defined (except if the tuner_addr is set), this were
making eeprom tuner detection useless.
This patch removes tuner type setup from saa7134-i2c, moving it to the proper
place, after taking eeprom into account.
Reviewed-by: Hermann Pitton <hermann-pitton at arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 397be5c4d66e6583ce3d38b0f99a56eb9818492b
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sat Apr 26 14:04:10 2008 -0300
V4L/DVB (7752): tuner-core: add a missing \n after a debug printk
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4bf1226a7018bf79d05e0ce59244d702819529d1
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sat Apr 26 11:55:09 2008 -0300
V4L/DVB (7749): cx88: fix tuner setup
Tuner setup were happening during i2c attach callback. This means that it would
happen on two conditions:
1) if tuner module weren't load, it will happen at request_module("tuner");
2) if tuner is not compiled as a module, or it is already loaded
(for example, on setups with more than one tuner), it will happen
when cx88 registers I2C bus.
Due to that, if tuner were loaded, tuner setup will happen _before_ reading
the proper values at tuner eeprom. Since set_addr refuses to change for a tuner
that were previously defined (except if the tuner_addr is set), this were making
eeprom tuner detection useless.
This patch removes tuner type setup from cx88-i2c, moving it to the proper
place, after taking eeprom into account.
Reviewed-by: Gert Vervoort <gert.vervoort at hccnet.nl>
Reviewed-by: Ian Pickworth <ian at pickworth.me.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a79067e513c71733223e13a52aacc8dbd71e9f46
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Apr 29 14:08:36 2008 +0100
libata: More TSSTcorp pain, keep in sync with legacy IDE
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 11f6400e92aa3fc0aa936f20f7cc363674a4e3c4
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Apr 29 14:10:57 2008 +0100
pata_via: Fix 6410 misdetect
The discrete VIA ATA chips don't have 0x40 enable bits. We check that
properly in one location but not another. This causes some users 6410
RAID cards to be incorrectly skipped.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d7b5a23fc6e85456ed00a997ff2d925fb3f0dc52
Author: Jeff Garzik <jeff at garzik.org>
Date: Tue Apr 29 17:39:45 2008 -0400
[libata] pata_atiixp: fix PIO timing data misprogramming
Use correct variable, achieve desired result...
Spotted by LKML/linux-ide poster whose name I lost (apologies!)
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3760f736716f74bdc62a4ba5406934338da93eb2
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 23:11:40 2008 +0200
i2c: Convert most new-style drivers to use module aliasing
Based on earlier work by Jon Smirl and Jochen Friedrich.
Update most new-style i2c drivers to use standard module aliasing
instead of the old driver_name/type driver matching scheme. I've
left the video drivers apart (except for SoC camera drivers) as
they're a bit more diffcult to deal with, they'll have their own
patch later.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: Jon Smirl <jonsmirl at gmail.com>
Cc: Jochen Friedrich <jochen at scram.de>
commit d2653e92732bd3911feff6bee5e23dbf959381db
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 23:11:39 2008 +0200
i2c: Add support for device alias names
Based on earlier work by Jon Smirl and Jochen Friedrich.
This patch allows new-style i2c chip drivers to have alias names using
the official kernel aliasing system and MODULE_DEVICE_TABLE(). At this
point, the old i2c driver binding scheme (driver_name/type) is still
supported.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: Jochen Friedrich <jochen at scram.de>
Cc: Jon Smirl <jonsmirl at gmail.com>
Cc: Kay Sievers <kay.sievers at vrfy.org>
commit ee56d977423a58b53fd0fc1ef0aca0c9cb564c53
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 23:11:38 2008 +0200
i2c-amd756-s4882: Fix an error path
If initialization fails, we want to restore the physical bus, not delete
it again.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 306f39f8f2ecf896ae761748843b148b90d3494d
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 23:11:38 2008 +0200
i2c: Drop unused RTC driver IDs
The x1208, pcf8563 and isl1208 RTC drivers have been converted to
new-style i2c drivers, so they no longer use I2C driver IDs.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: Alessandro Zummo <a.zummo at towertech.it>
commit 6d072d78f87e8fe0fe30d096991b83af07f8bdfe
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 23:11:38 2008 +0200
i2c/tps65010: Add missing intialization of client data
tps65010_remove() calls i2c_get_clientdata(client) but the client data
is never set during initialization, so it gets a NULL pointer at best.
I guess it was never spotted because the tps65010 driver is typically
not built modular so this function is discarded.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: David Brownell <dbrownell at users.sourceforge.net>
commit 1842cc2eeb345c4eef069ffd46e95359fb37b4b5
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 23:11:38 2008 +0200
i2c-sis5595: Minor cleanups in sis5595_access
* Remove commented-out code.
* Use dev_warn instead of printk.
* Remove a legacy comment.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 3578a0759ed2f0ea1f2409144e628dad4d748059
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 23:11:37 2008 +0200
i2c-piix4: Minor cleanups
* Remove a needless include.
* Remove a legacy comment in piix4_access.
* Minor optimization in piix4_access.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit c5d21b7fb747042cb2155698649cffccfd77d1f3
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 23:11:37 2008 +0200
i2c: Spelling fix (successful)
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 85d6931cde5bbb80254dcd2a9f0851bd3eb8960b
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 23:11:37 2008 +0200
i2c-stub: No newline in parameter description
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit f12c03722045882a50c270f6332cf2c7b16a83d2
Merge: eeb85d0b0e312ab9a6c3476f18308409913ab369 7495ab6837ea4660f5e14ad49e5bfc558d6862e7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 14:02:48 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/nes: Formatting cleanup
RDMA/nes: Add support for SFP+ PHY
RDMA/nes: Use LRO
IPoIB: Copy child MTU from parent
IB/mthca: Avoid changing userspace ABI to handle DMA write barrier attribute
IB/mthca: Avoid recycling old FMR R_Keys too soon
mlx4_core: Avoid recycling old FMR R_Keys too soon
IB/ehca: Allocate event queue size depending on max number of CQs and QPs
IPoIB: Use separate CQ for UD send completions
IB/iser: Count FMR alignment violations per session
IB/iser: Move high-volume debug output to higher debug level
IB/ehca: handle negative return value from ibmebus_request_irq() properly
RDMA/cxgb3: Support peer-2-peer connection setup
RDMA/cxgb3: Set the max_mr_size device attribute correctly
RDMA/cxgb3: Correctly serialize peer abort path
mlx4_core: Add a way to set the "collapsed" CQ flag
commit eeb85d0b0e312ab9a6c3476f18308409913ab369
Merge: 355a46961b58012de239cafccbfce4c9321d4395 6d1cee44361b8d06ccd1812e80448d86ae60dfe3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 14:01:25 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
alim15x3: disable init_hwif_ali15x3 for PowerPC
ide: fix crash at boot with siimage driver
commit 6d1cee44361b8d06ccd1812e80448d86ae60dfe3
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Tue Apr 29 22:57:38 2008 +0200
alim15x3: disable init_hwif_ali15x3 for PowerPC
We don't need init_hwif_ali15x3() on the PowerPC systems either.
Before:
ALI15X3: IDE controller (0x10b9:0x5229 rev 0xc8) at PCI slot 0001:03:1f.0
ALI15X3: 100% native mode on irq 19
ide0: BM-DMA at 0x1120-0x1127
ide1: BM-DMA at 0x1128-0x112f
hda: SONY DVD RW AW-Q170A, ATAPI CD/DVD-ROM drive
hda: UDMA/66 mode selected
ide0: Disabled unable to get IRQ 14.
ide0: failed to initialize IDE interface
ide1: Disabled unable to get IRQ 15.
ide1: failed to initialize IDE interface
After:
ALI15X3: IDE controller (0x10b9:0x5229 rev 0xc8) at PCI slot 0001:03:1f.0
ALI15X3: 100% native mode on irq 19
ide0: BM-DMA at 0x1120-0x1127
ide1: BM-DMA at 0x1128-0x112f
hda: SONY DVD RW AW-Q170A, ATAPI CD/DVD-ROM drive
hda: UDMA/66 mode selected
ide0 at 0x1100-0x1107,0x110a on irq 19
ide1 at 0x1110-0x1117,0x111a on irq 19
hda: ATAPI 48X DVD-ROM DVD-R CD-R/RW drive, 2048kB Cache
ide0 works well, though I can't test ide1, it isn't traced out on
the board.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b26b0c590066f65ff3b1ff438502f3c40ea39520
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Tue Apr 29 22:57:37 2008 +0200
ide: fix crash at boot with siimage driver
Some change to the IDE layer are causing the siimage driver to crash
at boot with a NULL dereference. This is due to the sil_dma_ops not
containing all the necessary pointers. I suppose it used to just
"override" the defaults while now, it needs to contain everything.
[bart: while at it: sil_dma_ops should be const now (pointed out by Sergei)]
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>,
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 6ff0bc94eee96fe45e5caa338c8b03cb99431fa9
Author: Alex Chiang <achiang at hp.com>
Date: Thu Apr 24 12:57:08 2008 -0600
[IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO
Commit 113134fcbca83619be4c68d0ca66db6093777b5d changed the flow of
control when calling PAL_LOGICAL_TO_PHYSICAL and SAL_PHYSICAL_ID_INFO.
With the change, if a platform did not implement the latter, a useless
printk would appear in the boot log:
ia64_sal_pltid failed with -1
So let's check the return code and only printk on a true error, and do
not print anything in the unimplemented case. While we're in there,
clean up some stylistic issues too.
Signed-off-by: Alex Chiang <achiang at hp.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit e4a064dfa2b242519a9f06f9a1e58c27bf0c371b
Author: Dean Nelson <dcn at sgi.com>
Date: Fri Apr 25 15:22:19 2008 -0500
[IA64] allocate multiple contiguous pages via uncached allocator
Enable the uncached allocator to allocate multiple pages of contiguous
uncached memory.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit e617fce64e5faea149fcf3bffc1b42e4ba29e7e5
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Fri Apr 25 23:13:09 2008 +0900
[IA64] bugfix: nptcg breaks cpu-hotadd
If "max_purges" from PAL is 0, it actually means 1.
However it was not handled later when a hot-added cpu pass the
max_purges from PAL. This makes systems easy to go BUG_ON().
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 7495ab6837ea4660f5e14ad49e5bfc558d6862e7
Author: Glenn Streiff <gstreiff at neteffect.com>
Date: Tue Apr 29 13:46:54 2008 -0700
RDMA/nes: Formatting cleanup
Various cleanups:
- Change // to /* .. */
- Place whitespace around binary operators.
- Trim down a few long lines.
- Some minor alignment formatting for better readability.
- Remove some silly tabs.
Signed-off-by: Glenn Streiff <gstreiff at neteffect.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 0e1de5d62e751ca9c589d8dfabfc1e5074e62724
Author: Eric Schneider <eric.schneider at neteffect.com>
Date: Tue Apr 29 13:46:54 2008 -0700
RDMA/nes: Add support for SFP+ PHY
This patch enables the iw_nes module for NetEffect RNICs to support
additional PHYs including SFP+ (referred to as ARGUS in the code).
Signed-off-by: Eric Schneider <eric.schneider at neteffect.com>
Signed-off-by: Glenn Streiff <gstreiff at neteffect.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 37dab4112d7b53c3574426ef7bdd92a78d32ac3e
Author: Faisal Latif <flatif at neteffect.com>
Date: Tue Apr 29 13:46:54 2008 -0700
RDMA/nes: Use LRO
Signed-off-by: Faisal Latif <flatif at neteffect.com.
Signed-off-by: Glenn Streiff <gstreiff at neteffect.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit b4132efa1a47858d741ecb05b8735e6fcb603bc8
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date: Tue Apr 29 13:46:53 2008 -0700
IPoIB: Copy child MTU from parent
When creating a child interface, copy the MTU information from the
parent. Otherwise when the child's multicast join completes, the MTU
will not be updated since the code does
dev->mtu = min(priv->mcast_mtu, priv->admin_mtu);
and priv->admin_mtu will be set to 0.
Signed-off-by: Eli Cohen <eli at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit baaad380c0aa955f7d62e846467316c94067f1a5
Author: Roland Dreier <rolandd at cisco.com>
Date: Tue Apr 29 13:46:53 2008 -0700
IB/mthca: Avoid changing userspace ABI to handle DMA write barrier attribute
Commit cb9fbc5c ("IB: expand ib_umem_get() prototype") changed the
mthca userspace ABI to provide a way for userspace to indicate which
memory regions need the DMA write barrier attribute. However, it is
possible to handle this without breaking existing userspace, by having
the mthca kernel driver recognize whether it is talking to old or new
userspace, depending on the size of the register MR structure passed in.
The only potential drawback of this is that is allows old userspace
(which has a bug with DMA ordering on large SGI Altix systems) to
continue to run on new kernels, but the advantage of allowing old
userspace to continue to work on unaffected systems seems to outweigh
this, and we can print a warning to push people to upgrade their
userspace.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 0bfe151cc4049f3f304adf28b37ea5437d02ad96
Author: Olaf Kirch <okir at lst.de>
Date: Tue Apr 29 13:46:53 2008 -0700
IB/mthca: Avoid recycling old FMR R_Keys too soon
When a FMR is unmapped, mthca resets the map count to 0, and clears
the upper part of the R_Key which is used as the sequence counter.
This poses a problem for RDS, which uses ib_fmr_unmap as a fence
operation. RDS assumes that after issuing an unmap, the old R_Keys
will be invalid for a "reasonable" period of time. For instance,
Oracle processes uses shared memory buffers allocated from a pool of
buffers. When a process dies, we want to reclaim these buffers -- but
we must make sure there are no pending RDMA operations to/from those
buffers. The only way to achieve that is by using unmap and sync the
TPT.
However, when the sequence count is reset on unmap, there is a high
likelihood that a new mapping will be given the same R_Key that was
issued a few milliseconds ago.
To prevent this, don't reset the sequence count when unmapping a FMR.
Signed-off-by: Olaf Kirch <olaf.kirch at oracle.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit bbdc2821db041fb07ffa52e4a0e1ebb5410790e9
Author: Olaf Kirch <okir at lst.de>
Date: Tue Apr 29 13:46:53 2008 -0700
mlx4_core: Avoid recycling old FMR R_Keys too soon
When a FMR is unmapped, mlx4 resets the map count to 0, and clears the
upper part of the R_Key which is used as the sequence counter.
This poses a problem for RDS, which uses ib_fmr_unmap as a fence
operation. RDS assumes that after issuing an unmap, the old R_Keys
will be invalid for a "reasonable" period of time. For instance,
Oracle processes uses shared memory buffers allocated from a pool of
buffers. When a process dies, we want to reclaim these buffers -- but
we must make sure there are no pending RDMA operations to/from those
buffers. The only way to achieve that is by using unmap and sync the
TPT.
However, when the sequence count is reset on unmap, there is a high
likelihood that a new mapping will be given the same R_Key that was
issued a few milliseconds ago.
To prevent this, don't reset the sequence count when unmapping a FMR.
Signed-off-by: Olaf Kirch <olaf.kirch at oracle.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit d227fa7288adebe5ba37fa8e4a589c977d4e4a34
Author: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Tue Apr 29 13:46:53 2008 -0700
IB/ehca: Allocate event queue size depending on max number of CQs and QPs
If a lot of QPs fall into Error state at once and the EQ of the
respective HCA is too small, it might overrun, causing the eHCA driver
to stop processing completion events and calling the application's
completion handlers, effectively causing traffic to stop.
Fix this by limiting available QPs and CQs to a customizable max
count, and determining EQ size based on these counts and a worst-case
assumption.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit f56bcd8013566d4ad4759ae5fc85a6660e4655c7
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date: Tue Apr 29 13:46:53 2008 -0700
IPoIB: Use separate CQ for UD send completions
Use a dedicated CQ for UD send completions. Also, do not arm the UD
send CQ, which reduces the number of interrupts generated. This patch
farther reduces overhead by not calling poll CQ for every posted send
WR -- it does polls only when there 16 or more outstanding work requests.
Signed-off-by: Eli Cohen <eli at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 87528227dfa8776d12779d073c217f0835fd6d20
Author: Eli Dorfman <dorfman.eli at gmail.com>
Date: Tue Apr 29 13:46:52 2008 -0700
IB/iser: Count FMR alignment violations per session
Count FMR alignment violations per session as part of the iscsi
statistics.
Signed-off-by: Eli Dorfman <elid at voltaire.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 6f735e36bad6fa4949271b3c3d0f331aad812313
Author: Eli Dorfman <dorfman.eli at gmail.com>
Date: Tue Apr 29 13:46:52 2008 -0700
IB/iser: Move high-volume debug output to higher debug level
Add another level for debug.
Signed-off-by: Eli Dorfman <elid at voltaire.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 7df109d917e85d3da2e25bd495c4997e87ed2a4e
Author: Hoang-Nam Nguyen <hnguyen at linux.vnet.ibm.com>
Date: Tue Apr 29 13:46:52 2008 -0700
IB/ehca: handle negative return value from ibmebus_request_irq() properly
ehca_create_eq() was assigning a signed return value to an unsiged
local variable and then checking if the variable was < 0, which meant
that errors were always ignored. Fix this by using one variable for
signed integer return values and another for u64 hcall return values.
Bug originally found by Roel Kluin <12o3l at tiscali.nl>.
Signed-off-by: Hoang-Nam Nguyen <hnguyen at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit f8b0dfd15277974b5c9f3ff17f9e3ab6fdbe45ee
Author: Steve Wise <swise at opengridcomputing.com>
Date: Tue Apr 29 13:46:52 2008 -0700
RDMA/cxgb3: Support peer-2-peer connection setup
Open MPI, Intel MPI and other applications don't respect the iWARP
requirement that the client (active) side of the connection send the
first RDMA message. This class of application connection setup is
called peer-to-peer. Typically once the connection is setup, _both_
sides want to send data.
This patch enables supporting peer-to-peer over the chelsio RNIC by
enforcing this iWARP requirement in the driver itself as part of RDMA
connection setup.
Connection setup is extended, when the peer2peer module option is 1,
such that the MPA initiator will send a 0B Read (the RTR) just after
connection setup. The MPA responder will suspend SQ processing until
the RTR message is received and reply-to.
In the longer term, this will be handled in a standardized way by
enhancing the MPA negotiation so peers can indicate whether they
want/need the RTR and what type of RTR (0B read, 0B write, or 0B send)
should be sent. This will be done by standardizing a few bits of the
private data in order to negotiate all this. However this patch
enables peer-to-peer applications now and allows most of the required
firmware and driver changes to be done and tested now.
Design:
- Add a module option, peer2peer, to enable this mode.
- New firmware support for peer-to-peer mode:
- a new bit in the rdma_init WR to tell it to do peer-2-peer
and what form of RTR message to send or expect.
- process _all_ preposted recvs before moving the connection
into rdma mode.
- passive side: defer completing the rdma_init WR until all
pre-posted recvs are processed. Suspend SQ processing until
the RTR is received.
- active side: expect and process the 0B read WR on offload TX
queue. Defer completing the rdma_init WR until all
pre-posted recvs are processed. Suspend SQ processing until
the 0B read WR is processed from the offload TX queue.
- If peer2peer is set, driver posts 0B read request on offload TX
queue just after posting the rdma_init WR to the offload TX queue.
- Add CQ poll logic to ignore unsolicitied read responses.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit ccaf10d0ad17bf755750160ebe594de7261a893e
Author: Steve Wise <swise at opengridcomputing.com>
Date: Tue Apr 29 13:46:52 2008 -0700
RDMA/cxgb3: Set the max_mr_size device attribute correctly
cxgb3 only supports 4GB memory regions. The lustre RDMA code uses
this attribute and currently has to code around our bad setting.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 989a1780698c65dfe093a6aa89ceeff84c31f528
Author: Steve Wise <swise at opengridcomputing.com>
Date: Tue Apr 29 13:46:51 2008 -0700
RDMA/cxgb3: Correctly serialize peer abort path
Open MPI and other stress testing exposed a few bad bugs in handling
aborts in the middle of a normal close. Fix these by:
- serializing abort reply and peer abort processing with disconnect
processing
- warning (and ignoring) if ep timer is stopped when it wasn't running
- cleaning up disconnect path to correctly deal with aborting and
dead endpoints
- in iwch_modify_qp(), taking a ref on the ep before releasing the qp
lock if iwch_ep_disconnect() will be called. The ref is dropped
after calling disconnect.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit e463c7b197dbe64b8a99b0612c65f286937e5bf1
Author: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Date: Tue Apr 29 13:46:50 2008 -0700
mlx4_core: Add a way to set the "collapsed" CQ flag
Extend the mlx4_cq_resize() API with a way to set the "collapsed" flag
for the CQ being created.
Signed-off-by: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 98db6f193c93e9b4729215af2c9101210e11d26c
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 22:38:48 2008 +0200
x86: fix section mismatch in pci_scan_bus
Fix following section mismatch warning:
WARNING: vmlinux.o(.text+0x275616): Section mismatch in reference from the function pci_scan_bus() to the function .devinit.text:pci_scan_bus_parented()
The warning was seen with a CONFIG_DEBUG_SECTION_MISMATCH=y build.
The inline function pci_scan_bus refer to functions annotated
__devinit - so annotate it __devinit too.
This revealed a few x86 specific functions that were only
used from __init or __devinit context.
So annotate these __devinit and the warning was killed.
The added include in pci.h was not strictly required but
added to avoid being dependent on indirect includes.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>
commit 9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04
Merge: 92794a5d6359f9e8ed0d43fe0f3c653f748dcc90 0ed1507183adea174bc4b6611b50d90e044730c2
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Tue Apr 29 21:31:13 2008 +0100
Merge branch 'orion-fixes2'
commit 92794a5d6359f9e8ed0d43fe0f3c653f748dcc90
Merge: 681587c58639444215a7c88f7471819997d2f226 7883938b0d5ee8dd6381e1e2a9f71254252fd504 b46926bb2d9977799c88aef17a4386ee02c326d8
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Tue Apr 29 21:31:06 2008 +0100
Merge branches 'pxa' and 'orion-fixes1'
commit 7883938b0d5ee8dd6381e1e2a9f71254252fd504
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Tue Apr 29 21:28:03 2008 +0100
[ARM] pxa: fix 1c104e0e4f6ab396960c058e95e18bdedcac945b
The referenced commit changed the order such that the CPU code was
initialised before MFP, resulting in unregistered MFP sysfs objects
being referenced. Reverse the link order of these so MFP is
initialised before the CPU code.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 355a46961b58012de239cafccbfce4c9321d4395
Author: Dave Jones <davej at redhat.com>
Date: Tue Apr 29 16:01:22 2008 -0400
trivial: fix user-visible typo in hfsplus
Signed-off-by: Dave Jones <davej at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 25f2ea9fc8c7ec34d351cef7dade2e8046e49ed1
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 20:54:28 2008 +0100
Security: Typecast CAP_*_SET macros
Cast the CAP_*_SET macros to be of kernel_cap_t type to avoid compiler
warnings.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7bf570dc8dcf76df2a9f583bef2da96d4289ed0d
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 20:52:51 2008 +0100
Security: Make secctx_to_secid() take const secdata
Make secctx_to_secid() take constant secdata.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7663c1e2792a9662b23dec6e19bfcd3d55360b8f
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Tue Apr 29 21:31:27 2008 +0200
Improve queue_is_locked()
spin_is_locked() doesn't work on UP without spinlock debugging. Make it
safer and just return 1 on UP, so we don't get false positives. The plan
is to kill this debug function during the -rc cycle.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6203554207728f43cfb9fd48585cd6500da73d42
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 11:45:16 2008 -0700
drivers/net/tehuti: use proper capability check for raw IO access
Yeah, in practice they both mean "root", but Alan correctly points out
that anybody who gets to do raw IO space accesses should really be using
CAP_SYS_RAWIO rather than CAP_NET_ADMIN.
Pointed-out-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9781db7b345b5dfe93787aaaf310c861db7c1ede
Merge: 97094dcf5cefc8ccfdf93839f54dac2c4d316165 8b67dca9420474623709e00d72a066068a502b20
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 11:41:22 2008 -0700
Merge branch 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] new predicate - AUDIT_FILETYPE
[patch 2/2] Use find_task_by_vpid in audit code
[patch 1/2] audit: let userspace fully control TTY input auditing
[PATCH 2/2] audit: fix sparse shadowed variable warnings
[PATCH 1/2] audit: move extern declarations to audit.h
Audit: MAINTAINERS update
Audit: increase the maximum length of the key field
Audit: standardize string audit interfaces
Audit: stop deadlock from signals under load
Audit: save audit_backlog_limit audit messages in case auditd comes back
Audit: collect sessionid in netlink messages
Audit: end printk with newline
commit 97094dcf5cefc8ccfdf93839f54dac2c4d316165
Author: akpm at linux-foundation.org <akpm at linux-foundation.org>
Date: Tue Apr 29 10:47:54 2008 -0700
drivers/pcmcia/pcmcia_ioctl.c: fix build
argh. A hunk got lost from "proc: remove proc_bus"
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c9a3f6d6f541915bd7451fc7e9cb23a8b33a3ab8
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Tue Apr 29 19:12:35 2008 +0200
dm: use unlocked variants of queue flag check/set
dm.c already provides mutual exclusion through ->map_lock.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a217656cb26c5b7ebe9900354b2e808c1f74b470
Merge: 8f45c1a58a25c3a1a2f42521445e1e786c4c0b92 a53edac131cadee317e7e36a5908bb4c71d874cd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 10:17:59 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits)
pciehp: fix error message about getting hotplug control
pci/irq: let pci_device_shutdown to call pci_msi_shutdown v2
pci/irq: restore mask_bits in msi shutdown -v3
doc: replace yet another dev with pdev for consistency in DMA-mapping.txt
PCI: don't expose struct pci_vpd to userspace
doc: fix an incorrect suggestion to pass NULL for PCI like buses
Consistently use pdev as the variable of type struct pci_dev *.
pciehp: Fix command write
shpchp: fix slot name
make pciehp_acpi_get_hp_hw_control_from_firmware()
pciehp: Clean up pcie_init()
pciehp: Mask hotplug interrupt at controller release
pciehp: Remove useless hotplug interrupt enabling
pciehp: Fix wrong slot capability check
pciehp: Fix wrong slot control register access
pciehp: Add missing memory barrier
pciehp: Fix interrupt event handlig
pciehp: fix slot name
Update MAINTAINERS with location of PCI tree
PCI: Add Intel SCH PCI IDs
...
commit 8f45c1a58a25c3a1a2f42521445e1e786c4c0b92
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 10:16:38 2008 -0700
block: fix queue locking verification
The new queue_flag_set/clear() functions verify that the queue is
locked, but in doing so they will actually instead oops if the queue
lock hasn't been initialized at all.
So fix the lock debug test to consider the "no lock" case to be
unlocked. This way you get a nice WARN_ON_ONCE() instead of a fatal
oops.
Bug introduced by commit 75ad23bc0fcb4f992a5d06982bf0857ab1738e9e
("block: make queue flags non-atomic").
Cc: Jens Axboe <jens.axboe at oracle.com>
Cc: Nick Piggin <npiggin at suse.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 25a025863e024f6b86b48137b10b4960c50351b0
Merge: 1f43c5393033de90bac4410352b1d2a69dcbe7ef 7e48bf653c37eb32c2ba4c13f15aa154aa807e61
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 09:38:52 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc - wm9712 - checkpatch fixes
[ALSA] pcsp - Fix more dependency
[ALSA] hda - Add support of Medion RIM 2150
[ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors
[ALSA] ice1724 - Enable watermarks
[ALSA] Add MPU401_INFO_NO_ACK bitflag
commit 7e48bf653c37eb32c2ba4c13f15aa154aa807e61
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Mon Apr 28 14:15:28 2008 +0100
[ALSA] soc - wm9712 - checkpatch fixes
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit bad7785d4a787dd32245772e7daecf80d3618de9
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Apr 28 12:35:41 2008 +0200
[ALSA] pcsp - Fix more dependency
Added the missing dependency and select for snd-pcsp driver.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit df99cd334e5356b002a9480048c06265e558e180
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Apr 25 15:25:04 2008 +0200
[ALSA] hda - Add support of Medion RIM 2150
Added the support of Medion RIM 2150 laptop with ALC880 codec.
ALSA bug#3708:
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3708
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 2e74796a45ee05bd901968ef1eb6cb884d1dca5e
Author: Jarkko Nikula <jarkko.nikula at nokia.com>
Date: Fri Apr 25 13:55:19 2008 +0200
[ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors
Add common OMAP ASoC drivers and machine driver for Nokia N810. Currently
supported features are:
- Covers OMAPs from 1510 to 2420
- Common DMA driver
- DAI link driver using McBSP port in I2S mode
- Basic machine driver for Nokia N810
Signed-off-by: Jarkko Nikula <jarkko.nikula at nokia.com>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7f70f046af855e027f7b53ec7d214c2d0c790b6d
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Apr 25 09:15:12 2008 +0200
[ALSA] ice1724 - Enable watermarks
Enable watermarks settings (previously commented out) for MPU RX/TX.
Otherwise irqs aren't issued properly.
Tested-by: Pavel Hofman <pavel.hofman at insite.cz>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit df7e3fdf83699328d1fdf7000ce0dc852fbb0ad9
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Apr 25 09:13:45 2008 +0200
[ALSA] Add MPU401_INFO_NO_ACK bitflag
Added MPU401_INFO_NO_ACK bitflag to ignore the ACK check for UART
commands. VT172x doesn't handle ACK commands, for example.
Tested-by: Pavel Hofman <pavel.hofman at insite.cz>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7aa0f1a8b1f7072990c9dc37f238c96dc6d78911
Author: Len Brown <len.brown at intel.com>
Date: Tue Apr 29 12:24:24 2008 -0400
intel_menlo: fix build warning
drivers/misc/intel_menlow.c:191: warning: label ‘unregister’ defined but not used
Signed-off-by: Len Brown <len.brown at intel.com>
commit a53edac131cadee317e7e36a5908bb4c71d874cd
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Tue Apr 29 09:15:04 2008 -0700
pciehp: fix error message about getting hotplug control
People are confused by the following error message that actually is
not for indicating a error.
Cannot get control of hotplug hardware for pci %s
This patch changes this message to debug message.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>
commit d52877c7b1afb8c37ebe17e2005040b79cb618b0
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Wed Apr 23 14:58:09 2008 -0700
pci/irq: let pci_device_shutdown to call pci_msi_shutdown v2
[PATCH 2/2] pci/irq: let pci_device_shutdown to call pci_msi_shutdown v2
this change
| commit 23a274c8a5adafc74a66f16988776fc7dd6f6e51
| Author: Prakash, Sathya <sathya.prakash at lsi.com>
| Date: Fri Mar 7 15:53:21 2008 +0530
|
| [SCSI] mpt fusion: Enable MSI by default for SAS controllers
|
| This patch modifies the driver to enable MSI by default for all SAS chips.
|
| Signed-off-by: Sathya Prakash <sathya.prakash at lsi.com>
| Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
|
Causes the kexec of a RHEL 5.1 kernel to fail.
root casue: the rhel 5.1 kernel still uses INTx emulation. and
mptscsih_shutdown doesn't call pci_disable_msi to reenable INTx on kexec path
So call pci_msi_shutdown in the shutdown path to do the same thing to msix
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>
commit 8e149e09f91098fd72bf9ac5b4a77a693abf721e
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Wed Apr 23 14:56:30 2008 -0700
pci/irq: restore mask_bits in msi shutdown -v3
[PATCH 1/2] pci/irq: restore mask_bits in msi shutdown -v3
Yinghai found that kexec'ing a RHEL 5.1 kernel with 2.6.25-rc3+ kernels
prevents his NIC from working. He bisected to
| commit 89d694b9dbe769ca1004e01db0ca43964806a611
| Author: Thomas Gleixner <tglx at linutronix.de>
| Date: Mon Feb 18 18:25:17 2008 +0100
|
| genirq: do not leave interupts enabled on free_irq
|
| The default_disable() function was changed in commit:
|
| 76d2160147f43f982dfe881404cfde9fd0a9da21
| genirq: do not mask interrupts by default
|
For MSI, default_shutdown will call mask_bit for msi device. All mask bits
will left disabled after free_irq. Then in the kexec case, the next kernel
can only use msi_enable bit, so all device's MSI can not be used.
So lets to restore the mask bit to its pci reset defined value (enabled) when
we disable the kernels use of msi to be a little friendlier to kexec'd kernels.
Extend msi_set_mask_bit to msi_set_mask_bits to take mask, so we can fully
restore that to 0x00 instead of 0xfe.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>
commit 1f43c5393033de90bac4410352b1d2a69dcbe7ef
Merge: c135b6592bd63925397e60425e0301f33f06c7a6 e90955c26d8af318658c45caadb1d330ac6a506c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 09:03:19 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix PCI MSI breaks when booting with nosmp
x86: vget_cycles() __always_inline
x86: add more boot protocol documentation
bootprotocol: cleanup
x86: fix warning in "x86: clean up vSMP detection"
x86: !x & y typo in mtrr code
commit 2768f92c06a59c3ebf17a6b86002c3f33ab61a28
Author: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Date: Tue Apr 29 10:54:09 2008 +0300
doc: replace yet another dev with pdev for consistency in DMA-mapping.txt
Replace "dev" with "pdev" for consistency in DMA-mapping.txt.
Signed-off-by: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>
commit c135b6592bd63925397e60425e0301f33f06c7a6
Merge: 5f78e4d33945b291d12765cdd7e4304f437b9361 65c0d4e54ae4b81d8c8bb685169e48306656bb5c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 08:52:05 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
Fix bug - Implement bfin ata interrupt handler to avoid "irq 68 nobody cared" (v2)
sata_mv: Improve naming of main_irq cause/mask identifiers
libata-scsi: improve rbuf handling for simulated commands
libata-scsi: clean up inquiry / mode sense related functions
[MIPS] ATA: Rename routerboard 500 to 532
commit 5f78e4d33945b291d12765cdd7e4304f437b9361
Merge: 867a89e0b73af48838c7987e80899a1ff26dd6ff 5f0b2976cb2b62668a076f54419c24b8ab677167
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 08:26:51 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci:
x86: add pci=check_enable_amd_mmconf and dmi check
x86: work around io allocation overlap of HT links
acpi: get boot_cpu_id as early for k8_scan_nodes
x86_64: don't need set default res if only have one root bus
x86: double check the multi root bus with fam10h mmconf
x86: multi pci root bus with different io resource range, on 64-bit
x86: use bus conf in NB conf fun1 to get bus range on, on 64-bit
x86: get mp_bus_to_node early
x86 pci: remove checking type for mmconfig probe
x86: remove unneeded check in mmconf reject
driver core: try parent numa_node at first before using default
x86: seperate mmconf for fam10h out from setup_64.c
x86: if acpi=off, force setting the mmconf for fam10h
x86_64: check MSR to get MMCONFIG for AMD Family 10h
x86_64: check and enable MMCONFIG for AMD Family 10h
x86_64: set cfg_size for AMD Family 10h in case MMCONFIG
x86: mmconf enable mcfg early
x86: clear pci_mmcfg_virt when mmcfg get rejected
x86: validate against acpi motherboard resources
Fixed up fairly trivial conflicts in arch/x86/pci/{init.c,pci.h} due to
OLPC support manually.
commit 867a89e0b73af48838c7987e80899a1ff26dd6ff
Merge: 44473d991332053eb3fea1e08f8a6ee2c6fb409c 6c39103ce5192bdb2195f3daab7323dfa44fb52e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 08:19:14 2008 -0700
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[RAPIDIO] Change RapidIO doorbell source and target ID field to 16-bit
[RAPIDIO] Add RapidIO connection info print out and re-training for broken connections
[RAPIDIO] Add serial RapidIO controller support, which includes MPC8548, MPC8641
[RAPIDIO] Add RapidIO node probing into MPC86xx_HPCN board id table
[RAPIDIO] Add RapidIO node into MPC8641HPCN dts file
[RAPIDIO] Auto-probe the RapidIO system size
[RAPIDIO] Add OF-tree support to RapidIO controller driver
[RAPIDIO] Add RapidIO multi mport support
[RAPIDIO] Move include/asm-ppc/rio.h to asm-powerpc
[RAPIDIO] Add RapidIO option to kernel configuration
[RAPIDIO] Change RIO function mpc85xx_ to fsl_
[POWERPC] Provide walk_memory_resource() for powerpc
[POWERPC] Update lmb data structures for hotplug memory add/remove
[POWERPC] Hotplug memory remove notifications for powerpc
[POWERPC] windfarm: Add PowerMac 12,1 support
[POWERPC] Fix building of pmac32 when CONFIG_NVRAM=m
[POWERPC] Add IRQSTACKS support on ppc32
[POWERPC] Use __always_inline for xchg* and cmpxchg*
[POWERPC] Add fast little-endian switch system call
commit 44473d991332053eb3fea1e08f8a6ee2c6fb409c
Merge: bd5d435a96837c3495e62eef37cbe4cb728b79ae 6501faf8c1bbaa51dc493f3681df016d2ebce833
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 08:18:49 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] state info wrong after resume
[CPUFREQ] allow use of the powersave governor as the default one
[CPUFREQ] document the currently undocumented parts of the sysfs interface
[CPUFREQ] expose cpufreq coordination requirements regardless of coordination mechanism
commit bd5d435a96837c3495e62eef37cbe4cb728b79ae
Merge: fee4b19fb3f28d17c0b9f9ea0668db5275697178 ac9fafa1243640349aa481adf473db283a695766
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 29 08:18:03 2008 -0700
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: Skip I/O merges when disabled
block: add large command support
block: replace sizeof(rq->cmd) with BLK_MAX_CDB
ide: use blk_rq_init() to initialize the request
block: use blk_rq_init() to initialize the request
block: rename and export rq_init()
block: no need to initialize rq->cmd with blk_get_request
block: no need to initialize rq->cmd in prepare_flush_fn hook
block/blk-barrier.c:blk_ordered_cur_seq() mustn't be inline
block/elevator.c:elv_rq_merge_ok() mustn't be inline
block: make queue flags non-atomic
block: add dma alignment and padding support to blk_rq_map_kern
unexport blk_max_pfn
ps3disk: Remove superfluous cast
block: make rq_init() do a full memset()
relay: fix splice problem
commit fee4b19fb3f28d17c0b9f9ea0668db5275697178
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Tue Apr 29 12:01:02 2008 +0200
bitops: remove "optimizations"
The mapsize optimizations which were moved from x86 to the generic
code in commit 64970b68d2b3ed32b964b0b30b1b98518fde388e increased the
binary size on non x86 architectures.
Looking into the real effects of the "optimizations" it turned out
that they are not used in find_next_bit() and find_next_zero_bit().
The ones in find_first_bit() and find_first_zero_bit() are used in a
couple of places but none of them is a real hot path.
Remove the "optimizations" all together and call the library functions
unconditionally.
Boot-tested on x86 and compile tested on every cross compiler I have.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8972331292753c89dbdd10b175e999ce78dc3be7
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:12 2008 -0700
v850: use kbuild.h instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Miles Bader <miles at gnu.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fc1c3a003edb8a6778e64e10ef671a38c76c969e
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:12 2008 -0700
sh: use kbuild.h instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4ca4d7bf7a650817c441073cb8d1c2c8dfbb9959
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:10 2008 -0700
s390: use kbuild.h instead of defining macros in asm-offsets.c
New version that does not preserve the marker. Arch maintainers indicate
that the marker functionality is is not needed anymore.
Note you may simplify the s390 asm-offsets.c code further if you use the
OFFSET() macro instead of the DEFINE. See kbuild.h
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7a88d7a8f467e4ab1d3393ed5bce3d68cdf9be2e
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:09 2008 -0700
s390: use kbuild.h instead of defining macros in asm-offsets.c
s390 has a strange marker in DEFINE. Undefine the DEFINE from kbuild.h and
define it the way s390 wants it to preserve things as they were.
May be good if the arch maintainer could go over this and check if this
workaround is really necessary.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d4d298feeaebb43e0a74e5e2333f1b566c34a37c
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:08 2008 -0700
ppc/powerpc: use kbuild.h instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 943de37dbf313d33d1b4ee15a57fadeeeedc2556
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:08 2008 -0700
parisc: use kbuild.h instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Kyle McMartin <kyle at mcmartin.ca>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Matthew Wilcox <matthew at wil.cx>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 59957fc31fb78806fc95c99466caa9a0fff735aa
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:07 2008 -0700
mn10300: use kbuild.h instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d8045b4af69c905a2b44ffffb4a1c13ba85e0867
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:05 2008 -0700
m68k/m68kmmu: use kbuild.h instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Roman Zippel <zippel at linux-m68k.org>
Cc: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 501cd36f9de960f640f15ed37428631167108006
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:04 2008 -0700
h8300: use kbuild.h instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Yoshinori Sato <ysato at users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit de400bd278464fe811186b4b0d3a5cfac0d747fb
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:04 2008 -0700
frv: use kbuild.h instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5544b9ed81bf1677ad6c3e5b58c05837249805b7
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:03 2008 -0700
blackfin: use kbuild.h instead of defining macros in asm-macros.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Bryan Wu <bryan.wu at analog.com>
Cc: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 40765200b688939a012f5facc87d8ee07c40288b
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:02 2008 -0700
avr32: use kbuild.h macros instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 32b07679b479eee9195870b337b05046f5efedfb
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:01 2008 -0700
sparc: use kbuild.h instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Acked-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0fcfbb1d317593d3d713a850bfdb310cc1585ae2
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:04:00 2008 -0700
xtensa: use kbuild.h macros instead of defining them in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Chris Zankel <chris at zankel.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 02cbe4749a79f880b29ce42bbb5441b8d57222e4
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:03:59 2008 -0700
arm: use kbuild.h instead of macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ad2bc7b480230fb298919c54fea37b7879f2251d
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:03:58 2008 -0700
ia64: use kbuild.h macros instead of defining macros in asm-offsets.c
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 26946f4e9b3385f475df094371a016c9d217206a
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:03:58 2008 -0700
alpha: use kbuild.h instead of macros in asm-offsets.c
Use the macros in kbuild.h
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Jay Estabrook <jay.estabrook at hp.com>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Cc: Richard Henderson <rth at twiddle.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fd04d2067508d4a2b8cdb51d9ede1c0d96f13602
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:03:55 2008 -0700
mips: use kbuild.h instead of macros in asm-offsets.c
Use the macros provided in kbuild.h
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 66916cd2670e2033a468c492a0192a643ff0965e
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:03:54 2008 -0700
x86: use kbuild.h
Drop the macro definitions in asm-offsets_*.c and use kbuild.h
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Sam Ravnborg <sam at ravnborg.org>
Acked-by: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 37487a56523d402e25650da16c337acf4cecd13d
Author: Christoph Lameter <clameter at sgi.com>
Date: Tue Apr 29 01:03:49 2008 -0700
Add kbuild.h that contains common definitions for kbuild users
The same definitions are used for the bounds logic and the asm-offsets.h
generation by kbuild. Put them into include/linux/kbuild.h file.
Also add a new feature
COMMENT("text")
which can be used to insert lines of ocmments into asm-offsets.h and
bounds.h.
Cc: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Ralf Baechle <ralf at linux-mips.org>
Cc: Jay Estabrook <jay.estabrook at hp.com>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Cc: Richard Henderson <rth at twiddle.net>
Cc: "Luck, Tony" <tony.luck at intel.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Chris Zankel <chris at zankel.net>
Cc: David S. Miller <davem at davemloft.net>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
Cc: Bryan Wu <bryan.wu at analog.com>
Cc: Mike Frysinger <vapier.adi at gmail.com>
Cc: Yoshinori Sato <ysato at users.sourceforge.jp>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Roman Zippel <zippel at linux-m68k.org>
Cc: Greg Ungerer <gerg at uclinux.org>
Cc: David Howells <dhowells at redhat.com>
Cc: Kyle McMartin <kyle at mcmartin.ca>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Paul Mundt <lethal at linux-sh.org>
Cc: Miles Bader <miles at gnu.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 39fa00311f21318cc498b139c2cc2830dcad98ff
Author: Jeff Moyer <jmoyer at redhat.com>
Date: Tue Apr 29 01:03:48 2008 -0700
aio: fix misleading comments
The FIXME comments are inaccurate.
The locking comment over lookup_ioctx() is wrong.
Signed-off-by: Jeff Moyer <jmoyer at redhat.com>
Signed-off-by: Zach Brown <zach.brown at oracle.com>
Signed-off-by: Shen Feng <shen at cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 68ab3d883a2df13f4b93a923bae3a287cbee29d3
Author: Masami Hiramatsu <mhiramat at redhat.com>
Date: Tue Apr 29 01:03:46 2008 -0700
relayfs: support larger relay buffer
Use vmalloc() and memset() instead of kcalloc() to allocate a page* array when
the array size is bigger than one page. This enables relayfs to support
bigger relay buffers than 64MB on 4k-page system, 512MB on 16k-page system.
[akpm at linux-foundation.org: cleanup]
Signed-off-by: Masami Hiramatsu <mhiramat at redhat.com>
Cc: David Wilder <dwilder at us.ibm.com>
Reviewed-by: Tom Zanussi <zanussi at comcast.net>
Reviewed-by: Pekka Enberg <penberg at cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 97a4feb4a78ae5cd130be7d546471a0779f1aa14
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:45 2008 -0700
ncpfs: use get/put_unaligned_* helpers
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 58d485d481013b47f50b7cd2cf9eab7795a0fcbd
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:44 2008 -0700
isofs: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jan Kara <jack at suse.cz>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8b3789e5d552b8ba4841926066ef0ccd664e209c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:44 2008 -0700
hfsplus: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Roman Zippel <zippel at linux-m68k.org>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 803f445f17aa1b71235ad6febae734dd7ad23ddd
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:43 2008 -0700
fat: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d15c0a4dc44f9d47d3dad03d17175aa1e6428093
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:41 2008 -0700
video: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Petr Vandrovec <vandrove at vc.cvut.cz>
Cc: Antonino Daplas <adaplas at gmail.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a5abdeafedf722b0f3f357f4a23089a686b1b80d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:40 2008 -0700
usb: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Alan Stern <stern at rowland.harvard.edu>
Cc: David Brownell <dbrownell at users.sourceforge.net>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6b1e6f637469647f435f8f8ab00fbafa3c129712
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:39 2008 -0700
pcmcia: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Dominik Brodowski <linux at dominikbrodowski.net>
Cc: Daniel Ritz <daniel.ritz at gmx.ch>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 533dd1b0be103b0ff11da71152877e1ba530f1c2
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:36 2008 -0700
wireless: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: John W. Linville <linville at tuxdriver.com>
Cc: Michael Buesch <mb at bu3sch.de>
Cc: Daniel Drake <dsd at gentoo.org>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6caf52a453d5fe0bc584a2895bfd39a3d9054829
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:36 2008 -0700
net: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jeff Garzik <jeff at garzik.org>
Cc: Auke Kok <auke-jan.h.kok at intel.com>
Cc: John Ronciak <john.ronciak at intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg at intel.com>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 48b2cf9e2921581c3f72295397da07673cdde072
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:34 2008 -0700
mmc: use get/put_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: David Brownell <dbrownell at users.sourceforge.net>
Cc: Tony Jones <tonyj at suse.de>
Cc: Pierre Ossman <drzeus at drzeus.cx>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 858ad08cf4c32a51d26552d3cb5fa8d5e2f0e579
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:34 2008 -0700
input: use get_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Dmitry Torokhov <dtor at mail.ru>
Cc: Jiri Kosina <jkosina at suse.cz>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 973ea70c7c9be50d5ac34ff82a1c48fbe8fb2efb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:32 2008 -0700
char: use get_unaligned_* helpers
Remove unnecessary temp variable from_buf in snsc_event.c
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c105068f2b35343eecf2bf16ee29a362b6121fa3
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:31 2008 -0700
hid-core: use get_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Jiri Kosina <jkosina at suse.cz>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f885f8d127665e784a8071755243bd4e18f594d5
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:30 2008 -0700
drivers/block: use get_unaligned_* helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Ed L. Cashin <ecashin at coraid.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6510d41954dc6a9c8b1dbca7eaca0f23195ca727
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:30 2008 -0700
kernel: Move arches to use common unaligned access
Unaligned access is ok for the following arches:
cris, m68k, mn10300, powerpc, s390, x86
Arches that use the memmove implementation for native endian, and
the byteshifting for the opposite endianness.
h8300, m32r, xtensa
Packed struct for native endian, byteshifting for other endian:
alpha, blackfin, ia64, parisc, sparc, sparc64, mips, sh
m86knommu is generic_be for Coldfire, otherwise unaligned access is ok.
frv, arm chooses endianness based on compiler settings, uses the byteshifting
versions. Remove the unaligned trap handler from frv as it is now unused.
v850 is le, uses the byteshifting versions for both be and le.
Remove the now unused asm-generic implementation.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: David S. Miller <davem at davemloft.net>
Cc: <linux-arch at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 064106a91be5e76cb42c1ddf5d3871e3a1bd2a23
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 01:03:27 2008 -0700
kernel: add common infrastructure for unaligned access
Create a linux/unaligned directory similar in spirit to the linux/byteorder
folder to hold generic implementations collected from various arches.
Currently there are five implementations:
1) packed_struct.h: C-struct based, from asm-generic/unaligned.h
2) le_byteshift.h: Open coded byte-swapping, heavily based on asm-arm
3) be_byteshift.h: Open coded byte-swapping, heavily based on asm-arm
4) memmove.h: taken from multiple implementations in tree
5) access_ok.h: taken from x86 and others, unaligned access is ok.
All of the new implementations checks for sizes not equal to 1,2,4,8
and will fail to link.
API additions:
get_unaligned_{le16|le32|le64|be16|be32|be64}(p) which is meant to replace
code of the form:
le16_to_cpu(get_unaligned((__le16 *)p));
put_unaligned_{le16|le32|le64|be16|be32|be64}(val, pointer) which is meant to
replace code of the form:
put_unaligned(cpu_to_le16(val), (__le16 *)p);
The headers that arches should include from their asm/unaligned.h:
access_ok.h : Wrappers of the byteswapping functions in asm/byteorder
Choose a particular implementation for little-endian access:
le_byteshift.h
le_memmove.h (arch must be LE)
le_struct.h (arch must be LE)
Choose a particular implementation for big-endian access:
be_byteshift.h
be_memmove.h (arch must be BE)
be_struct.h (arch must be BE)
After including as needed from the above, include unaligned/generic.h and
define your arch's get/put_unaligned as (for LE):
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: <linux-arch at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dddfbaf8f86894415abb8256b55da68dab966ebe
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 01:03:26 2008 -0700
sysv fs: remove superfluous check for __GNUC__ compiler
Since <linux/sysv_fs.h> isn't exported to userspace, there is little
point checking that this is a GNU-compatible compiler.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Acked-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cedb27de0450fef73bc7dc28431d1108af54134c
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Apr 29 01:03:25 2008 -0700
tpm: change Kconfig dependencies from PNPACPI to PNP
There is no "PNPACPI" driver interface as such. PNPACPI is an internal
backend of PNP, and drivers just use the generic PNP interface.
The drivers should depend on CONFIG_PNP, not CONFIG_PNPACPI.
tpm_nsc.c doesn't use PNP at all, so we can just remove the dependency
completely. It probably *should* use PNP to discover the device, but until it
does, there's no point in depending on PNP.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Cc: Kylene Jo Hall <kjhall at us.ibm.com>
Cc: Marcel Selhorst <tpm at selhorst.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4821cd111d1dbe4bf230a3ecd7f8d3e803f1eec3
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 01:03:23 2008 -0700
tpm: fix section mismatch warning
Fix following warning:
WARNING: vmlinux.o(.init.text+0x32804): Section mismatch in reference from the function init_nsc() to the function .devexit.text:tpm_nsc_remove()
The function tpm_nsc_remove() are used outside __exit, so remove the __exit
annotation to make sure the function is always avilable.
Note: Trying to compare this module with other users of platform_device gve me
the impression that this driver needs some work to match other users.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Kylene Hall <kjhall at us.ibm.com>
Cc: Marcel Selhorst <tpm at selhorst.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f2b9a3962c69754e8eeb3d578bb33fdb1cf97cca
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Apr 29 01:03:22 2008 -0700
parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP
Wrap PNP probe code in #ifdef CONFIG_PNP. We already do the same for
CONFIG_PCI.
Without this change, we'll have unresolved references to pnp_get_resource()
function when CONFIG_PNP=n. (This is a new interface that's not in mainline
yet.)
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9396d496d74587d46a74b93a8b6b41659d2daf2e
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 01:03:22 2008 -0700
afs: support the CB.ProbeUuid RPC op
Add support for the CB.ProbeUuid cache manager RPC op. This allows a modern
OpenAFS server to quickly ask if the client has been rebooted.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7c80bcce34a355c0920f8cab250d766d7827341d
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 01:03:21 2008 -0700
afs: the AFS RPC op CBGetCapabilities is actually CBTellMeAboutYourself
The AFS RxRPC op CBGetCapabilities is actually CBTellMeAboutYourself.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0ae52d6fbaf7ffe4d00876d25ea000e94f85819c
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 01:03:20 2008 -0700
afs: use the shorter LIST_HEAD for brevity
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c3c52bce6993c6d37af2c2de9b482a7013d646a7
Author: Hitoshi Mitake <h.mitake at gmail.com>
Date: Tue Apr 29 01:03:18 2008 -0700
edac: fix module initialization on several modules 2nd time
I implemented opstate_init() as a inline function in linux/edac.h.
added calling opstate_init() to:
i82443bxgx_edac.c
i82860_edac.c
i82875p_edac.c
i82975x_edac.c
I wrote a fixed patch of
edac-fix-module-initialization-on-several-modules.patch,
and tested building 2.6.25-rc7 with applying this. It was succeed.
I think the patch is now correct.
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Hitoshi Mitake <h.mitake at gmail.com>
Signed-off-by: Doug Thompson <dougthompson at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1a45027d1afd7e85254b5ef8535e93ce3d588cf4
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 01:03:18 2008 -0700
edac: remove unneeded functions and add static accessor
Collection of patches, merged into one, from Adrian that do the following:
1) This patch makes the following needlessly global functions static:
- edac_pci_get_log_pe()
- edac_pci_get_log_npe()
- edac_pci_get_panic_on_pe()
- edac_pci_unregister_sysfs_instance_kobj()
- edac_pci_main_kobj_setup()
2) Remove unneeded function edac_device_find()
3) Added #if 0 around function edac_pci_find()
4) make the needlessly global edac_pci_generic_check() static
5) Removed function edac_check_mc_devices()
Doug Thompson modified Adrian's patches, to bettern represent
the direction of EDAC, and make them one patch.
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Doug Thompson <dougthompson at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ff6ac2a616c85d1215899ffda815e29b699cbd3a
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 01:03:17 2008 -0700
edac: use the shorter LIST_HEAD for brevity
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Acked-by: Doug Thompson <norsk5 at yahoo.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 94ee1cf5a88e12f5cbf8c0c78a6c18d3e043241e
Author: Peter Tyser <ptyser at xes-inc.com>
Date: Tue Apr 29 01:03:15 2008 -0700
edac: add e752x parameter for sysbus_parity selection
Add a module parameter "sysbus_parity" to allow forcing system bus parity
error checking on or off. Also add support to automatically disable system
bus parity errors for processors which do not support it.
If the sysbus_parity parameter is specified, sysbus parity detection will be
forced on or off. If it is not specified, the driver will attempt to look at
the CPU identifier string and determine if the CPU supports system bus parity.
A blacklist was used instead of a whitelist so that system bus parity would
be enabled by default and to minimize the chances of breaking things for those
people already using the driver which for some reason have a processor that
does not have a valid CPU identifier string.
[akpm at linux-foundation.org: coding-style fixes]
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Peter Tyser <ptyser at xes-inc.com>
Signed-off-by: Doug Thompson <dougthompson at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5135b797c8466eac39dc7fb4ae1fac6e7276377a
Author: Andrei Konovalov <akonovalov at ru.mvista.com>
Date: Tue Apr 29 01:03:13 2008 -0700
edac: new support for Intel 3100 chipset
Add Intel 3100 chipset support to e752x EDAC driver.
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrei Konovalov <akonovalov at ru.mvista.com>
Signed-off-by: Doug Thompson <dougthompson at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 199f0ca514f9c17668eec4f935c4ba24cd789f85
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Tue Apr 29 01:03:13 2008 -0700
idr: create idr_layer_cache at boot time
Avoid a possible kmem_cache_create() failure by creating idr_layer_cache
unconditionary at boot time rather than creating it on-demand when idr_init()
is called the first time.
This change also enables us to eliminate the check every time idr_init() is
called.
[akpm at linux-foundation.org: rename init_id_cache() to idr_init_cache()]
[akpm at linux-foundation.org: fix alpha build]
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 801678c5a3b4c79236970bcca27c733f5559e0d1
Author: Hirofumi Nakagawa <hnakagawa at miraclelinux.com>
Date: Tue Apr 29 01:03:09 2008 -0700
Remove duplicated unlikely() in IS_ERR()
Some drivers have duplicated unlikely() macros. IS_ERR() already has
unlikely() in itself.
This patch cleans up such pointless code.
Signed-off-by: Hirofumi Nakagawa <hnakagawa at miraclelinux.com>
Acked-by: David S. Miller <davem at davemloft.net>
Acked-by: Jeff Garzik <jeff at garzik.org>
Cc: Paul Clements <paul.clements at steeleye.com>
Cc: Richard Purdie <rpurdie at rpsys.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Cc: David Brownell <david-b at pacbell.net>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Michael Halcrow <mhalcrow at us.ibm.com>
Cc: Anton Altaparmakov <aia21 at cantab.net>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Cc: Carsten Otte <cotte at de.ibm.com>
Cc: Patrick McHardy <kaber at trash.net>
Cc: Paul Mundt <lethal at linux-sh.org>
Cc: Jaroslav Kysela <perex at perex.cz>
Cc: Takashi Iwai <tiwai at suse.de>
Acked-by: Mike Frysinger <vapier at gentoo.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9a6f70bbed4e8b72dd340812d7c606bfd5e00b47
Author: Jeff Dike <jdike at addtoit.com>
Date: Tue Apr 29 01:03:08 2008 -0700
random: add async notification support to /dev/random
Add async notification support to /dev/random.
A little test case is below. Without this patch, you get:
$ ./async-random
Drained the pool
Found more randomness
With it, you get:
$ ./async-random
Drained the pool
SIGIO
Found more randomness
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
#include <errno.h>
#include <fcntl.h>
static void handler(int sig)
{
printf("SIGIO\n");
}
int main(int argc, char **argv)
{
int fd, n, err, flags;
if(signal(SIGIO, handler) < 0){
perror("setting SIGIO handler");
exit(1);
}
fd = open("/dev/random", O_RDONLY);
if(fd < 0){
perror("open");
exit(1);
}
flags = fcntl(fd, F_GETFL);
if (flags < 0){
perror("getting flags");
exit(1);
}
flags |= O_NONBLOCK;
if (fcntl(fd, F_SETFL, flags) < 0){
perror("setting flags");
exit(1);
}
while((err = read(fd, &n, sizeof(n))) > 0) ;
if(err == 0){
printf("random returned 0\n");
exit(1);
}
else if(errno != EAGAIN){
perror("read");
exit(1);
}
flags |= O_ASYNC;
if (fcntl(fd, F_SETFL, flags) < 0){
perror("setting flags");
exit(1);
}
if (fcntl(fd, F_SETOWN, getpid()) < 0) {
perror("Setting SIGIO");
exit(1);
}
printf("Drained the pool\n");
read(fd, &n, sizeof(n));
printf("Found more randomness\n");
return(0);
}
Signed-off-by: Jeff Dike <jdike at linux.intel.com>
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit adc782dae6c4c0f6fb679a48a544cfbcd79ae3dc
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:03:07 2008 -0700
random: simplify and rename credit_entropy_store
- emphasize bits in the name
- make zero bits lock-free
- simplify logic
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e68e5b664ecb9bccf68102557107a6b6d739a97c
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:03:05 2008 -0700
random: make mixing interface byte-oriented
Switch add_entropy_words to a byte-oriented interface, eliminating numerous
casts and byte/word size rounding issues. This also reduces the overall
bit/byte/word confusion in this code.
We now mix a byte at a time into the word-based pool. This takes four times
as many iterations, but should be negligible compared to hashing overhead.
This also increases our pool churn, which adds some depth against some
theoretical failure modes.
The function name is changed to emphasize pool mixing and deemphasize entropy
(the samples mixed in may not contain any). extract is added to the core
function to make it clear that it extracts from the pool.
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 993ba2114c554c1561a018e5c63a771ec8e1c469
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:03:04 2008 -0700
random: simplify add_ptr logic
The add_ptr variable wasn't used in a sensible way, use only i instead.
i got reused later for a different purpose, use j instead.
While we're here, put tap0 first in the tap list and add a comment.
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6d38b827400d7c02bce391f90d044e4c57d5bc1e
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:03:03 2008 -0700
random: remove some prefetch logic
The urandom output pool (ie the fast path) fits in one cacheline, so
this is pretty unnecessary. Further, the output path has already
fetched the entire pool to hash it before calling in here.
(This was the only user of prefetch_range in the kernel, and it passed
in words rather than bytes!)
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit feee76972bcc54b2b1d1dc28bc6c16a8daa9aff8
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:03:02 2008 -0700
random: eliminate redundant new_rotate variable
- eliminate new_rotate
- move input_rotate masking
- simplify input_rotate update
- move input_rotate update to end of inner loop for readability
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 433582093a9dc5454ba03b4a7ea201d85e6aa4de
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:03:01 2008 -0700
random: remove cacheline alignment for locks
Earlier changes greatly reduce the number of times we grab the lock
per output byte, so we shouldn't need this particular hack any more.
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1c0ad3d492adf670e47bf0a3d65c6ba5cdee0114
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:03:00 2008 -0700
random: make backtracking attacks harder
At each extraction, we change (poolbits / 16) + 32 bits in the pool,
or 96 bits in the case of the secondary pools. Thus, a brute-force
backtracking attack on the pool state is less difficult than breaking
the hash. In certain cases, this difficulty may be is reduced to 2^64
iterations.
Instead, hash the entire pool in one go, then feedback the whole hash
(160 bits) in one go. This will make backtracking at least as hard as
inverting the hash.
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ffd8d3fa5813430fe3926fe950fde23630f6b1a0
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:02:59 2008 -0700
random: improve variable naming, clear extract buffer
- split the SHA variables apart into hash and workspace
- rename data to extract
- wipe extract and workspace after hashing
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 53c3f63e824764da23676e5c718755ff4aac9b63
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:02:58 2008 -0700
random: reuse rand_initialize
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 43ae4860ff4a358c29b9d364e45c2d09ad9fa067
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:02:58 2008 -0700
random: use unlocked_ioctl
No locking actually needed.
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 88c730da8c8b20fa732221725347bd9460842bac
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:02:56 2008 -0700
random: consolidate wakeup logic
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 90b75ee54666fe615ebcacfc8d8540b80afdedd5
Author: Matt Mackall <mpm at selenic.com>
Date: Tue Apr 29 01:02:55 2008 -0700
random: clean up checkpatch complaints
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Theodore Ts'o <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0302190411c2ba79819303503999cc839d600704
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 01:02:54 2008 -0700
remove aoedev_isbusy()
Remove the no longer used aoedev_isbusy().
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: "Ed L. Cashin" <ecashin at coraid.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 10521bd9f74be94b83cfcf639601ece1c8e4faad
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 01:02:54 2008 -0700
generalize asm-generic/ioctl.h to allow overriding values
In the spirit of a number of other asm-generic header files,
generalize asm-generic/ioctl.h to allow arch-specific ioctl.h headers
to simply override _IOC_SIZEBITS and/or _IOC_DIRBITS before including
this header file, allowing a number of ioctl.h header files to be
shortened considerably.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 098ef1c0ea7b1b3ff9d89364af5ebc5b672cf932
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 01:02:52 2008 -0700
nbd: delete superfluous test for __GNUC__
Since <linux/compiler.h> already tests for __GNUC__, there's no point in nbd.h
repeating that test.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Cc: Paul Clements <paul.clements at steeleye.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d71a6d7332e5881a65249f4fb97b0db3c61dd5ec
Author: Laurent Vivier <Laurent.Vivier at bull.net>
Date: Tue Apr 29 01:02:51 2008 -0700
NBD: add partition support
Permit the use of partitions with network block devices (NBD).
A new parameter is introduced to define how many partition we want to be able
to manage per network block device. This parameter is "max_part".
For instance, to manage 63 partitions / loop device, we will do:
[on the server side]
# nbd-server 1234 /dev/sdb
[on the client side]
# modprobe nbd max_part=63
# ls -l /dev/nbd*
brw-rw---- 1 root disk 43, 0 2008-03-25 11:14 /dev/nbd0
brw-rw---- 1 root disk 43, 64 2008-03-25 11:11 /dev/nbd1
brw-rw---- 1 root disk 43, 640 2008-03-25 11:11 /dev/nbd10
brw-rw---- 1 root disk 43, 704 2008-03-25 11:11 /dev/nbd11
brw-rw---- 1 root disk 43, 768 2008-03-25 11:11 /dev/nbd12
brw-rw---- 1 root disk 43, 832 2008-03-25 11:11 /dev/nbd13
brw-rw---- 1 root disk 43, 896 2008-03-25 11:11 /dev/nbd14
brw-rw---- 1 root disk 43, 960 2008-03-25 11:11 /dev/nbd15
brw-rw---- 1 root disk 43, 128 2008-03-25 11:11 /dev/nbd2
brw-rw---- 1 root disk 43, 192 2008-03-25 11:11 /dev/nbd3
brw-rw---- 1 root disk 43, 256 2008-03-25 11:11 /dev/nbd4
brw-rw---- 1 root disk 43, 320 2008-03-25 11:11 /dev/nbd5
brw-rw---- 1 root disk 43, 384 2008-03-25 11:11 /dev/nbd6
brw-rw---- 1 root disk 43, 448 2008-03-25 11:11 /dev/nbd7
brw-rw---- 1 root disk 43, 512 2008-03-25 11:11 /dev/nbd8
brw-rw---- 1 root disk 43, 576 2008-03-25 11:11 /dev/nbd9
# nbd-client localhost 1234 /dev/nbd0
Negotiation: ..size = 80418240KB
bs=1024, sz=80418240
-------NOTE, RFC: partition table is not automatically read.
The driver sets bdev->bd_invalidated to 1 to force the read of the partition
table of the device, but this is done only on an open of the device.
So we have to do a "touch /dev/nbdX" or something like that.
It can't be done from the nbd-client or nbd driver because at this
level we can't ask to read the partition table and to serve the request
at the same time (-> deadlock)
If someone has a better idea, I'm open to any suggestion.
-------NOTE, RFC
# fdisk -l /dev/nbd0
Disk /dev/nbd0: 82.3 GB, 82348277760 bytes
255 heads, 63 sectors/track, 10011 cylinders
Units = cylinders of 16065 * 512 = 8225280 bytes
Device Boot Start End Blocks Id System
/dev/nbd0p1 * 1 9965 80043831 83 Linux
/dev/nbd0p2 9966 10011 369495 5 Extended
/dev/nbd0p5 9966 10011 369463+ 82 Linux swap / Solaris
# ls -l /dev/nbd0*
brw-rw---- 1 root disk 43, 0 2008-03-25 11:16 /dev/nbd0
brw-rw---- 1 root disk 43, 1 2008-03-25 11:16 /dev/nbd0p1
brw-rw---- 1 root disk 43, 2 2008-03-25 11:16 /dev/nbd0p2
brw-rw---- 1 root disk 43, 5 2008-03-25 11:16 /dev/nbd0p5
# mount /dev/nbd0p1 /mnt
# ls /mnt
bin dev initrd lost+found opt sbin sys var
boot etc initrd.img media proc selinux tmp vmlinuz
cdrom home lib mnt root srv usr
# umount /mnt
# nbd-client -d /dev/nbd0
# ls -l /dev/nbd0*
brw-rw---- 1 root disk 43, 0 2008-03-25 11:16 /dev/nbd0
-------NOTE
On "nbd-client -d", we can do an iocl(BLKRRPART) to update partition table:
as the size of the device is 0, we don't have to serve the partition manager
request (-> no deadlock).
-------NOTE
Signed-off-by: Paul Clements <paul.clements at steeleye.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 48cf6061b30205b29b306bf9bc22dd6f0b091461
Author: Laurent Vivier <Laurent.Vivier at bull.net>
Date: Tue Apr 29 01:02:46 2008 -0700
NBD: allow nbd to be used locally
This patch allows Network Block Device to be mounted locally (nbd-client to
nbd-server over 127.0.0.1).
It creates a kthread to avoid the deadlock described in NBD tools
documentation. So, if nbd-client hangs waiting for pages, the kblockd thread
can continue its work and free pages.
I have tested the patch to verify that it avoids the hang that always occurs
when writing to a localhost nbd connection. I have also tested to verify that
no performance degradation results from the additional thread and queue.
Patch originally from Laurent Vivier.
Signed-off-by: Paul Clements <paul.clements at steeleye.com>
Signed-off-by: Laurent Vivier <Laurent.Vivier at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8c4dd6068221cd1d0d90490ace80eb4344914a8c
Author: Tim Gardner <tim.gardner at canonical.com>
Date: Tue Apr 29 01:02:45 2008 -0700
edd: add default mode CONFIG_EDD_OFF=n, override with edd={on,off}
Add a kernel parameter option to 'edd' to enable/disable BIOS Enhanced Disk
Drive Services. CONFIG_EDD_OFF disables EDD while still compiling EDD into
the kernel. Default behavior can be forced using 'edd=on' or 'edd=off' as
a kernel parameter.
[akpm at linux-foundation.org: fix kernel-parameters.txt]
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
Signed-off-by: Matt Domsch <Matt_Domsch at dell.com>
Cc: "H. Peter Anvin" <hpa at zytor.com>
Cc: "Randy.Dunlap" <rdunlap at xenotime.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d7321cd62470b70d2717dae5a963e7a8fabff4d5
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 01:02:44 2008 -0700
sysctl: add the ->permissions callback on the ctl_table_root
When reading from/writing to some table, a root, which this table came from,
may affect this table's permissions, depending on who is working with the
table.
The core hunk is at the bottom of this patch. All the rest is just pushing
the ctl_table_root argument up to the sysctl_perm() function.
This will be mostly (only?) used in the net sysctls.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: David S. Miller <davem at davemloft.net>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Denis V. Lunev <den at openvz.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2c4c7155f25192da3511a6c911db4d08102d36c4
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 01:02:41 2008 -0700
sysctl: clean from unneeded extern and forward declarations
The do_sysctl_strategy isn't used outside kernel/sysctl.c, so this can be
static and without a prototype in header.
Besides, move this one and parse_table() above their callers and drop the
forward declarations of the latter call.
One more "besides" - fix two checkpatch warnings: space before a ( and an
extra space at the end of a line.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: David S. Miller <davem at davemloft.net>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Denis V. Lunev <den at openvz.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7708bfb1c855f2a076ef71cc21647deea022ebe7
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 01:02:40 2008 -0700
sysctl: merge equal proc_sys_read and proc_sys_write
Many (most of) sysctls do not have a per-container sense. E.g.
kernel.print_fatal_signals, vm.panic_on_oom, net.core.netdev_budget and so on
and so forth. Besides, tuning then from inside a container is not even
secure. On the other hand, hiding them completely from the container's tasks
sometimes causes user-space to stop working.
When developing net sysctl, the common practice was to duplicate a table and
drop the write bits in table->mode, but this approach was not very elegant,
lead to excessive memory consumption and was not suitable in general.
Here's the alternative solution. To facilitate the per-container sysctls
ctl_table_root-s were introduced. Each root contains a list of
ctl_table_header-s that are visible to different namespaces. The idea of this
set is to add the permissions() callback on the ctl_table_root to allow ctl
root limit permissions to the same ctl_table-s.
The main user of this functionality is the net-namespaces code, but later this
will (should) be used by more and more namespaces, containers and control
groups.
Actually, this idea's core is in a single hunk in the third patch. First two
patches are cleanups for sysctl code, while the third one mostly extends the
arguments set of some sysctl functions.
This patch:
These ->read and ->write callbacks act in a very similar way, so merge these
paths to reduce the number of places to patch later and shrink the .text size
(a bit).
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: "David S. Miller" <davem at davemloft.net>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Denis V. Lunev <den at openvz.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1a46674b996bf9a15f0333178f5829ca2d7c32e2
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 01:02:38 2008 -0700
include/linux/sysctl.h: remove empty #else
Remove an empty #else.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 88f458e4b91348b2e892c72977b5f665d7f374da
Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
Date: Tue Apr 29 01:02:36 2008 -0700
sysctl: allow embedded targets to disable sysctl_check.c
Disable sysctl_check.c for embedded targets. This saves about about 11 kB
in .text and another 11 kB in .data on a PXA255 embedded platform.
Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c7705f3449c7edd5c1744871097f93977227afc4
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:35 2008 -0700
drivers: use non-racy method for proc entries creation (2)
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Peter Osterlund <petero2 at telia.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Cc: Dmitry Torokhov <dtor at mail.ru>
Cc: Neil Brown <neilb at suse.de>
Cc: Mauro Carvalho Chehab <mchehab at infradead.org>
Cc: Bjorn Helgaas <bjorn.helgaas at hp.com>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1b50221738108c438d5f25c7a043fb89e9e27044
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:34 2008 -0700
drivers: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Acked-by: Dmitry Torokhov <dtor at mail.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0fd689468231cb5eee9cc5d6331081b77c7a7a76
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:32 2008 -0700
parisc: use non-racy method for proc entries creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Kyle McMartin <kyle at parisc-linux.org>
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c33fff0afbef4f0467c99e3f47ee7e98ae78c77e
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:31 2008 -0700
kernel: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ac41cfd19bf77424519b962f8205ede51fceaac6
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:30 2008 -0700
isdn: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Add correct ->owner to proc_fops to fix reading/module unloading race.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: Karsten Keil <kkeil at suse.de>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a95609cb0283a23e519e607ff9fc2a4aa77e2532
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:29 2008 -0700
netdev: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Jeff Garzik <jgarzik at pobox.com>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cf7acfab032ff262f42954328cdfd20a5d9aaaac
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:27 2008 -0700
acpi: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Add correct ->owner to proc_fops to fix reading/module unloading race.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Len Brown <lenb at kernel.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 667471386d4068e75a6a55b615701ced61eb6333
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:26 2008 -0700
powerpc: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Add correct ->owner to proc_fops to fix reading/module unloading race.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6f1c86ec315711d21666751b0bdae69ce2c6d589
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:25 2008 -0700
parisc: use non-racy method for /proc/pcxl_dma creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Kyle McMartin <kyle at parisc-linux.org>
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e23637681bef5b69a68c8ac399732b941f1af023
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:25 2008 -0700
ia64: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Tony Luck <tony.luck at intel.com>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c293819a3caa77d96b801a7795f81a5913ec21d7
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:23 2008 -0700
cris: use non-racy method for /proc/system_profile creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Mikael Starvik <starvik at axis.com>
Cc: Jesper Nilsson <jesper.nilsson at axis.com>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0d9f10f4eb65797cf2d238836f7439045a37722e
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:22 2008 -0700
avr32: proc: use non-racy method for /proc/tlb creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 40ad35d34fa62097b4664c7c1690cbe404d73744
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:21 2008 -0700
arm: use non-racy method for /proc/davinci_clocks creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8b594007c381b01464358bc4b89bfb85ec7f076a
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:20 2008 -0700
s390: use non-racy method for proc entries creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cdefa185dda6b2b267f088a7477e96d845bdc6c1
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:19 2008 -0700
usb: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a973909fc32be90884280b7a8cd2f2e093c97890
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:17 2008 -0700
scsi: use non-racy method for proc entries creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Add correct ->owner to proc_fops to fix reading/module unloading race.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 16e70f64a9358133a14872eb72cf39b6f38b6212
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:16 2008 -0700
samples: use non-racy method for /proc/marker-example creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 659f865ea65a60564ce00a0c571099d1fa55e8e3
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:16 2008 -0700
zorro: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Add correct ->owner to proc_fops to fix reading/module unloading race.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7bf4e6d3e948e38893c718fa9c5bd0dfbfa49670
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:13 2008 -0700
sound: use non-racy method for /proc/driver/snd-page-alloc creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Jaroslav Kysela <perex at suse.cz>
Cc: Takashi Iwai <tiwai at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3d71f86f4dfccd749e4421f10301f3f3b31da88a
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:13 2008 -0700
mm: use non-racy method for /proc/swaps creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6a6375db13703b42dd51b28576d444bb73c541b9
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:12 2008 -0700
sysvipc: use non-racy method for proc entries creation
Use proc_create_data() to make sure that ->proc_fops and ->data be setup
before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Pierre Peiffer <peifferp at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 79da3664f61640057041bf172b1457e2d1969330
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:11 2008 -0700
jbd2: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: <linux-ext4 at vger.kernel.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 19b4fc52d63b77adf700a215bfbabd680a8f1718
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:09 2008 -0700
reiserfs: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
/proc entry owner is also added.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Jeff Mahoney <jeffm at suse.com>
Cc: Chris Mason <chris.mason at oracle.com>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 46fe74f2aed615c8c88164f4346b79c30cfd7c3d
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:08 2008 -0700
ext4: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: <linux-ext4 at vger.kernel.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 21ac295b42b8bdc3d677aba6bd7308a38de28a9b
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:07 2008 -0700
afs: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: David Howells <dhowells at redhat.com>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 34b37235c60fd23e4075da475c7bb22e6c7a466e
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:07 2008 -0700
nfs: use proc_create to setup de->proc_fops
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: "J. Bruce Fields" <bfields at fieldses.org>
Cc: Trond Myklebust <trond.myklebust at fys.uio.no>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9ef2db2630652d68dfd336088648adae7ef0bcd4
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:04 2008 -0700
nfsd: use proc_create to setup de->proc_fops
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
main tree.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Neil Brown <neilb at suse.de>
Cc: "J. Bruce Fields" <bfields at fieldses.org>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 59b7435149eab2dd06dd678742faff6049cb655f
Author: Denis V. Lunev <den at openvz.org>
Date: Tue Apr 29 01:02:00 2008 -0700
proc: introduce proc_create_data to setup de->data
This set of patches fixes an proc ->open'less usage due to ->proc_fops flip in
the most part of the kernel code. The original OOPS is described in the
commit 2d3a4e3666325a9709cc8ea2e88151394e8f20fc:
Typical PDE creation code looks like:
pde = create_proc_entry("foo", 0, NULL);
if (pde)
pde->proc_fops = &foo_proc_fops;
Notice that PDE is first created, only then ->proc_fops is set up to
final value. This is a problem because right after creation
a) PDE is fully visible in /proc , and
b) ->proc_fops are proc_file_operations which do not have ->open callback. So, it's
possible to ->read without ->open (see one class of oopses below).
The fix is new API called proc_create() which makes sure ->proc_fops are
set up before gluing PDE to main tree. Typical new code looks like:
pde = proc_create("foo", 0, NULL, &foo_proc_fops);
if (!pde)
return -ENOMEM;
Fix most networking users for a start.
In the long run, create_proc_entry() for regular files will go.
In addition to this, proc_create_data is introduced to fix reading from
proc without PDE->data. The race is basically the same as above.
create_proc_entries is replaced in the entire kernel code as new method
is also simply better.
This patch:
The problem is the same as for de->proc_fops. Right now PDE becomes visible
without data set. So, the entry could be looked up without data. This, in
most cases, will simply OOPS.
proc_create_data call is created to address this issue. proc_create now
becomes a wrapper around it.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: "J. Bruce Fields" <bfields at fieldses.org>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Bjorn Helgaas <bjorn.helgaas at hp.com>
Cc: Chris Mason <chris.mason at oracle.com>
Acked-by: David Howells <dhowells at redhat.com>
Cc: Dmitry Torokhov <dtor at mail.ru>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Jaroslav Kysela <perex at suse.cz>
Cc: Jeff Garzik <jgarzik at pobox.com>
Cc: Jeff Mahoney <jeffm at suse.com>
Cc: Jesper Nilsson <jesper.nilsson at axis.com>
Cc: Karsten Keil <kkeil at suse.de>
Cc: Kyle McMartin <kyle at parisc-linux.org>
Cc: Len Brown <lenb at kernel.org>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: Mauro Carvalho Chehab <mchehab at infradead.org>
Cc: Mikael Starvik <starvik at axis.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Neil Brown <neilb at suse.de>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Peter Osterlund <petero2 at telia.com>
Cc: Pierre Peiffer <peifferp at gmail.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Takashi Iwai <tiwai at suse.de>
Cc: Tony Luck <tony.luck at intel.com>
Cc: Trond Myklebust <trond.myklebust at fys.uio.no>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b640a89ddd742782bd2d83873da30d4776d1b9c6
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 01:01:58 2008 -0700
proc: convert /proc/tty/ldiscs to seq_file interface
Note: THIS_MODULE and header addition aren't technically needed because
this code is not modular, but let's keep it anyway because people
can copy this code into modular code.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8731f14d37825b54ad0c4c309cba2bc8fdf13a86
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:58 2008 -0700
proc: remove ->get_info infrastructure
Now that last dozen or so users of ->get_info were removed, ditch it too.
Everyone sane shouldd have switched to seq_file interface long ago.
P.S.: Co-existing 3 interfaces (->get_info/->read_proc/->proc_fops) for proc
is long-standing crap, BTW, thus
a) put ->read_proc/->write_proc/read_proc_entry() users on death row,
b) new such users should be rejected,
c) everyone is encouraged to convert his favourite ->read_proc user or
I'll do it, lazy bastards.
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 352ced8e594091d74b92da9bcf07aea81d37ac55
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:55 2008 -0700
proc: switch /proc/scsi/device_info to seq_file interface
Note 1: 0644 should be used, but root bypasses permissions, so writing
to /proc/scsi/device_info still works.
Note 2: looks like scsi_dev_info_list is unprotected
Note 3: probably make proc whine about "unwriteable but with ->write hook"
entries. Probably.
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: James Bottomley <James.Bottomley at SteelEye.com>
Cc: Mike Christie <michaelc at cs.wisc.edu>
Cc: Matthew Wilcox <matthew at wil.cx>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4a5cdb5b8f10998603e1e44adec1e56c234babfe
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:55 2008 -0700
proc: switch /proc/ip2mem to seq_file interface
/******************************************/
/* Remove useless comment, while I am it. */
/******************************************/
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Jeff Garzik <jeff at garzik.org>
Cc: Jeff Dike <jdike at addtoit.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 076ec04b8ac84a04df67840f15f36218d7519510
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:54 2008 -0700
proc: convert /proc/bus/nubus to seq_file interface
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3ae02d6bc1c1b3784fec9e9e016e7e3dcc2f8727
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:52 2008 -0700
proc: switch /proc/irda/irnet to seq_file interface
Probably interface misuse, because of the way iterating over hashbin is done.
However! Printing of socket number ("IrNET socket %d - ", i++") made conversion
to proper ->start/->next difficult enough to do blindly without hardware.
Said that, please apply.
Remove useless comment while I am it.
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Samuel Ortiz <samuel at sortiz.org>
Cc: "David S. Miller" <davem at davemloft.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4bd61f76a5353df272d5c7232bf0928f6e4a9531
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:50 2008 -0700
proc: switch /proc/excite/unit_id to seq_file interface
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Ralf Baechle <ralf at linux-mips.org>
Cc: Thomas Koeller <thomas.koeller at baslerweb.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9b0012126ae191c90c88df4b535b0f2ade70ecb6
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:49 2008 -0700
proc: switch /proc/bus/ecard/devices to seq_file interface
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Acked-by: Russell King <rmk+kernel at arm.linux.org.uk>
Cc: Yani Ioannou <yani.ioannou at gmail.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 51251549140f99cc5fbfed8ac542f22cbf067870
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:47 2008 -0700
proc: remove /proc/mac_iop
Entry creation was commented for a long time and right now it stands on
the way of ->get_info removal, so unless nobody objects...
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Simon Arlott <simon at fire.lp0.eu>
Cc: Roman Zippel <zippel at linux-m68k.org>
Cc: Joern Engel <joern at wohnheim.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 647634df400ed26e2707ef65a8bf0df3f3bb8663
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:46 2008 -0700
proc: switch /proc/apm to seq_file interface
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Rafael J. Wysocki <rjw at sisk.pl>
Cc: Ralf Baechle <ralf at linux-mips.org>
Cc: Len Brown <len.brown at intel.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8331438b38b07b97dbbb9049aa90a0d6ce5da03b
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:45 2008 -0700
proc: switch /proc/bus/zorro/devices to seq_file interface
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Josef Sipek <jsipek at fsl.cs.sunysb.edu>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c74c120a21d87b0b6925ada5830d8cac21e852d9
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 01:01:44 2008 -0700
proc: remove proc_root from drivers
Remove proc_root export. Creation and removal works well if parent PDE is
supplied as NULL -- it worked always that way.
So, one useless export removed and consistency added, some drivers created
PDEs with &proc_root as parent but removed them as NULL and so on.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 928b4d8c8963e75bdb133f562b03b07f9aa4844a
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 01:01:44 2008 -0700
proc: remove proc_root_driver
Use creation by full path: "driver/foo".
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 36a5aeb8787fbf92510ed20d806e229c55726f93
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 01:01:42 2008 -0700
proc: remove proc_root_fs
Use creation by full path instead: "fs/foo".
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9c37066d888bf6e1b96ad12304971b3ddeabbad0
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 01:01:41 2008 -0700
proc: remove proc_bus
Remove proc_bus export and variable itself. Using pathnames works fine
and is slightly more understandable and greppable.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5e971dce0b2f6896e02372512df0d1fb0bfe2d55
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 01:01:41 2008 -0700
proc: drop several "PDE valid/invalid" checks
proc-misc code is noticeably full of "if (de)" checks when PDE passed is
always valid. Remove them.
Addition of such check in proc_lookup_de() is for failed lookup case.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7cee4e00e0f8aa7290266382ea903a5a1b92c9a1
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 01:01:40 2008 -0700
proc: less special case in xlate code
If valid "parent" is passed to proc_create/remove_proc_entry(), then name of
PDE should consist of only one path component, otherwise creation or or
removal will fail. However, if NULL is passed as parent then create/remove
accept full path as a argument. This is arbitrary restriction -- all
infrastructure is in place.
So, patch allows the following to succeed:
create_proc_entry("foo/bar", 0, pde_baz);
remove_proc_entry("baz/foo/bar", &proc_root);
Also makes the following to behave identically:
create_proc_entry("foo/bar", 0, NULL);
create_proc_entry("foo/bar", 0, &proc_root);
Discrepancy noticed by Den Lunev (IIRC).
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f649d6d32605c7573884613289fb3b9fbd4f99a1
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 01:01:39 2008 -0700
proc: simplify locking in remove_proc_entry()
proc_subdir_lock protects only modifying and walking through PDE lists, so
after we've found PDE to remove and actually removed it from lists, there is
no need to hold proc_subdir_lock for the rest of operation.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 638fa202cdb207083a12d6f73e313605a8fc1037
Author: Roland McGrath <roland at redhat.com>
Date: Tue Apr 29 01:01:38 2008 -0700
procfs: mem permission cleanup
This cleans up the permission checks done for /proc/PID/mem i/o calls. It
puts all the logic in a new function, check_mem_permission().
The old code repeated the (!MAY_PTRACE(task) || !ptrace_may_attach(task))
magical expression multiple times. The new function does all that work in one
place, with clear comments.
The old code called security_ptrace() twice on successful checks, once in
MAY_PTRACE() and once in __ptrace_may_attach(). Now it's only called once,
and only if all other checks have succeeded.
Signed-off-by: Roland McGrath <roland at redhat.com>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0d5c9f5f59a61cf8e98e2925cb5d81cbe7694305
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:37 2008 -0700
proc: switch to proc_create()
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 925d1c401fa6cfd0df5d2e37da8981494ccdec07
Author: Matt Helsley <matthltc at us.ibm.com>
Date: Tue Apr 29 01:01:36 2008 -0700
procfs task exe symlink
The kernel implements readlink of /proc/pid/exe by getting the file from
the first executable VMA. Then the path to the file is reconstructed and
reported as the result.
Because of the VMA walk the code is slightly different on nommu systems.
This patch avoids separate /proc/pid/exe code on nommu systems. Instead of
walking the VMAs to find the first executable file-backed VMA we store a
reference to the exec'd file in the mm_struct.
That reference would prevent the filesystem holding the executable file
from being unmounted even after unmapping the VMAs. So we track the number
of VM_EXECUTABLE VMAs and drop the new reference when the last one is
unmapped. This avoids pinning the mounted filesystem.
[akpm at linux-foundation.org: improve comments]
[yamamoto at valinux.co.jp: fix dup_mmap]
Signed-off-by: Matt Helsley <matthltc at us.ibm.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Cc: David Howells <dhowells at redhat.com>
Cc:"Eric W. Biederman" <ebiederm at xmission.com>
Cc: Christoph Hellwig <hch at lst.de>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Cc: Hugh Dickins <hugh at veritas.com>
Signed-off-by: YAMAMOTO Takashi <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e93b4ea20adb20f1f1f07f10ba5d7dd739d2843e
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:35 2008 -0700
proc: print more information when removing non-empty directories
This usually saves one recompile to insert similar printk like below. :)
Sample nastygram:
remove_proc_entry: removing non-empty directory '/proc/foo', leaking at least 'bar'
------------[ cut here ]------------
WARNING: at fs/proc/generic.c:776 remove_proc_entry+0x18a/0x200()
Modules linked in: foo(-) container fan battery dock sbs ac sbshc backlight ipv6 loop af_packet amd_rng sr_mod i2c_amd8111 i2c_amd756 cdrom i2c_core button thermal processor
Pid: 3034, comm: rmmod Tainted: G M 2.6.25-rc1 #5
Call Trace:
[<ffffffff80231974>] warn_on_slowpath+0x64/0x90
[<ffffffff80232a6e>] printk+0x4e/0x60
[<ffffffff802d6c8a>] remove_proc_entry+0x18a/0x200
[<ffffffff8045cd88>] mutex_lock_nested+0x1c8/0x2d0
[<ffffffff8025f0f0>] __try_stop_module+0x0/0x40
[<ffffffff8025effd>] sys_delete_module+0x14d/0x200
[<ffffffff8045df3d>] lockdep_sys_exit_thunk+0x35/0x67
[<ffffffff8031c307>] __up_read+0x27/0xa0
[<ffffffff8045decc>] trace_hardirqs_on_thunk+0x35/0x3a
[<ffffffff8020b6ab>] system_call_after_swapgs+0x7b/0x80
---[ end trace 10ef850597e89c54 ]---
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7249db2c281ac688977ecc6862cdee9969d310e2
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 01:01:34 2008 -0700
keys: make key_serial() a function if CONFIG_KEYS=y
Make key_serial() an inline function rather than a macro if CONFIG_KEYS=y.
This prevents double evaluation of the key pointer and also provides better
type checking.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fdb89bce6c9ccb17dae13ec43a25d2fdd405233f
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 01:01:32 2008 -0700
keys: explicitly include required slab.h header file.
Since these two source files invoke kmalloc(), they should explicitly
include <linux/slab.h>.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Cc: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0b77f5bfb45c13e1e5142374f9d6ca75292252a4
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 01:01:32 2008 -0700
keys: make the keyring quotas controllable through /proc/sys
Make the keyring quotas controllable through /proc/sys files:
(*) /proc/sys/kernel/keys/root_maxkeys
/proc/sys/kernel/keys/root_maxbytes
Maximum number of keys that root may have and the maximum total number of
bytes of data that root may have stored in those keys.
(*) /proc/sys/kernel/keys/maxkeys
/proc/sys/kernel/keys/maxbytes
Maximum number of keys that each non-root user may have and the maximum
total number of bytes of data that each of those users may have stored in
their keys.
Also increase the quotas as a number of people have been complaining that it's
not big enough. I'm not sure that it's big enough now either, but on the
other hand, it can now be set in /etc/sysctl.conf.
Signed-off-by: David Howells <dhowells at redhat.com>
Cc: <kwc at citi.umich.edu>
Cc: <arunsr at cse.iitk.ac.in>
Cc: <dwalsh at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 69664cf16af4f31cd54d77948a4baf9c7e0ca7b9
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 01:01:31 2008 -0700
keys: don't generate user and user session keyrings unless they're accessed
Don't generate the per-UID user and user session keyrings unless they're
explicitly accessed. This solves a problem during a login process whereby
set*uid() is called before the SELinux PAM module, resulting in the per-UID
keyrings having the wrong security labels.
This also cures the problem of multiple per-UID keyrings sometimes appearing
due to PAM modules (including pam_keyinit) setuiding and causing user_structs
to come into and go out of existence whilst the session keyring pins the user
keyring. This is achieved by first searching for extant per-UID keyrings
before inventing new ones.
The serial bound argument is also dropped from find_keyring_by_name() as it's
not currently made use of (setting it to 0 disables the feature).
Signed-off-by: David Howells <dhowells at redhat.com>
Cc: <kwc at citi.umich.edu>
Cc: <arunsr at cse.iitk.ac.in>
Cc: <dwalsh at redhat.com>
Cc: Stephen Smalley <sds at tycho.nsa.gov>
Cc: James Morris <jmorris at namei.org>
Cc: Chris Wright <chrisw at sous-sol.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6b79ccb5144f9ffb4d4596c23e7570238dd12abc
Author: Arun Raghavan <arunsr at cse.iitk.ac.in>
Date: Tue Apr 29 01:01:28 2008 -0700
keys: allow clients to set key perms in key_create_or_update()
The key_create_or_update() function provided by the keyring code has a default
set of permissions that are always applied to the key when created. This
might not be desirable to all clients.
Here's a patch that adds a "perm" parameter to the function to address this,
which can be set to KEY_PERM_UNDEF to revert to the current behaviour.
Signed-off-by: Arun Raghavan <arunsr at cse.iitk.ac.in>
Signed-off-by: David Howells <dhowells at redhat.com>
Cc: Satyam Sharma <ssatyam at cse.iitk.ac.in>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit da91d2ef9fe4fd84cc0a8a729201d38e40ac9f2e
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Tue Apr 29 01:01:27 2008 -0700
keys: switch to proc_create()
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Cc: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 70a5bb72b55e82fbfbf1e22cae6975fac58a1e2d
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 01:01:26 2008 -0700
keys: add keyctl function to get a security label
Add a keyctl() function to get the security label of a key.
The following is added to Documentation/keys.txt:
(*) Get the LSM security context attached to a key.
long keyctl(KEYCTL_GET_SECURITY, key_serial_t key, char *buffer,
size_t buflen)
This function returns a string that represents the LSM security context
attached to a key in the buffer provided.
Unless there's an error, it always returns the amount of data it could
produce, even if that's too big for the buffer, but it won't copy more
than requested to userspace. If the buffer pointer is NULL then no copy
will take place.
A NUL character is included at the end of the string if the buffer is
sufficiently big. This is included in the returned count. If no LSM is
in force then an empty string will be returned.
A process must have view permission on the key for this function to be
successful.
[akpm at linux-foundation.org: declare keyctl_get_security()]
Signed-off-by: David Howells <dhowells at redhat.com>
Acked-by: Stephen Smalley <sds at tycho.nsa.gov>
Cc: Paul Moore <paul.moore at hp.com>
Cc: Chris Wright <chrisw at sous-sol.org>
Cc: James Morris <jmorris at namei.org>
Cc: Kevin Coffman <kwc at citi.umich.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4a38e122e2cc6294779021ff4ccc784a3997059e
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 01:01:24 2008 -0700
keys: allow the callout data to be passed as a blob rather than a string
Allow the callout data to be passed as a blob rather than a string for
internal kernel services that call any request_key_*() interface other than
request_key(). request_key() itself still takes a NUL-terminated string.
The functions that change are:
request_key_with_auxdata()
request_key_async()
request_key_async_with_auxdata()
Signed-off-by: David Howells <dhowells at redhat.com>
Cc: Paul Moore <paul.moore at hp.com>
Cc: Chris Wright <chrisw at sous-sol.org>
Cc: Stephen Smalley <sds at tycho.nsa.gov>
Cc: James Morris <jmorris at namei.org>
Cc: Kevin Coffman <kwc at citi.umich.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dceba9944181b1fd5993417b5c8fa0e3dda38f8d
Author: Kevin Coffman <kwc at citi.umich.edu>
Date: Tue Apr 29 01:01:22 2008 -0700
keys: check starting keyring as part of search
Check the starting keyring as part of the search to (a) see if that is what
we're searching for, and (b) to check it is still valid for searching.
The scenario: User in process A does things that cause things to be created in
its process session keyring. The user then does an su to another user and
starts a new process, B. The two processes now share the same process session
keyring.
Process B does an NFS access which results in an upcall to gssd. When gssd
attempts to instantiate the context key (to be linked into the process session
keyring), it is denied access even though it has an authorization key.
The order of calls is:
keyctl_instantiate_key()
lookup_user_key() (the default: case)
search_process_keyrings(current)
search_process_keyrings(rka->context) (recursive call)
keyring_search_aux()
keyring_search_aux() verifies the keys and keyrings underneath the top-level
keyring it is given, but that top-level keyring is neither fully validated nor
checked to see if it is the thing being searched for.
This patch changes keyring_search_aux() to:
1) do more validation on the top keyring it is given and
2) check whether that top-level keyring is the thing being searched for
Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
Signed-off-by: David Howells <dhowells at redhat.com>
Cc: Paul Moore <paul.moore at hp.com>
Cc: Chris Wright <chrisw at sous-sol.org>
Cc: Stephen Smalley <sds at tycho.nsa.gov>
Cc: James Morris <jmorris at namei.org>
Cc: Kevin Coffman <kwc at citi.umich.edu>
Cc: Trond Myklebust <trond.myklebust at fys.uio.no>
Cc: "J. Bruce Fields" <bfields at fieldses.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 38bbca6b6f164e08a4a9cdfd719fff679af98375
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 01:01:19 2008 -0700
keys: increase the payload size when instantiating a key
Increase the size of a payload that can be used to instantiate a key in
add_key() and keyctl_instantiate_key(). This permits huge CIFS SPNEGO blobs
to be passed around. The limit is raised to 1MB. If kmalloc() can't allocate
a buffer of sufficient size, vmalloc() will be tried instead.
Signed-off-by: David Howells <dhowells at redhat.com>
Cc: Paul Moore <paul.moore at hp.com>
Cc: Chris Wright <chrisw at sous-sol.org>
Cc: Stephen Smalley <sds at tycho.nsa.gov>
Cc: James Morris <jmorris at namei.org>
Cc: Kevin Coffman <kwc at citi.umich.edu>
Cc: Steven French <sfrench at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4220b7fe89f8c0623e09168ab81dd0da2fdadd72
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Tue Apr 29 01:01:18 2008 -0700
elf: fix shadowed variables in fs/binfmt_elf.c
Fix these sparse warings:
fs/binfmt_elf.c:1749:29: warning: symbol 'tmp' shadows an earlier one
fs/binfmt_elf.c:1734:28: originally declared here
fs/binfmt_elf.c:2009:26: warning: symbol 'vma' shadows an earlier one
fs/binfmt_elf.c:1892:24: originally declared here
[akpm at linux-foundation.org: chose better variable name]
Signed-off-by: WANG Cong <xiyou.wangcong at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6970c8eff85dd450e7eff69dad710dcf594b1bb8
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Tue Apr 29 01:01:18 2008 -0700
BINFMT: fill_elf_header cleanup - use straight memset first
This patch does simplify fill_elf_header function by setting
to zero the whole elf header first. So we fillup the fields
we really need only.
before:
text data bss dec hex filename
11735 80 0 11815 2e27 fs/binfmt_elf.o
after:
text data bss dec hex filename
11710 80 0 11790 2e0e fs/binfmt_elf.o
viola, 25 bytes of text is freed
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eb6900fbfa43cb50391b80b38608e25280705693
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Tue Apr 29 01:01:17 2008 -0700
ELF: Use EI_NIDENT instead of numeric value
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit adf535eeaca9e3963698df7bc5b4634d6d07f809
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 01:01:17 2008 -0700
ipmi: fix return from atca_oem_poweroff_hook
A void returning function returned the return value of another void
returning function...
Spotted by sparse.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 74006309c7f09c893c18cbb6f0e19137edd04239
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 01:01:14 2008 -0700
ipmi: make alloc_recv_msg static
Make the needlessly global ipmi_alloc_recv_msg() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 66ec2d778657b1a58ad26d0bc3b39b92bca69b53
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 01:01:14 2008 -0700
ipmi: make comment match actual preprocessor check
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fa68be0def375c78f723a7d49221f8f6c8194f29
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 01:01:13 2008 -0700
ipmi: remove ->write_proc code
IPMI code theoretically allows ->write_proc users, but nobody uses this thus
far.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Acked-by: Corey Minyard <minyard at acm.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 95c0ba892470a8f95b3dd3938a722ff64229aed1
Author: Denis Cheng <crquan at gmail.com>
Date: Tue Apr 29 01:01:13 2008 -0700
ipmi: remove unused target and action in Makefile
Kbuild system handles this automatically.
Signed-off-by: Denis Cheng <crquan at gmail.com>
Cc: Corey Minyard <minyard at acm.org>
Cc: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 36c7dc44409ecc4631de25a66f13d67873cfd563
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:12 2008 -0700
IPMI: Style fixes in the misc code
Lots of style fixes for the miscellaneous IPMI files. No functional
changes. Basically fixes everything reported by checkpatch and fixes the
comment style.
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c305e3d38e5f54a48a4618496cdc1ada970ebf68
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:10 2008 -0700
IPMI: Style fixes in the system interface code
Lots of style fixes for the IPMI system interface driver. No functional
changes. Basically fixes everything reported by checkpatch and fixes the
comment style.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Cc: Rocky Craig <rocky.craig at hp.com>
Cc: Hannes Schulz <schulz at schwaar.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c70d749986f6f1d4e2bb008bfc0c5fc22ec3fc64
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:09 2008 -0700
ipmi: style fixes in the base code
Lots of style fixes for the base IPMI driver. No functional changes.
Basically fixes everything reported by checkpatch and fixes the comment
style.
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ba8ff1c61eb119e687b06ca35f7f4ab041bf0422
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:08 2008 -0700
IPMI: Convert system interface defines to an enum
Convert the #defines for statistics into an enum in the IPMI system interface
and remove the unused timeout_restart statistic. And comment what these
statistics mean.
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Cc: Peter Zijlstra <peterz at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 64959e2d47dead81c6e3ce4864d629d6375e07e2
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:07 2008 -0700
ipmi: convert locked counters to atomics in the system interface
Atomics are faster and neater than locked counters.
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 73f2bdb975751eb11de0df1970710e6c40badc26
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:06 2008 -0700
IPMI: convert message handler defines to an enum
Convert the #defines for statistics into an enum in the IPMI message
handler.
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Cc: Peter Zijlstra <peterz at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b2655f2615e92e92ca3d55132b32776f1fe1a05c
Author: Konstantin Baydarov <kbaidarov at ru.mvista.com>
Date: Tue Apr 29 01:01:05 2008 -0700
ipmi: convert locked counters to atomics
Atomics are a lot more efficient and neat than using a lock.
Signed-off-by: Konstantin Baydarov <kbaidarov at ru.mvista.com>
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f7caa1b51fa526586c9d9a4582b5f8af440909d7
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:04 2008 -0700
ipmi: update driver version
Enough bug fixes and changes that we need a new driver version.
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 87ebd06f2f362acc3fd866f28a917b53c0ff560a
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:04 2008 -0700
ipmi: don't print event queue full on every event
Don't print out that the event queue is full on every event, only
print something out when it becomes full or becomes not full.
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5956dce1485efe3816febc24aa52490dcb2be837
Author: Konstantin Baydarov <kbaidarov at ru.mvista.com>
Date: Tue Apr 29 01:01:03 2008 -0700
ipmi: don't grab locks in run-to-completion mode
This patch prevents deadlocks in IPMI panic handler caused by msg_lock
in smi_info structure and waiting_msgs_lock in ipmi_smi structure.
[cminyard at mvista.com: remove unnecessary memory barriers]
Signed-off-by: Konstantin Baydarov <kbaidarov at ru.mvista.com>
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bda4c30aa6f7dc1483f39ea1dfe37bcab8a96207
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:02 2008 -0700
ipmi: run to completion fixes
The "run_to_completion" mode was somewhat broken. Locks need to be avoided in
run_to_completion mode, and it shouldn't be used by normal users, just
internally for panic situations.
This patch removes locks in run_to_completion mode and removes the user call
for setting the mode. The only user was the poweroff code, but it was easily
converted to use the polling interface.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4ea18425436e7c72716b7f8d314775f399821195
Author: Corey Minyard <cminyard at mvista.com>
Date: Tue Apr 29 01:01:01 2008 -0700
ipmi: hold ATTN until upper layer ready
Hold handling of ATTN until the upper layer has reported that it is
ready.
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Cc: Patrick Schoeller <Patrick.Schoeller at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 02fdb36ae7f55db7757b623acd27a62d5000d755
Author: Serge E. Hallyn <serue at us.ibm.com>
Date: Tue Apr 29 01:01:00 2008 -0700
ipc: sysvsem: refuse clone(CLONE_SYSVSEM|CLONE_NEWIPC)
CLONE_NEWIPC|CLONE_SYSVSEM interaction isn't handled properly. This can cause
a kernel memory corruption. CLONE_NEWIPC must detach from the existing undo
lists.
Fix, part 3: refuse clone(CLONE_SYSVSEM|CLONE_NEWIPC).
With unshare, specifying CLONE_SYSVSEM means unshare the sysvsem. So it seems
reasonable that CLONE_NEWIPC without CLONE_SYSVSEM would just imply
CLONE_SYSVSEM.
However with clone, specifying CLONE_SYSVSEM means *share* the sysvsem. So
calling clone(CLONE_SYSVSEM|CLONE_NEWIPC) is explicitly asking for something
we can't allow. So return -EINVAL in that case.
[akpm at linux-foundation.org: cleanups]
Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
Cc: Manfred Spraul <manfred at colorfullife.com>
Acked-by: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: Michael Kerrisk <mtk.manpages at googlemail.com>
Cc: Pierre Peiffer <peifferp at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6013f67fc1a4c7fa5bcab2d39c1eaa3e260c7ac1
Author: Manfred Spraul <manfred at colorfullife.com>
Date: Tue Apr 29 01:00:59 2008 -0700
ipc: sysvsem: force unshare(CLONE_SYSVSEM) when CLONE_NEWIPC
sys_unshare(CLONE_NEWIPC) doesn't handle the undo lists properly, this can
cause a kernel memory corruption. CLONE_NEWIPC must detach from the existing
undo lists.
Fix, part 2: perform an implicit CLONE_SYSVSEM in CLONE_NEWIPC. CLONE_NEWIPC
creates a new IPC namespace, the task cannot access the existing semaphore
arrays after the unshare syscall. Thus the task can/must detach from the
existing undo list entries, too.
This fixes the kernel corruption, because it makes it impossible that
undo records from two different namespaces are in sysvsem.undo_list.
Signed-off-by: Manfred Spraul <manfred at colorfullife.com>
Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
Acked-by: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: Michael Kerrisk <mtk.manpages at googlemail.com>
Cc: Pierre Peiffer <peifferp at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9edff4ab1f8d82675277a04e359d0ed8bf14a7b7
Author: Manfred Spraul <manfred at colorfullife.com>
Date: Tue Apr 29 01:00:57 2008 -0700
ipc: sysvsem: implement sys_unshare(CLONE_SYSVSEM)
sys_unshare(CLONE_NEWIPC) doesn't handle the undo lists properly, this can
cause a kernel memory corruption. CLONE_NEWIPC must detach from the existing
undo lists.
Fix, part 1: add support for sys_unshare(CLONE_SYSVSEM)
The original reason to not support it was the potential (inevitable?)
confusion due to the fact that sys_unshare(CLONE_SYSVSEM) has the
inverse meaning of clone(CLONE_SYSVSEM).
Our two most reasonable options then appear to be (1) fully support
CLONE_SYSVSEM, or (2) continue to refuse explicit CLONE_SYSVSEM,
but always do it anyway on unshare(CLONE_SYSVSEM). This patch does
(1).
Changelog:
Apr 16: SEH: switch to Manfred's alternative patch which
removes the unshare_semundo() function which
always refused CLONE_SYSVSEM.
Signed-off-by: Manfred Spraul <manfred at colorfullife.com>
Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
Acked-by: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: Michael Kerrisk <mtk.manpages at googlemail.com>
Cc: Pierre Peiffer <peifferp at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 44f564a4bf6ac70f2a84806203045cf515bc9367
Author: Zhang, Yanmin <yanmin_zhang at linux.intel.com>
Date: Tue Apr 29 01:00:55 2008 -0700
ipc: add definitions of USHORT_MAX and others
Add definitions of USHORT_MAX and others into kernel. ipc uses it and slub
implementation might also use it.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Zhang Yanmin <yanmin.zhang at intel.com>
Reviewed-by: Christoph Lameter <clameter at sgi.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: "Pierre Peiffer" <peifferp at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a5f75e7f256f75759ec3d6dbef0ba932f1b397d2
Author: Pierre Peiffer <pierre.peiffer at bull.net>
Date: Tue Apr 29 01:00:54 2008 -0700
IPC: consolidate all xxxctl_down() functions
semctl_down(), msgctl_down() and shmctl_down() are used to handle the same set
of commands for each kind of IPC. They all start to do the same job (they
retrieve the ipc and do some permission checks) before handling the commands
on their own.
This patch proposes to consolidate this by moving these same pieces of code
into one common function called ipcctl_pre_down().
It simplifies a little these xxxctl_down() functions and increases a little
the maintainability.
Signed-off-by: Pierre Peiffer <pierre.peiffer at bull.net>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8f4a3809c18ff3107bdbb1fabe3f4e5d2a928321
Author: Pierre Peiffer <pierre.peiffer at bull.net>
Date: Tue Apr 29 01:00:51 2008 -0700
IPC: introduce ipc_update_perm()
The IPC_SET command performs the same permission setting for all IPCs. This
patch introduces a common ipc_update_perm() function to update these
permissions and makes use of it for all IPCs.
Signed-off-by: Pierre Peiffer <pierre.peiffer at bull.net>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 016d7132f246a05e6e34ccba157fa278a96c45ae
Author: Pierre Peiffer <pierre.peiffer at bull.net>
Date: Tue Apr 29 01:00:50 2008 -0700
IPC: get rid of the use *_setbuf structure.
All IPCs make use of an intermetiate *_setbuf structure to handle the IPC_SET
command. This is not really needed and, moreover, it complicates a little bit
the code.
This patch gets rid of the use of it and uses directly the semid64_ds/
msgid64_ds/shmid64_ds structure.
In addition of removing one struture declaration, it also simplifies and
improves a little bit the common 64-bits path.
Signed-off-by: Pierre Peiffer <pierre.peiffer at bull.net>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 21a4826a7c49bddebbe8d83d232f6416f1697ff0
Author: Pierre Peiffer <pierre.peiffer at bull.net>
Date: Tue Apr 29 01:00:49 2008 -0700
IPC/semaphores: remove one unused parameter from semctl_down()
semctl_down() takes one unused parameter: semnum. This patch proposes to get
rid of it.
Signed-off-by: Pierre Peiffer <pierre.peiffer at bull.net>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 522bb2a2b420a0c1d0fcd037aa4e1bb9e2bca447
Author: Pierre Peiffer <pierre.peiffer at bull.net>
Date: Tue Apr 29 01:00:49 2008 -0700
IPC/semaphores: move the rwmutex handling inside semctl_down
semctl_down is called with the rwmutex (the one which protects the list of
ipcs) taken in write mode.
This patch moves this rwmutex taken in write-mode inside semctl_down.
This has the advantages of reducing a little bit the window during which this
rwmutex is taken, clarifying sys_semctl, and finally of having a coherent
behaviour with [shm|msg]ctl_down
Signed-off-by: Pierre Peiffer <pierre.peiffer at bull.net>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a0d092fc2df845a43cc4847836818f49331d0a5c
Author: Pierre Peiffer <pierre.peiffer at bull.net>
Date: Tue Apr 29 01:00:48 2008 -0700
IPC/message queues: introduce msgctl_down
Currently, sys_msgctl is not easy to read.
This patch tries to improve that by introducing the msgctl_down function to
handle all commands requiring the rwmutex to be taken in write mode (ie
IPC_SET and IPC_RMID for now). It is the equivalent function of semctl_down
for message queues.
This greatly changes the readability of sys_msgctl and also harmonizes the way
these commands are handled among all IPCs.
Signed-off-by: Pierre Peiffer <pierre.peiffer at bull.net>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8d4cc8b5c5e5bac526618ee704f3cfdcad954e0c
Author: Pierre Peiffer <pierre.peiffer at bull.net>
Date: Tue Apr 29 01:00:47 2008 -0700
IPC/shared memory: introduce shmctl_down
Currently, the way the different commands are handled in sys_shmctl introduces
some duplicated code.
This patch introduces the shmctl_down function to handle all the commands
requiring the rwmutex to be taken in write mode (ie IPC_SET and IPC_RMID for
now). It is the equivalent function of semctl_down for shared memory.
This removes some duplicated code for handling these both commands and
harmonizes the way they are handled among all IPCs.
Signed-off-by: Pierre Peiffer <pierre.peiffer at bull.net>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6ff3797218ef41c248c83184101ce1aedc227333
Author: Pierre Peiffer <pierre.peiffer at bull.net>
Date: Tue Apr 29 01:00:46 2008 -0700
IPC/semaphores: code factorisation
Trivial patch which adds some small locking functions and makes use of them to
factorize some part of the code and to make it cleaner.
Signed-off-by: Pierre Peiffer <pierre.peiffer at bull.net>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6546bc4279241e8fa432de1bb63a4f6f791fd669
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Tue Apr 29 01:00:45 2008 -0700
ipc: re-enable msgmni automatic recomputing msgmni if set to negative
The enhancement as asked for by Yasunori: if msgmni is set to a negative
value, register it back into the ipcns notifier chain.
A new interface has been added to the notification mechanism:
notifier_chain_cond_register() registers a notifier block only if not already
registered. With that new interface we avoid taking care of the states
changes in procfs.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Matt Helsley <matthltc at us.ibm.com>
Cc: Mingming Cao <cmm at us.ibm.com>
Cc: Pierre Peiffer <pierre.peiffer at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 91cfb2b4b57816de0c96de417b3238249f0b125f
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Tue Apr 29 01:00:44 2008 -0700
ipc: do not recompute msgmni anymore if explicitly set by user
Make msgmni not recomputed anymore upon ipc namespace creation / removal or
memory add/remove, as soon as it has been set from userland.
As soon as msgmni is explicitly set via procfs or sysctl(), the associated
callback routine is unregistered from the ipc namespace notifier chain.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Matt Helsley <matthltc at us.ibm.com>
Cc: Mingming Cao <cmm at us.ibm.com>
Cc: Pierre Peiffer <pierre.peiffer at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e2c284d8a87f95df9b47c6a13168a844ca7c03e9
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Tue Apr 29 01:00:44 2008 -0700
ipc: recompute msgmni on ipc namespace creation/removal
Introduce a notification mechanism that aims at recomputing msgmni each time
an ipc namespace is created or removed.
The ipc namespace notifier chain already defined for memory hotplug management
is used for that purpose too.
Each time a new ipc namespace is allocated or an existing ipc namespace is
removed, the ipcns notifier chain is notified. The callback routine for each
registered ipc namespace is then activated in order to recompute msgmni for
that namespace.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Matt Helsley <matthltc at us.ibm.com>
Cc: Mingming Cao <cmm at us.ibm.com>
Cc: Pierre Peiffer <pierre.peiffer at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 424450c1dbe72b6e2637e91108417d7d9580c4c3
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Tue Apr 29 01:00:43 2008 -0700
ipc: invoke the ipcns notifier chain as a work item
Make the memory hotplug chain's mutex held for a shorter time: when memory is
offlined or onlined a work item is added to the global workqueue. When the
work item is run, it notifies the ipcns notifier chain with the
IPCNS_MEMCHANGED event.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Matt Helsley <matthltc at us.ibm.com>
Cc: Mingming Cao <cmm at us.ibm.com>
Cc: Pierre Peiffer <pierre.peiffer at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b6b337ad1c1d6fe11b09b35d75464b84b3e11f07
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Tue Apr 29 01:00:42 2008 -0700
ipc: recompute msgmni on memory add / remove
Introduce the registration of a callback routine that recomputes msg_ctlmni
upon memory add / remove.
A single notifier block is registered in the hotplug memory chain for all the
ipc namespaces.
Since the ipc namespaces are not linked together, they have their own
notification chain: one notifier_block is defined per ipc namespace.
Each time an ipc namespace is created (removed) it registers (unregisters) its
notifier block in (from) the ipcns chain. The callback routine registered in
the memory chain invokes the ipcns notifier chain with the IPCNS_LOWMEM event.
Each callback routine registered in the ipcns namespace, in turn, recomputes
msgmni for the owning namespace.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Matt Helsley <matthltc at us.ibm.com>
Cc: Mingming Cao <cmm at us.ibm.com>
Cc: Pierre Peiffer <pierre.peiffer at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0c40ba4fd64f98e7a5cba8ffaedbd68642a85700
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Tue Apr 29 01:00:41 2008 -0700
ipc: define the slab_memory_callback priority as a constant
This is a trivial patch that defines the priority of slab_memory_callback in
the callback chain as a constant. This is to prepare for next patch in the
series.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Matt Helsley <matthltc at us.ibm.com>
Cc: Mingming Cao <cmm at us.ibm.com>
Cc: Pierre Peiffer <pierre.peiffer at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4d89dc6ab2711258bfd12c72d753f3ad56b244e2
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Tue Apr 29 01:00:40 2008 -0700
ipc: scale msgmni to the number of ipc namespaces
Since all the namespaces see the same amount of memory (the total one) this
patch introduces a new variable that counts the ipc namespaces and divides
msg_ctlmni by this counter.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Matt Helsley <matthltc at us.ibm.com>
Cc: Mingming Cao <cmm at us.ibm.com>
Cc: Pierre Peiffer <pierre.peiffer at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f7bf3df8be72d98afa84f5ff183e14c1ba1e560d
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Tue Apr 29 01:00:39 2008 -0700
ipc: scale msgmni to the amount of lowmem
On large systems we'd like to allow a larger number of message queues. In
some cases up to 32K. However simply setting MSGMNI to a larger value may
cause problems for smaller systems.
The first patch of this series introduces a default maximum number of message
queue ids that scales with the amount of lowmem.
Since msgmni is per namespace and there is no amount of memory dedicated to
each namespace so far, the second patch of this series scales msgmni to the
number of ipc namespaces too.
Since msgmni depends on the amount of memory, it becomes necessary to
recompute it upon memory add/remove. In the 4th patch, memory hotplug
management is added: a notifier block is registered into the memory hotplug
notifier chain for the ipc subsystem. Since the ipc namespaces are not linked
together, they have their own notification chain: one notifier_block is
defined per ipc namespace. Each time an ipc namespace is created (removed) it
registers (unregisters) its notifier block in (from) the ipcns chain. The
callback routine registered in the memory chain invokes the ipcns notifier
chain with the IPCNS_MEMCHANGE event. Each callback routine registered in the
ipcns namespace, in turn, recomputes msgmni for the owning namespace.
The 5th patch makes it possible to keep the memory hotplug notifier chain's
lock for a lesser amount of time: instead of directly notifying the ipcns
notifier chain upon memory add/remove, a work item is added to the global
workqueue. When activated, this work item is the one who notifies the ipcns
notifier chain.
Since msgmni depends on the number of ipc namespaces, it becomes necessary to
recompute it upon ipc namespace creation / removal. The 6th patch uses the
ipc namespace notifier chain for that purpose: that chain is notified each
time an ipc namespace is created or removed. This makes it possible to
recompute msgmni for all the namespaces each time one of them is created or
removed.
When msgmni is explicitely set from userspace, we should avoid recomputing it
upon memory add/remove or ipcns creation/removal. This is what the 7th patch
does: it simply unregisters the ipcns callback routine as soon as msgmni has
been changed from procfs or sysctl().
Even if msgmni is set by hand, it should be possible to make it back
automatically recomputed upon memory add/remove or ipcns creation/removal.
This what is achieved in patch 8: if set to a negative value, msgmni is added
back to the ipcns notifier chain, making it automatically recomputed again.
This patch:
Compute msg_ctlmni to make it scale with the amount of lowmem. msg_ctlmni is
now set to make the message queues occupy 1/32 of the available lowmem.
Some cleaning has also been done for the MSGPOOL constant: the msgctl man page
says it's not used, but it also defines it as a size in bytes (the code
expresses it in Kbytes).
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Matt Helsley <matthltc at us.ibm.com>
Cc: Mingming Cao <cmm at us.ibm.com>
Cc: Pierre Peiffer <pierre.peiffer at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 48dea404ed01869313f1908cca8a15774dcd8ee5
Author: Pierre Peiffer <pierre.peiffer at bull.net>
Date: Tue Apr 29 01:00:35 2008 -0700
IPC: use ipc_buildid() directly from ipc_addid()
By continuing to consolidate a little the IPC code, each id can be built
directly in ipc_addid() instead of having it built from each callers of
ipc_addid()
And I also remove shm_addid() in order to have, as much as possible, the
same code for shm/sem/msg.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Pierre Peiffer <pierre.peiffer at bull.net>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 02d15c43225afb2ebb6d700144285175a1c4abd9
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Tue Apr 29 01:00:35 2008 -0700
doc: fix DMA-API function parameters
Fix kernel bugzilla #10388.
DMA-API.txt has wrong argument type for some functions. It uses struct device
but should use struct pci_dev.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Acked-by: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cb9fbc5c37b69ac584e61d449cfd590f5ae1f90d
Author: Arthur Kepner <akepner at sgi.com>
Date: Tue Apr 29 01:00:34 2008 -0700
IB: expand ib_umem_get() prototype
Add a new parameter, dmasync, to the ib_umem_get() prototype. Use dmasync = 1
when mapping user-allocated CQs with ib_umem_get().
Signed-off-by: Arthur Kepner <akepner at sgi.com>
Cc: Tony Luck <tony.luck at intel.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Cc: Jes Sorensen <jes at sgi.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Roland Dreier <rdreier at cisco.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: David Miller <davem at davemloft.net>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 309df0c503c35fbb5a09537fcbb1f4967b9ca489
Author: Arthur Kepner <akepner at sgi.com>
Date: Tue Apr 29 01:00:32 2008 -0700
dma/ia64: update ia64 machvecs, swiotlb.c
Change all ia64 machvecs to use the new dma_*map*_attrs() interfaces.
Implement the old dma_*map_*() interfaces in terms of the corresponding new
interfaces. For ia64/sn, make use of one dma attribute,
DMA_ATTR_WRITE_BARRIER. Introduce swiotlb_*map*_attrs() functions.
Signed-off-by: Arthur Kepner <akepner at sgi.com>
Cc: Tony Luck <tony.luck at intel.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Cc: Jes Sorensen <jes at sgi.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Roland Dreier <rdreier at cisco.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: David Miller <davem at davemloft.net>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a75b0a2f68d3937f96ed39525e4750601483e3b4
Author: Arthur Kepner <akepner at sgi.com>
Date: Tue Apr 29 01:00:31 2008 -0700
dma: document dma_*map*_attrs() interfaces
Document the new dma_*map*_attrs() functions.
[markn at au1.ibm.com: fix up for dma-add-dma_map_attrs-interfaces and update docs]
Signed-off-by: Arthur Kepner <akepner at sgi.com>
Acked-by: David S. Miller <davem at davemloft.net>
Cc: Tony Luck <tony.luck at intel.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Cc: Jes Sorensen <jes at sgi.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Roland Dreier <rdreier at cisco.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Mark Nelson <markn at au1.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 74bc7ceebfa1c84ddd3a843ebfb56df013bf7ef5
Author: Arthur Kepner <akepner at sgi.com>
Date: Tue Apr 29 01:00:30 2008 -0700
dma: add dma_*map*_attrs() interfaces
Introduce new interfaces, dma_*map*_attrs(), for passing architecture-specific
attributes when memory is mapped and unmapped for DMA. Give the interfaces
default implementations which ignore attributes. Also introduce the
dma_{set|get}_attr() interfaces for setting and retrieving individual
attributes. Define one attribute, DMA_ATTR_WRITE_BARRIER, in anticipation of
its use by ia64/sn. Select whether architectures implement arch-specific
versions of the dma_*map*_attrs() interfaces via HAVE_DMA_ATTRS in Kconfig.
[markn at au1.ibm.com: dma_{set,get}_attr() have to be static inline]
Signed-off-by: Arthur Kepner <akepner at sgi.com>
Cc: Tony Luck <tony.luck at intel.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Cc: Jes Sorensen <jes at sgi.com>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Roland Dreier <rdreier at cisco.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: David Miller <davem at davemloft.net>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Mark Nelson <markn at au1.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d2ba7e2ae206e9ab24e8937d99d0d5513bfd08e5
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Tue Apr 29 01:00:29 2008 -0700
simplify cpu_hotplug_begin()/put_online_cpus()
cpu_hotplug_begin() must be always called under cpu_add_remove_lock, this
means that only one process can be cpu_hotplug.active_writer. So we don't
need the cpu_hotplug.writer_queue, we can wake up the ->active_writer
directly.
Also, fix the comment.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Dipankar Sarma <dipankar at in.ibm.com>
Acked-by: Gautham R Shenoy <ego at in.ibm.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Srivatsa Vaddagiri <vatsa at in.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1e35eaa2d86419470f3f3aed9acd85b8addff25c
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Tue Apr 29 01:00:28 2008 -0700
cleanup_workqueue_thread: remove the unneeded "cpu" parameter
cleanup_workqueue_thread() doesn't need the second argument, remove it.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 00dfcaf748f46de89efe41baa298b5cf9adda67e
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Tue Apr 29 01:00:27 2008 -0700
workqueues: shrink cpu_populated_map when CPU dies
When cpu_populated_map was introduced, it was supposed that cwq->thread can
survive after CPU_DEAD, that is why we never shrink cpu_populated_map.
This is not very nice, we can safely remove the already dead CPU from the map.
The only required change is that destroy_workqueue() must hold the hotplug
lock until it destroys all cwq->thread's, to protect the cpu_populated_map.
We could make the local copy of cpu mask and drop the lock, but
sizeof(cpumask_t) may be very large.
Also, fix the comment near queue_work(). Unless _cpu_down() happens we do
guarantee the cpu-affinity of the work_struct, and we have users which rely on
this.
[akpm at linux-foundation.org: repair comment]
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 786083667e0ced85ce17c4c0b6c57a9f47c5b9f2
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:26 2008 -0700
Cpuset hardwall flag: add a mem_hardwall flag to cpusets
This flag provides the hardwalling properties of mem_exclusive, without
enforcing the exclusivity. Either mem_hardwall or mem_exclusive is sufficient
to prevent GFP_KERNEL allocations from passing outside the cpuset's assigned
nodes.
Signed-off-by: Paul Menage <menage at google.com>
Acked-by: Paul Jackson <pj at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit addf2c739d9015d3e9c0500b58a3af051cd58ea7
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:26 2008 -0700
Cpuset hardwall flag: switch cpusets to use the bulk cgroup_add_files() API
Currently the cpusets mem_exclusive flag is overloaded to mean both
"no-overlapping" and "no GFP_KERNEL allocations outside this cpuset".
These patches add a new mem_hardwall flag with just the allocation restriction
part of the mem_exclusive semantics, without breaking backwards-compatibility
for those who continue to use just mem_exclusive. Additionally, the cgroup
control file registration for cpusets is cleaned up to reduce boilerplate.
This patch:
This change tidies up the cpusets control file definitions, and reduces the
amount of boilerplate required to add/change control files in the future.
Signed-off-by: Paul Menage <menage at google.com>
Reviewed-by: Li Zefan <lizf at cn.fujitsu.com>
Acked-by: Paul Jackson <pj at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9e0c914cabc6d75d2eafdff00671a2ad683a5e3c
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 01:00:25 2008 -0700
kernel/cpuset.c: make 3 functions static
Make the following needlessly global functions static:
- cpuset_test_cpumask()
- cpuset_change_cpumask()
- cpuset_do_move_task()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Paul Jackson <pj at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1faf8e40a8ab12ae1f7f474965e6fb031e43f8d6
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Apr 29 01:00:24 2008 -0700
memcg: remove redundant initialization in mem_cgroup_create()
*mem has been zeroed, that means mem->info has already been filled with 0.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Acked-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 33327948782bcef89c78eb47af86b6a2df9fd4a5
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Date: Tue Apr 29 01:00:24 2008 -0700
memcgroup: use vmalloc for mem_cgroup allocation
On ia64, this kmalloc() requires order-4 pages. But this is not necessary to
be physically contiguous. For big mem_cgroup, vmalloc is better. For small
ones, kmalloc is used.
[akpm at linux-foundation.org: simplification]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: Li Zefan <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4a56d02e34baedbea5eb1fd558f2b856b8c7db1e
Author: Balbir Singh <balbir at linux.vnet.ibm.com>
Date: Tue Apr 29 01:00:23 2008 -0700
memcgroup: make the memory controller more desktop responsive
This patch makes the memory controller more responsive on my desktop.
1. Set all cached pages as inactive. We were by default marking all pages
as active, thus forcing us to go through two passes for reclaiming pages
2. Remove congestion_wait(), since we already have that logic in
do_try_to_free_pages()
Signed-off-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: YAMAMOTO Takashi <yamamoto at valinux.co.jp>
Cc: Paul Menage <menage at google.com>
Cc: Pavel Emelianov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3eae90c3cdd4e762d0f4f5e939c98780fccded57
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Date: Tue Apr 29 01:00:22 2008 -0700
memcg: remove redundant function calls
remove_list/add_list uses page_cgroup_zoneinfo() in it.
So, it's called twice before and after lock.
mz = page_cgroup_zoneinfo();
lock();
mz = page_cgroup_zoneinfo();
....
unlock();
And address of mz never changes.
This is not good. This patch fixes this behavior.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 29f2a4dac856e9433a502b05b40e8e90385d8e27
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 01:00:21 2008 -0700
memcgroup: implement failcounter reset
This is a very common requirement from people using the resource accounting
facilities (not only memcgroup but also OpenVZ beancounters). They want to
put the cgroup in an initial state without re-creating it.
For example after re-configuring a group people want to observe how this new
configuration fits the group needs without saving the previous failcnt value.
Merge two resets into one mem_cgroup_reset() function to demonstrate how
multiplexing work.
Besides, I have plans to move the files, that correspond to res_counter to the
res_counter.c file and somehow "import" them into controller. I don't know
how to make it gracefully yet, but merging resets of max_usage and failcnt in
one function will be there for sure.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Menage <menage at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 85cc59db12724e1248f5e4841e61339cf485d5c7
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 01:00:20 2008 -0700
memcgroup: use triggers in force_empty and max_usage files
These two files are essentially event callbacks. They do not care about the
contents of the string, but only about the fact of the write itself.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Menage <menage at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b6ac57d50a375aa2f267e1b2b56c46564a936d00
Author: Balbir Singh <balbir at linux.vnet.ibm.com>
Date: Tue Apr 29 01:00:19 2008 -0700
memcgroup: move memory controller allocations to their own slabs
Move the memory controller data structure page_cgroup to its own slab cache.
It saves space on the system, allocations are not necessarily pushed to order
of 2 and should provide performance benefits. Users who disable the memory
controller can also double check that the memory controller is not allocating
page_cgroup's.
NOTE: Hugh Dickins brought up the issue of whether we want to mark page_cgroup
as __GFP_MOVABLE or __GFP_RECLAIMABLE. I don't think there is an easy answer
at the moment. page_cgroup's are associated with user pages, they can be
reclaimed once the user page has been reclaimed, so it might make sense to
mark them as __GFP_RECLAIMABLE. For now, I am leaving the marking to default
values that the slab allocator uses.
Signed-off-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Cc: Pavel Emelianov <xemul at openvz.org>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Sudhir Kumar <skumar at linux.vnet.ibm.com>
Cc: YAMAMOTO Takashi <yamamoto at valinux.co.jp>
Cc: Paul Menage <menage at google.com>
Cc: David Rientjes <rientjes at google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit faebe9fdf35058bb8421e4c09f6f70994eaf8db2
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 01:00:18 2008 -0700
memcgroups: add a document describing the resource counter abstraction
The resource counter is supposed to facilitate the resource accounting of
arbitrary resource (and it already does this for memory controller).
However, it is about to be used in other resources controllers (swap, kernel
memory, networking, etc), so provide a doc describing how to work with it.
This will eliminate all the possible future duplications in the appropriate
controllers' docs.
Fixed errors pointed out by Randy.
[akpm at linux-foundation.org: fix documentation tpyo]
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Balbir Singh <balbir at linux.vnet.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Li Zefan <lizf at cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c84872e168d10926acd2dee975d19172eef79252
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 01:00:17 2008 -0700
memcgroup: add the max_usage member on the res_counter
This field is the maximal value of the usage one since the counter creation
(or since the latest reset).
To reset this to the usage value simply write anything to the appropriate
cgroup file.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cf475ad28ac35cc9ba612d67158f29b73b38b05d
Author: Balbir Singh <balbir at linux.vnet.ibm.com>
Date: Tue Apr 29 01:00:16 2008 -0700
cgroups: add an owner to the mm_struct
Remove the mem_cgroup member from mm_struct and instead adds an owner.
This approach was suggested by Paul Menage. The advantage of this approach
is that, once the mm->owner is known, using the subsystem id, the cgroup
can be determined. It also allows several control groups that are
virtually grouped by mm_struct, to exist independent of the memory
controller i.e., without adding mem_cgroup's for each controller, to
mm_struct.
A new config option CONFIG_MM_OWNER is added and the memory resource
controller selects this config option.
This patch also adds cgroup callbacks to notify subsystems when mm->owner
changes. The mm_cgroup_changed callback is called with the task_lock() of
the new task held and is called just prior to changing the mm->owner.
I am indebted to Paul Menage for the several reviews of this patchset and
helping me make it lighter and simpler.
This patch was tested on a powerpc box, it was compiled with both the
MM_OWNER config turned on and off.
After the thread group leader exits, it's moved to init_css_state by
cgroup_exit(), thus all future charges from runnings threads would be
redirected to the init_css_set's subsystem.
Signed-off-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Cc: Pavel Emelianov <xemul at openvz.org>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Sudhir Kumar <skumar at linux.vnet.ibm.com>
Cc: YAMAMOTO Takashi <yamamoto at valinux.co.jp>
Cc: Hirokazu Takahashi <taka at valinux.co.jp>
Cc: David Rientjes <rientjes at google.com>,
Cc: Balbir Singh <balbir at linux.vnet.ibm.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Acked-by: Pekka Enberg <penberg at cs.helsinki.fi>
Reviewed-by: Paul Menage <menage at google.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 29486df325e1fe6e1764afcb19e3370804c2b002
Author: Serge E. Hallyn <serue at us.ibm.com>
Date: Tue Apr 29 01:00:14 2008 -0700
cgroups: introduce cft->read_seq()
Introduce a read_seq() helper in cftype, which uses seq_file to print out
lists. Use it in the devices cgroup. Also split devices.allow into two
files, so now devices.deny and devices.allow are the ones to use to manipulate
the whitelist, while devices.list outputs the cgroup's current whitelist.
Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
Acked-by: Paul Menage <menage at google.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 28fd5dfc12bde391981dfdcf20755952b6e916af
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Apr 29 01:00:13 2008 -0700
cgroups: remove the css_set linked-list
Now we can run through the hash table instead of running through the
linked-list.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Reviewed-by: Paul Menage <menage at google.com>
Cc: Balbir Singh <balbir at linux.vnet.ibm.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e8d55fdeb882cfcb5e8db5a5ce16edfba78aafc5
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Apr 29 01:00:13 2008 -0700
cgroups: simplify init_subsys()
We are at system boot and there is only 1 cgroup group (i,e, init_css_set), so
we don't need to run through the css_set linked list. Neither do we need to
run through the task list, since no processes have been created yet.
Also referring to a comment in cgroup.h:
struct css_set
{
...
/*
* Set of subsystem states, one for each subsystem. This array
* is immutable after creation apart from the init_css_set
* during subsystem registration (at boot time).
*/
struct cgroup_subsys_state *subsys[CGROUP_SUBSYS_COUNT];
}
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Reviewed-by: Paul Menage <menage at google.com>
Cc: Balbir Singh <balbir at linux.vnet.ibm.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 472b1053f3c319cc60bfb2a0bb062fed77a93eb6
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Apr 29 01:00:11 2008 -0700
cgroups: use a hash table for css_set finding
When we attach a process to a different cgroup, the css_set linked-list will
be run through to find a suitable existing css_set to use. This patch
implements a hash table for better performance.
The following benchmarks have been tested:
For N in 1, 5, 10, 50, 100, 500, 1000, create N cgroups with one sleeping
task in each, and then move an additional task through each cgroup in
turn.
Here is a test result:
N Loop orig - Time(s) hash - Time(s)
----------------------------------------------
1 10000 1.201231728 1.196311177
5 2000 1.065743872 1.040566424
10 1000 0.991054735 0.986876440
50 200 0.976554203 0.969608733
100 100 0.998504680 0.969218270
500 20 1.157347764 0.962602963
1000 10 1.619521852 1.085140172
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Reviewed-by: Paul Menage <menage at google.com>
Cc: Balbir Singh <balbir at linux.vnet.ibm.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 08ce5f16ee466ffc5bf243800deeecd77d9eaf50
Author: Serge E. Hallyn <serue at us.ibm.com>
Date: Tue Apr 29 01:00:10 2008 -0700
cgroups: implement device whitelist
Implement a cgroup to track and enforce open and mknod restrictions on device
files. A device cgroup associates a device access whitelist with each cgroup.
A whitelist entry has 4 fields. 'type' is a (all), c (char), or b (block).
'all' means it applies to all types and all major and minor numbers. Major
and minor are either an integer or * for all. Access is a composition of r
(read), w (write), and m (mknod).
The root device cgroup starts with rwm to 'all'. A child devcg gets a copy of
the parent. Admins can then remove devices from the whitelist or add new
entries. A child cgroup can never receive a device access which is denied its
parent. However when a device access is removed from a parent it will not
also be removed from the child(ren).
An entry is added using devices.allow, and removed using
devices.deny. For instance
echo 'c 1:3 mr' > /cgroups/1/devices.allow
allows cgroup 1 to read and mknod the device usually known as
/dev/null. Doing
echo a > /cgroups/1/devices.deny
will remove the default 'a *:* mrw' entry.
CAP_SYS_ADMIN is needed to change permissions or move another task to a new
cgroup. A cgroup may not be granted more permissions than the cgroup's parent
has. Any task can move itself between cgroups. This won't be sufficient, but
we can decide the best way to adequately restrict movement later.
[akpm at linux-foundation.org: coding-style fixes]
[akpm at linux-foundation.org: fix may-be-used-uninitialized warning]
Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
Acked-by: James Morris <jmorris at namei.org>
Looks-good-to: Pavel Emelyanov <xemul at openvz.org>
Cc: Daniel Hokka Zakrisson <daniel at hozac.com>
Cc: Li Zefan <lizf at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d447ea2f30ec60370ddb99a668e5ac12995f043d
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 01:00:08 2008 -0700
cgroups: add the trigger callback to struct cftype
Trigger callback can be used to receive a kick-up from the user space. The
string written is ignored.
The cftype->private is used for multiplexing events.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: Paul Menage <menage at google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 46ae220bea40bd1cf4abec2d5cdfb4f9396c7115
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Apr 29 01:00:08 2008 -0700
cgroup: switch to proc_create()
There is a race between create_proc_entry() and the assignment of file ops.
proc_create() is invented to fix it.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Acked-by: Paul Menage <menage at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 06a119204d3e1e67d393e996ed987b0df7998381
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Apr 29 01:00:07 2008 -0700
cgroup: annotate cgroup_init_subsys with __init
It is called by cgroup_init() and cgroup_init_early() only, which are
annotated with __init.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 06ecb27cfbf53ac2c7e397aa1619a6f9a98c5896
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:06 2008 -0700
CGroups _s64 files: use read_s64/write_s64 in CFS cgroup for rt_runtime file
This removes some filesystem boilerplate from the CFS cgroup subsystem.
Signed-off-by: Paul Menage <menage at google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e73d2c61d1fcbd3621688ae457b49509c8d4c601
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:06 2008 -0700
CGroups _s64 files: add cgroups read_s64/write_s64 file methods
These patches add cgroups read_s64 and write_s64 control file methods (the
signed equivalent of read_u64/write_u64) and use them to implement the
cpu.rt_runtime_us control file in the CFS cgroup subsystem.
This patch:
These are the signed equivalents of the read_u64/write_u64 methods
Signed-off-by: Paul Menage <menage at google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 418d7d875ce7f33ef0d48d7cc3a95f31302dcf56
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:05 2008 -0700
CGroup API files: make CGROUP_DEBUG default to off
The cgroup debug subsystem isn't generally useful for users. It should
default to "n".
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3116f0e3df0a67ad56f15dd4c5f6cefb04bb4a98
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:04 2008 -0700
CGroup API files: move "releasable" to cgroup_debug subsystem
The "releasable" control file provided by the cgroup framework exports the
state of a per-cgroup flag that's related to the notify-on-release feature.
This isn't really generally useful, unless you're trying to debug this
particular feature of cgroups.
This patch moves the "releasable" file to the cgroup_debug subsystem.
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c27e8818a09bbdfe7c07c629cb2c27e1a742e156
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:03 2008 -0700
CGroup API files: drop mem_cgroup_force_empty()
This function isn't needed - a NULL pointer in the cftype read function will
result in the same EINVAL response to userspace.
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c64745cf0f34f2cb08fc28c93d844e583d0d591d
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:02 2008 -0700
CGroup API files: use cgroup map for memcontrol stats file
Remove the seq_file boilerplate used to construct the memcontrol stats map,
and instead use the new map representation for cgroup control files
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9179656961adcea3c25403365597e486d851ac5e
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:01 2008 -0700
CGroup API files: add cgroup map data type
Adds a new type of supported control file representation, a map from strings
to u64 values.
Each map entry is printed as a line in a similar format to /proc/vmstat, i.e.
"$key $value\n"
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 700fe1ab99240c1a9c4d155e2a0612a1b044bb69
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 01:00:00 2008 -0700
CGroup API files: update cpusets to use cgroup structured file API
Many of the cpusets control files are simple integer values, which don't
require the overhead of memory allocations for reads and writes.
Move the handlers for these control files into cpuset_read_u64() and
cpuset_write_u64().
[akpm at linux-foundation.org: ad dmissing `break']
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b7269dfc826fbf554c9e6a9eaa4e6ff95fa08656
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 00:59:59 2008 -0700
CGroup API files: strip all trailing whitespace in cgroup_write_u64
This removes the need for people to remember to pass the -n flag to echo when
writing values to cgroup control files.
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2c3daa722b624eaf0c5ea60e4f180bd0684542e2
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 00:59:58 2008 -0700
CGroup API files: use read_u64 in memory controller
Update the memory controller to use read_u64 for its limit/usage/failcnt
control files, calling the new res_counter_read_u64() function.
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2c7eabf37647dd459d555e76954b4de87be2321f
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 00:59:58 2008 -0700
CGroup API files: add res_counter_read_u64()
Adds a function for returning the value of a resource counter member, in a
form suitable for use in a cgroup read_u64 control file method.
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f4c753b7eacc277e506066abdda351cbc1cf8e6a
Author: Paul Menage <menage at google.com>
Date: Tue Apr 29 00:59:56 2008 -0700
CGroup API files: rename read/write_uint methods to read_write_u64
Several people have justifiably complained that the "_uint" suffix is
inappropriate for functions that handle u64 values, so this patch just renames
all these functions and their users to have the suffic _u64.
[peterz at infradead.org: build fix]
Signed-off-by: Paul Menage <menage at google.com>
Cc: "Li Zefan" <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: "YAMAMOTO Takashi" <yamamoto at valinux.co.jp>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3ff31d0cca38b3c20e88a022bf38c4f7c98492f0
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:59:55 2008 -0700
cgroups: kernel/ns_cgroup.c should #include <linux/nsproxy.h>
Every file should include the headers containing the externs its global
functions (in this case for ns_cgroup_clone()).
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4fe91d518e4958af7edebbeb112a3272b2be232d
Author: Paul Jackson <pj at sgi.com>
Date: Tue Apr 29 00:59:55 2008 -0700
cgroup: fix sparse warning of shadow symbol in cgroup.c
Fix a code warning: symbol 'p' shadows an earlier one
This is a reincarnation of Harvey Harrison's patch:
cpuset: sparse warnings in cpuset.c
Independently, Cliff Wickman moved the affected code,
from kernel/cpuset.c to kernel/cgroup.c, in his patch:
cpusets: update_cpumask revision
Signed-off-by: Paul Jackson <pj at sgi.com>
Cc: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Cliff Wickman <cpw at sgi.com>
Acked-by: Paul Menage <menage at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3df91fe30a1547af7e794c6e8cca76f4932c6ad7
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:59:54 2008 -0700
make cgroup_enable_task_cg_lists() static
Make the needlessly global cgroup_enable_task_cg_lists() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: David Rientjes <rientjes at google.com>
Cc: Paul Menage <menage at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3ef0e1f8cad0a851b3dbf91802b14af7dd780352
Author: Andres Salomon <dilinger at queued.net>
Date: Tue Apr 29 00:59:53 2008 -0700
x86: olpc: add One Laptop Per Child architecture support
This adds support for OLPC XO hardware. Open Firmware on XOs don't contain
the VSA, so it is necessary to emulate the PCI BARs in the kernel. This also
adds functionality for running EC commands, and a CONFIG_OLPC.
A number of OLPC drivers depend upon CONFIG_OLPC.
olpc_ec_timeout is a hack to work around Embedded Controller bugs.
[akpm at linux-foundation.org: build fix]
[akpm at linux-foundation.org: geode_has_vsa build fix]
[akpm at linux-foundation.org: olpc_register_battery_callback doesn't exist]
Signed-off-by: Andres Salomon <dilinger at debian.org>
Acked-by: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Andi Kleen <ak at suse.de>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2f9b12a31fcb738ea8c9eb0d4ddf906c6f1d696c
Author: Michael Halcrow <mhalcrow at us.ibm.com>
Date: Tue Apr 29 00:59:52 2008 -0700
eCryptfs: protect crypt_stat->flags in ecryptfs_open()
Make sure crypt_stat->flags is protected with a lock in ecryptfs_open().
Signed-off-by: Michael Halcrow <mhalcrow at us.ibm.com>
Cc: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6a3fd92e73fffd9e583650c56ad9558afe51dc5c
Author: Michael Halcrow <mhalcrow at us.ibm.com>
Date: Tue Apr 29 00:59:52 2008 -0700
eCryptfs: make key module subsystem respect namespaces
Make eCryptfs key module subsystem respect namespaces.
Since I will be removing the netlink interface in a future patch, I just made
changes to the netlink.c code so that it will not break the build. With my
recent patches, the kernel module currently defaults to the device handle
interface rather than the netlink interface.
[akpm at linux-foundation.org: export free_user_ns()]
Signed-off-by: Michael Halcrow <mhalcrow at us.ibm.com>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f66e883eb6186bc43a79581b67aff7d1a69d0ff1
Author: Michael Halcrow <mhalcrow at us.ibm.com>
Date: Tue Apr 29 00:59:51 2008 -0700
eCryptfs: integrate eCryptfs device handle into the module.
Update the versioning information. Make the message types generic. Add an
outgoing message queue to the daemon struct. Make the functions to parse
and write the packet lengths available to the rest of the module. Add
functions to create and destroy the daemon structs. Clean up some of the
comments and make the code a little more consistent with itself.
[akpm at linux-foundation.org: printk fixes]
Signed-off-by: Michael Halcrow <mhalcrow at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8bf2debd5f7bf12d122124e34fec14af5b1e8ecf
Author: Michael Halcrow <mhalcrow at us.ibm.com>
Date: Tue Apr 29 00:59:50 2008 -0700
eCryptfs: introduce device handle for userspace daemon communications
A regular device file was my real preference from the get-go, but I went with
netlink at the time because I thought it would be less complex for managing
send queues (i.e., just do a unicast and move on). It turns out that we do
not really get that much complexity reduction with netlink, and netlink is
more heavyweight than a device handle.
In addition, the netlink interface to eCryptfs has been broken since 2.6.24.
I am assuming this is a bug in how eCryptfs uses netlink, since the other
in-kernel users of netlink do not seem to be having any problems. I have had
one report of a user successfully using eCryptfs with netlink on 2.6.24, but
for my own systems, when starting the userspace daemon, the initial helo
message sent to the eCryptfs kernel module results in an oops right off the
bat. I spent some time looking at it, but I have not yet found the cause.
The netlink interface breaking gave me the motivation to just finish my patch
to migrate to a regular device handle. If I cannot find out soon why the
netlink interface in eCryptfs broke, I am likely to just send a patch to
disable it in 2.6.24 and 2.6.25. I would like the device handle to be the
preferred means of communicating with the userspace daemon from 2.6.26 on
forward.
This patch:
Functions to facilitate reading and writing to the eCryptfs miscellaneous
device handle. This will replace the netlink interface as the preferred
mechanism for communicating with the userspace eCryptfs daemon.
Each user has his own daemon, which registers itself by opening the eCryptfs
device handle. Only one daemon per euid may be registered at any given time.
The eCryptfs module sends a message to a daemon by adding its message to the
daemon's outgoing message queue. The daemon reads the device handle to get
the oldest message off the queue.
Incoming messages from the userspace daemon are immediately handled. If the
message is a response, then the corresponding process that is blocked waiting
for the response is awakened.
Signed-off-by: Michael Halcrow <mhalcrow at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9c3580aa52195699065bc2d7242b1c7e3e6903fa
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Tue Apr 29 00:59:48 2008 -0700
ecryptfs: add missing lock around notify_change
Callers of notify_change() need to hold i_mutex.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Michael Halcrow <mhalcrow at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 18d1dbf1d401e8f9d74cf1cf799fdb19cff150c6
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 00:59:48 2008 -0700
ecryptfs: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Michael Halcrow <mhalcrow at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 05db67a4f2c14dab5bcaa46c7d4e9237bd11b37c
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:59:47 2008 -0700
remove ecryptfs_header_cache_0
Remove the no longer used ecryptfs_header_cache_0.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Michael Halcrow <mhalcrow at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit afe42d7dea2983faa593d289ab241ffdd94d37b3
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 00:59:47 2008 -0700
xen: make blkif_getgeo static
Introduced between 2.6.25-rc2 and -rc3
drivers/block/xen-blkfront.c:139:5: warning: symbol 'blkif_getgeo' was not declared. Should it be static?
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c9e587abfdec2c2aaa55fab83bcb4972e2f84f9b
Author: Jan Engelhardt <jengelh at computergmbh.de>
Date: Tue Apr 29 00:59:46 2008 -0700
vt: fix background color on line feed
A command that causes a line feed while a background color is active,
such as
perl -e 'print "x" x 60, "\e[44m", "x" x 40, "\e[0m\n"'
and
perl -e 'print "x" x 40, "\e[44m\n", "x" x 40, "\e[0m\n"'
causes the line that was started as a result of the line feed to be completely
filled with the currently active background color instead of the default
color.
When scrolling, part of the current screen is memcpy'd/memmove'd to the new
region, and the new line(s) that will appear as a result are cleared using
memset. However, the lines are cleared with vc->vc_video_erase_char, causing
them to be colored with the currently active background color. This is
different from X11 terminal emulators which always paint the new lines with
the default background color (e.g. `xterm -bg black`).
The clear operation (\e[1J and \e[2J) also use vc_video_erase_char, so a new
vc->vc_scrl_erase_char is introduced with contains the erase character used
for scrolling, which is built from vc->vc_def_color instead of vc->vc_color.
Signed-off-by: Jan Engelhardt <jengelh at computergmbh.de>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: "H. Peter Anvin" <hpa at zytor.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3265e66b1825942c6e0fc457986cdf941a5f7d37
Author: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Date: Tue Apr 29 00:59:43 2008 -0700
directly use kmalloc() and kfree() in init/initramfs.c
Instead of using the malloc() and free() wrappers needed by the
lib/inflate.c code for allocations, simply use kmalloc() and kfree() in the
initramfs code. This is needed for a further lib/inflate.c-related cleanup
patch that will remove the malloc() and free() functions.
Take that opportunity to remove the useless kmalloc() return value
cast.
Based on work done by Matt Mackall.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Signed-off-by: Matt Mackall <mpm at selenic.com>
Cc: Jan Engelhardt <jengelh at computergmbh.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5f97a5a8799b8d7d0afdb9d68a50a4e0e8298a05
Author: Dave Young <hidave.darkstar at gmail.com>
Date: Tue Apr 29 00:59:43 2008 -0700
isolate ratelimit from printk.c for other use
Due to the rcupreempt.h WARN_ON trigged, I got 2G syslog file. For some
serious complaining of kernel, we need repeat the warnings, so here I isolate
the ratelimit part of printk.c to a standalone file.
Signed-off-by: Dave Young <hidave.darkstar at gmail.com>
Acked-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Tested-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 762873c251b056c6c1b29e83a4dabafb064e5421
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Tue Apr 29 00:59:42 2008 -0700
vfs: fix unconditional write_super() call in file_fsync()
We need to check ->s_dirt before calling write_super(). It became the cause
of an unneeded write.
This bug was noticed by Sudhanshu Saxena.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch at lst.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8f0cfa52a1d4ffacd8e7de906d19662f5da58d58
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 00:59:41 2008 -0700
xattr: add missing consts to function arguments
Add missing consts to xattr function arguments.
Signed-off-by: David Howells <dhowells at redhat.com>
Cc: Andreas Gruenbacher <agruen at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7ec02ef1596bb3c829a7e8b65ebf13b87faf1819
Author: Jan Blunck <jblunck at suse.de>
Date: Tue Apr 29 00:59:40 2008 -0700
vfs: remove lives_below_in_same_fs()
Remove lives_below_in_same_fs() since is_subdir() from fs/dcache.c is
providing the same functionality.
Signed-off-by: Jan Blunck <jblunck at suse.de>
Acked-by: Miklos Szeredi <mszeredi at suse.cz>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch at lst.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c5c8be3ce59dc59baf20b33dae3f8eb70af7b1f1
Author: Matthias Kaehlcke <matthias at kaehlcke.net>
Date: Tue Apr 29 00:59:40 2008 -0700
fs/inode.c: use hlist_for_each_entry()
fs/inode.c: use hlist_for_each_entry() in find_inode() and find_inode_fast()
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Matthias Kaehlcke <matthias at kaehlcke.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit af065b8a19041554196971d8b6ae1459798d3b14
Author: Jan Kara <jack at suse.cz>
Date: Tue Apr 29 00:59:39 2008 -0700
vfs: skip inodes without pages to free in drop_pagecache_sb()
Many inodes have no pagecache, so we can avoid lots of lock-takings.
Signed-off-by: Jan Kara <jack at suse.cz>
Cc: Fengguang Wu <wfg at mail.ustc.edu.cn>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eccb95cee4f0d56faa46ef22fb94dd4a3578d3eb
Author: Jan Kara <jack at suse.cz>
Date: Tue Apr 29 00:59:37 2008 -0700
vfs: fix lock inversion in drop_pagecache_sb()
Fix longstanding lock inversion in drop_pagecache_sb by dropping inode_lock
before calling __invalidate_mapping_pages(). We just have to make sure inode
won't go away from under us by keeping reference to it and putting the
reference only after we have safely resumed the scan of the inode list. A bit
tricky but not too bad...
Signed-off-by: Jan Kara <jack at suse.cz>
Cc: Fengguang Wu <wfg at mail.ustc.edu.cn>
Cc: David Chinner <dgc at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a8522509200b460443a7ca59138dc63bec1b690a
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue Apr 29 00:59:36 2008 -0700
swiotlb: use iommu_is_span_boundary helper function
iommu_is_span_boundary in lib/iommu-helper.c was exported for PARISC IOMMUs
(commit 3715863aa142c4f4c5208f5f3e5e9bac06006d2f). SWIOTLB can use it instead
of the homegrown function.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Ingo Molnar <mingo at redhat.com>
Cc: H. Peter Anvin <hpa at zytor.com>
Cc: Tony Luck <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a7133a15587b8921af8b074e0d3fe1606cbe5597
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Apr 29 00:59:36 2008 -0700
lib/swiotlb.c: cleanups
There's a pointlessly braced block of code in there. Remove the braces and
save a tabstop.
Cc: Andi Kleen <ak at suse.de>
Cc: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Jan Beulich <jbeulich at novell.com>
Cc: Tony Luck <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9a3be324e3d9da08219d81d6765f445a726cf962
Author: Ciaran McCreesh <ciaran.mccreesh at googlemail.com>
Date: Tue Apr 29 00:59:35 2008 -0700
firmware loader: printk when requesting firmware
Before requesting firmware, printk a message saying what we're requesting. This
makes it easier to see what's going on, and provides an explanation for the
huge silent delay that one would otherwise get after accidentally building
ipw2200 as a non-module.
Cc: Greg KH <greg at kroah.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 66e106010db689fdbdbd7ae738b115dae5f521e4
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 00:59:34 2008 -0700
MAINTAINERS: clarify status of MN10300 mailing list as moderated
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e1d2c8b69ad81ea103b1e87809eba51931e16874
Author: David Howells <dhowells at redhat.com>
Date: Tue Apr 29 00:59:34 2008 -0700
fdpic: check that the size returned by kernel_read() is what we asked for
Check that the size of the read returned by kernel_read() is what we asked
for. If it isn't, then reject the binary as being a badly formatted.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 76308da18910e556747f6d100147f42ccc78662c
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Tue Apr 29 00:59:33 2008 -0700
smb.h: uses struct timespec but didn't include linux/time.h
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9c9ba34ee3dbc34e829f42e42a5e5273b1183500
Author: Andy Whitcroft <apw at shadowen.org>
Date: Tue Apr 29 00:59:33 2008 -0700
update checkpatch.pl to version 0.18
This version brings a few fixes for the extern checks, and a couple of
new checks.
Of note:
- false is now recognised as a 0 assignment in static/external
assignments,
- printf format strings including %L are reported,
- a number of fixes for the extern in .c file detector which had
temporarily lost its ability to detect variables; undetected due to
the loss of its test.
Andy Whitcroft (8):
Version: 0.18
false should trip 0 assignment checks
tests: reinstate missing tests
tests: allow specification of the file extension for a test
fix extern checks for variables
check for and report %Lu, %Ld, and %Li
ensure we only start a statement on lines with some content
extern spacing
Signed-off-by: Andy Whitcroft <apw at shadowen.org>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 171ae1a491e216ef728436f9cc958e05cccf5a27
Author: Andy Whitcroft <apw at shadowen.org>
Date: Tue Apr 29 00:59:32 2008 -0700
update checkpatch.pl to version 0.17
This version brings improvements to external declaration detection, fixes to
quote tracking, fixes to unary tracking, some clarification of wording, and
the usual slew of fixes for false positives.
Of note:
- much better unary tracking across preprocessor directives
- UTF8 checks highlight the character at fault
- widening of mutex detection
Andy Whitcroft (17):
Version: 0.17
values: __attribute__ carries through the previous type
quotes: should only follow "positive" lines
clarify the indent tabs over spaces wording
loosen NR_CPUS check for array range initialisers
detect external function declarations without an extern prefix
function declaration arguments should be with the identifier
DEFINE_MUTEX should report in line with struct mutex
NR_CPUS is valid in preprocessor statements
comment detection should not start on the @@ line
types: add support for #undef
tighten mutex/completion reports to usage
allow export of function pointers
values: preprocessor #define is out of line maintain values
values: #define does not always have parentheses
unary '*' may be const
utf8 checks should report location of the invalid character
Wolfram Sang (1):
make checkpatch.pl really skip <asm/irq.h>
Signed-off-by: Andy Whitcroft <apw at shadowen.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ee8900c9c7cc92db02b7edfa26ae3b2c9b2434f9
Author: Joe Perches <joe at perches.com>
Date: Tue Apr 29 00:59:31 2008 -0700
scripts/Lindent: support gnu indent v2.2.10
The new version of indent supports positioning labels in column 1
using "-il0"
http://www.nabble.com/Release-2.2.10-of-GNU-Indent-td15990700.html
Add "-il0" if indent version >= 2.2.10
Signed-off-by: Joe Perches <joe at perches.com>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3a8ca95e9d62980fd3b41165ec05032c63ce21da
Author: Julia Lawall <julia at diku.dk>
Date: Tue Apr 29 00:59:30 2008 -0700
drivers/misc: elide a non-zero test on a result that is never 0
The function thermal_cooling_device_register always returns either a valid
pointer or a value made with ERR_PTR, so a test for non-zero on the result
will always succeed.
The problem was found using the following semantic match.
(http://www.emn.fr/x-info/coccinelle/)
//<smpl>
@a@
expression E, E1;
statement S,S1;
position p;
@@
E = thermal_cooling_device_register(...)
... when != E = E1
if at p (E) S else S1
@n@
position a.p;
expression E,E1;
statement S,S1;
@@
E = NULL
... when != E = E1
if at p (E) S else S1
@depends on !n@
expression E;
statement S,S1;
position a.p;
@@
* if at p (E)
S else S1
//</smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Cc: Thomas Sujith <sujith.thomas at intel.com>
Cc: Len Brown <len.brown at intel.com>
Cc: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 95d8c365b2df2adb904963333a93b15414403ed1
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 00:59:29 2008 -0700
lists: add "const" qualifier to first arg of list_splice() operations
Since neither the list_splice() nor __list_splice() routines modify their
first argument, might as well declare them "const".
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 86735118459b46422e20d3b73ee732b1f1f780b1
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 00:59:28 2008 -0700
kbuild: move files that don't check __KERNEL__
Move files that don't check __KERNEL__ from unifdef-y to header-y.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Cc: Sam Ravnborg <sam at ravnborg.org>
Cc: David Woodhouse <dwmw2 at infradead.org>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1a6924f93d0d511da5b34189563c5e31ffe5df2e
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 00:59:28 2008 -0700
kbuild: remove duplicate, conflicting entry for oom.h
oom.h is already tagged for unifdef'ing, so its entry as a simple exportable
header should be deleted.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Cc: Sam Ravnborg <sam at ravnborg.org>
Cc: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2e50b6ccdaaf0d933bb9d8409cac4b2f088f5a2f
Author: S.Caglar Onur <caglar at pardus.org.tr>
Date: Tue Apr 29 00:59:26 2008 -0700
fs/binfmt_aout.c: use printk_ratelimit()
Use printk_ratelimit() instead of jiffies based arithmetic, suggested by Geert
Uytterhoeven
Signed-off-by: S.Caglar Onur <caglar at pardus.org.tr>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aab3c3b01d1848a5e8a1ddec4e5656fc4de04982
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 00:59:25 2008 -0700
Remove superfluous include of string.h from percpu.h
There's nothing in percpu.h that requires an explicit inclusion of
string.h.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1aeb272cf09f9e2cbc62163b9f37a9b4d1c7e81d
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 29 00:59:25 2008 -0700
kernel: explicitly include required header files under kernel/
Following an experimental deletion of the unnecessary directive
#include <linux/slab.h>
from the header file <linux/percpu.h>, these files under kernel/ were exposed
as needing to include one of <linux/slab.h> or <linux/gfp.h>, so explicit
includes were added where necessary.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3a2e7f47d71e1df86acc1dda6826890b6546a4e1
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 00:59:24 2008 -0700
binfmt_misc.c: avoid potential kernel stack overflow
This can be triggered with root help only, but...
Register the ":text:E::txt::/root/cat.txt:' rule in binfmt_misc (by root) and
try launching the cat.txt file (by anyone) :) The result is - the endless
recursion in the load_misc_binary -> open_exec -> load_misc_binary chain and
stack overflow.
There's a similar problem with binfmt_script, and there's a sh_bang memner on
linux_binprm structure to handle this, but simply raising this in binfmt_misc
may break some setups when the interpreter of some misc binaries is a script.
So the proposal is to turn sh_bang into a bit, add a new one (the misc_bang)
and raise it in load_misc_binary. After this, even if we set up the misc ->
script -> misc loop for binfmts one of them will step on its own bang and
exit.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cbd9b67bd3883dff0ef4b8ec9229d315a9ba38f0
Author: Dmitry Adamushko <dmitry.adamushko at gmail.com>
Date: Tue Apr 29 00:59:23 2008 -0700
kthread: call wake_up_process() without the lock being held
From the POV of synchronization, there should be no need to call
wake_up_process() with the 'kthread_create_lock' being held.
Signed-off-by: Dmitry Adamushko <dmitry.adamushko at gmail.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a2d416dcc92e576d0e339efd641bd3d8ee2bfb4d
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Apr 29 00:59:22 2008 -0700
codafs: fix build warning
powerpc:
fs/coda/coda_linux.c: In function 'coda_iattr_to_vattr':
fs/coda/coda_linux.c:137: warning: large integer implicitly truncated to unsigned type
Cc: Jan Harkes <jaharkes at cs.cmu.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7afea3bcb1f87f3ddf34b38f202ad0d03f29e120
Author: Jon Schindler <jkschind at gmail.com>
Date: Tue Apr 29 00:59:21 2008 -0700
drivers/block/floppy.c: replace init_module&cleanup_module with module_init&module_exit
Replace init_module and cleanup_module with static functions and
module_init/module_exit.
Signed-off-by: Jon Schindler <jkschind at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5045bcae0fb466a1dbb6af0036e56901fd7aafb7
Author: Rik van Riel <riel at redhat.com>
Date: Tue Apr 29 00:59:21 2008 -0700
sysrq: add show-backtrace-on-all-cpus function
SysRQ-P is not always useful on SMP systems, since it usually ends up showing
the backtrace of a CPU that is doing just fine, instead of the backtrace of
the CPU that is having problems.
This patch adds SysRQ show-all-cpus(L), which shows the backtrace of every
active CPU in the system. It skips idle CPUs because some SMP systems are
just too large and we already know what the backtrace of the idle task looks
like.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Rik van Riel <riel at redhat.com>
Randy Dunlap <randy.dunlap at oracle.com>
Cc: <lwoodman at redhat.com>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6e574195b75543bc6a6240306313988b1952470c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 00:59:20 2008 -0700
drivers/misc: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eecd58536a97502153d4a2bd6f05038f657a1ab3
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 00:59:19 2008 -0700
firmware: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Doug Warzecha <Douglas_Warzecha at dell.com>
Cc: Matt Domsch <Matt_Domsch at dell.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7d195a5409120277b800c42e846ee29cc667b777
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:59:18 2008 -0700
proper extern for late_time_init
Add a proper extern for late_time_init in include/linux/init.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: john stultz <johnstul at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 175a06ae300188af8a61db68a78e1af44dc7d44f
Author: Tetsuo Handa <penguin-kernel at i-love.sakura.ne.jp>
Date: Tue Apr 29 00:59:17 2008 -0700
exec: remove argv_len from struct linux_binprm
I noticed that 2.6.24.2 calculates bprm->argv_len at do_execve(). But it
doesn't update bprm->argv_len after "remove_arg_zero() +
copy_strings_kernel()" at load_script() etc.
audit_bprm() is called from search_binary_handler() and
search_binary_handler() is called from load_script() etc. Thus, I think the
condition check
if (bprm->argv_len > (audit_argv_kb << 10))
return -E2BIG;
in audit_bprm() might return wrong result when strlen(removed_arg) !=
strlen(spliced_args). Why not update bprm->argv_len at load_script() etc. ?
By the way, 2.6.25-rc3 seems to not doing the condition check. Is the field
bprm->argv_len no longer needed?
Signed-off-by: Tetsuo Handa <penguin-kernel at I-love.SAKURA.ne.jp>
Cc: Ollie Wild <aaw at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ecd0fa9825a1270e31fb48bc9edcfb28918b6c51
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Tue Apr 29 00:59:15 2008 -0700
Remove the macro get_personality
Remove the macro get_personality, use ->personality instead.
Cc: Christoph Hellwig <hch at infradead.org
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: David Howells <dhowells at redhat.com>
Cc: Bryan Wu <bryan.wu at analog.com>
Signed-off-by: WANG Cong <xiyou.wangcong at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6e5e8c5085190b30b6fa42a4b75a88c10846b5f2
Author: jan sonnek <xsonnek at gmail.com>
Date: Tue Apr 29 00:59:15 2008 -0700
Misc: phantom, consistent whitespace
Make it consistent with the rest of the header.
Signed-off-by: jan sonnek <xsonnek at gmail.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7d4f9f094b0a01ba199f97cd4a5f5609391a04f9
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Tue Apr 29 00:59:14 2008 -0700
Misc, phantom, fix poll
Return ERR even if there are pending data, but hw is not running. Do not
decrement count in poll, do it in ioctl, where data are actually read.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7e4e8e689fe90dd94bd76f9706d6cce580941ed5
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Tue Apr 29 00:59:13 2008 -0700
Misc: phantom, add compat ioctl
Openhaptics uses pointers in _IOC() macros, implement compat for them. Also
add _IOC alternatives which are not 32/64 bit dependent (structures
passed through aren't yet) -- libphantom will use them.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eb0f1c442d7cf1f7cb746c26c6120bb42e69c49c
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:59:12 2008 -0700
proper __do_softirq() prototype
Add a proper prototype for __do_softirq() in include/linux/interrupt.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8d4b69002e56e93f1cfe8bb863846ecde3990032
Author: Julia Lawall <julia at diku.dk>
Date: Tue Apr 29 00:59:12 2008 -0700
fs/affs/file.c: use BUG_ON
if (...) BUG(); should be replaced with BUG_ON(...) when the test has no
side-effects to allow a definition of BUG_ON that drops the code completely.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ disable unlikely @ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (unlikely(E)) { BUG(); }
+ BUG_ON(E);
)
@@ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (E) { BUG(); }
+ BUG_ON(E);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b70d3a2c596fb52b02488ad4aef13fa0d602090c
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Tue Apr 29 00:59:11 2008 -0700
iomap: fix 64 bits resources on 32 bits
Almost all implementations of pci_iomap() in the kernel, including the generic
lib/iomap.c one, copies the content of a struct resource into unsigned long's
which will break on 32 bits platforms with 64 bits resources.
This fixes all definitions of pci_iomap() to use resource_size_t. I also
"fixed" the 64bits arch for consistency.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: <linux-arch at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 626adeb6675fdf60e9d8c6212776b0b0acf0e376
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Apr 29 00:59:10 2008 -0700
Simplify initcall_debug output
print_fn_descriptor_symbol() prints the address if we don't have a symbol, so
no need to print both.
Also, combine printing return value with elapsed time. Changes this:
Calling initcall 0xc05b7a70: pci_mmcfg_late_insert_resources+0x0/0x50()
initcall 0xc05b7a70: pci_mmcfg_late_insert_resources+0x0/0x50() returned 1.
initcall 0xc05b7a70 ran for 0 msecs: pci_mmcfg_late_insert_resources+0x0/0x50()
initcall at 0xc05b7a70: pci_mmcfg_late_insert_resources+0x0/0x50(): returned with error code 1
to this:
calling pci_mmcfg_late_insert_resources+0x0/0x50()
initcall pci_mmcfg_late_insert_resources+0x0/0x50() returned 1 after 0 msecs
initcall pci_mmcfg_late_insert_resources+0x0/0x50() returned with error code 1
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 22caa0417db3b1d3dfafc9b7c0bf31baf8d667e7
Author: Jim Meyering <jim at meyering.net>
Date: Tue Apr 29 00:59:09 2008 -0700
lib/inflate.c: handle failed malloc()
lib/inflate.c (inflate_dynamic): Don't deref NULL upon failed malloc.
Signed-off-by: Jim Meyering <meyering at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cd6fda36089cf3b450821228c2f575a3b5d0e7a7
Author: Jim Meyering <jim at meyering.net>
Date: Tue Apr 29 00:59:08 2008 -0700
hfsplus: handle match_strdup failure
fs/hfsplus/options.c (hfsplus_parse_options): Handle match_strdup failure.
Signed-off-by: Jim Meyering <meyering at redhat.com>
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3fbe5c31009d26c7b6b73d5c69fe930a5e9d2e26
Author: Jim Meyering <jim at meyering.net>
Date: Tue Apr 29 00:59:07 2008 -0700
hfs: handle match_strdup failure
fs/hfs/super.c (parse_options): Handle match_strdup failure, twice.
Signed-off-by: Jim Meyering <meyering at redhat.com>
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6db27dd9d26fb270adaa4c265df65ccb49638bd0
Author: Jim Meyering <jim at meyering.net>
Date: Tue Apr 29 00:59:06 2008 -0700
affs: handle match_strdup failure
fs/affs/super.c (parse_options): Remove useless initialization. Handle
match_strdup failure.
Signed-off-by: Jim Meyering <meyering at redhat.com>
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 61d64576a21275114d6bffff3c1cac6c8e2f7cf2
Author: Jiri Olsa <olsajiri at gmail.com>
Date: Tue Apr 29 00:59:05 2008 -0700
fs: remove unused fops from struct char_device_struct
struct char_device_struct::fops is no longer used: remove it.
Signed-off-by: Jiri Olsa <olsajiri at gmail.com>
Cc: Greg KH <greg at kroah.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4aacd47bd88126109a7c295b79c93604bd4bfd5a
Author: Jiri Kosina <jkosina at suse.cz>
Date: Tue Apr 29 00:59:04 2008 -0700
ipwireless: remove dead code
Remove unused leftovers of debugging functions. 2.6.25 material.
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f249fdd8c19ff65825c0be67212cdf22e556668e
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 00:59:03 2008 -0700
autofs4: fix sparse warning in root.c
fs/autofs4/root.c:536:23: warning: symbol 'ino' shadows an earlier one
fs/autofs4/root.c:510:22: originally declared here
There is no need to redeclare, we are at the end of the loop and in
the next iteration of the loop, ino will be reset.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Ian Kent <raven at themaw.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 58b250daff6a24518813975143c8433d9d5b684f
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:59:02 2008 -0700
remove mca_is_adapter_used()
Remove the no longer used mca_is_adapter_used().
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: James Bottomley <James.Bottomley at steeleye.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3202e1811fd312f3f32ddc8f526aa2691b64ec55
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:59:02 2008 -0700
make BINFMT_FLAT a bool
I have not yet seen anyone saying he has a reasonable use case for using
BINFMT_FLAT modular on his embedded device.
Considering that fs/binfmt_flat.c even lacks a MODULE_LICENSE() I really doubt
there is any, and this patch therefore makes BINFMT_FLAT a bool.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Bryan Wu <cooloney.lkml at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f1e3af72c10ba74fb15864c354515ec1bd8bf2a5
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:59:01 2008 -0700
make fs/buffer.c:cont_expand_zero() static
cont_expand_zero() can become static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 946a57b526a16e5662235cb8f573337bc8ecdc48
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:59:00 2008 -0700
remove generic_commit_write()
Remove the obsolete and no longer used generic_commit_write().
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 45cc2b96f20fa27088a650587e5d9dc5fa5e32c0
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:59 2008 -0700
fs/timerfd.c should #include <linux/syscalls.h>
Every file should include the headers containing the prototypes for its global
functions (in this case for sys_timerfd_*()).
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Davide Libenzi <davidel at xmailserver.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f17a32e97eaa924754bf4463aee588a3890c7ae0
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:58 2008 -0700
let LOG_BUF_SHIFT default to 17
16 kB is often no longer enough for a normal boot of an UP system.
And even less when people e.g. use suspend.
17 seems to be a more reasonable default for current kernels on current
hardware (it's just the default, anyone who is memory limited can still lower
it).
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d5470b596abdd566339b2417e807b1198be64b97
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:57 2008 -0700
fs/aio.c: make 3 functions static
Make the following needlessly global functions static:
- __put_ioctx()
- lookup_ioctx()
- io_submit_one()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Zach Brown <zach.brown at oracle.com>
Cc: Benjamin LaHaise <bcrl at kvack.org>
Cc: Badari Pulavarty <pbadari at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 07d45da616f8514651360b502314fc9554223a03
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:57 2008 -0700
fs/drop_caches.c: make 2 functions static
Make the following needlessly global functions static:
- drop_pagecache()
- drop_slab()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f11b00f3bd89c91c684d56b2082d1b0241ff20ae
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:56 2008 -0700
fs/fs-writeback.c: make 2 functions static
Make the following needlessly global functions static:
- writeback_acquire()
- writeback_release()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 67cde595374dd0e4e4a537dbf9dff70fd3d7bd7b
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:55 2008 -0700
make vfs_ioctl() static
Make the needlessly global vfs_ioctl() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6b09ae66922ca198e5830c0a4d74400a507a9170
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:54 2008 -0700
make __put_super() static
Make the needlessly global __put_super() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8b1919a1e8b8968e0ac9030a4f14f0d2cd69e7cf
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:54 2008 -0700
fs/freevxfs/: proper externs
Move the extern declarations of several structs to vxfs_extern.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4b0a8da7a7bbe7f84c7bd16a5e965a129f461881
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:52 2008 -0700
fs/hfsplus/: proper externs
Add proper extern declarations for two structs in fs/hfsplus/hfsplus_fs.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4488c59c942bd6004fc97f0c2a7603a2f5dd80e0
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 00:58:51 2008 -0700
fs/ramfs/ extern cleanup
- internal.h shouldn't duplicate the extern declaration for
ramfs_file_operations already in include/linux/ramfs.h
- file-mmu.c needs two #include's for seeing the extern declarations
of it's global struct's
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f7b16c108fd044adc422ff21b5d6c16022462fd0
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 00:58:51 2008 -0700
cpu: fix section mismatch warning in reference to register_cpu_notifier
Fix following warnings:
WARNING: vmlinux.o(.text+0xc60): Section mismatch in reference from the function kvm_init() to the function .cpuinit.text:register_cpu_notifier()
WARNING: vmlinux.o(.text+0x33869a): Section mismatch in reference from the function xfs_icsb_init_counters() to the function .cpuinit.text:register_cpu_notifier()
WARNING: vmlinux.o(.text+0x5556a1): Section mismatch in reference from the function acpi_processor_install_hotplug_notify() to the function .cpuinit.text:register_cpu_notifier()
WARNING: vmlinux.o(.text+0xfe6b28): Section mismatch in reference from the function cpufreq_register_driver() to the function .cpuinit.text:register_cpu_notifier()
register_cpu_notifier() are only really defined when HOTPLUG_CPU is enabled.
So references to the function are OK.
Annotate it with __ref so we do not get warnings from callers and do not get
warnings for the functions/data used by register_cpu_notifier().
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Gautham R Shenoy <ego at in.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 514a20a5da99aef8e667cc395841a5c4e5f9e8c1
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 00:58:50 2008 -0700
cpu: fix section mismatch warnings in *cpu_down
Fix following warnings:
WARNING: vmlinux.o(.text+0x75c8d): Section mismatch in reference from the function take_cpu_down() to the variable .cpuinit.data:cpu_chain
WARNING: vmlinux.o(.text+0x75d2a): Section mismatch in reference from the function _cpu_down() to the variable .cpuinit.data:cpu_chain
WARNING: vmlinux.o(.text+0x75d4d): Section mismatch in reference from the function _cpu_down() to the variable .cpuinit.data:cpu_chain
WARNING: vmlinux.o(.text+0x75de4): Section mismatch in reference from the function _cpu_down() to the variable .cpuinit.data:cpu_chain
WARNING: vmlinux.o(.text+0x75e33): Section mismatch in reference from the function _cpu_down() to the variable .cpuinit.data:cpu_chain
cpu_down is only used from code surrounded by HOTPLUG_CPU so any references to
__cpuinit is OK.
Add a few __ref to tech modpost to ignore the references.
This is just papering over the fact that the cpu hotplug code is fragile with
respect to use of HOTPLUG_CPU and in many cases rely on __cpuinit to get rid
of code when HOTPLUG_CPU is not enabled. For now this is the least invasive
change.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Gautham R Shenoy <ego at in.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9647155ffbce9dffed8a9a4768c8994334b609db
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 00:58:48 2008 -0700
cpu: fix section mismatch warning in unregister_cpu_notifier
Fix following warning:
WARNING: vmlinux.o(.text+0x75f4e): Section mismatch in reference from the function unregister_cpu_notifier() to the variable .cpuinit.data:cpu_chain
We know that unregister_cpu_notifier is using HOTPLUG_CPU
stuff - so ignore these references.
Annotating unregister_cpu_notifier had been another option
but this caused far more warnings since not all callers were
annotated __cpuinit.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Gautham R Shenoy <ego at in.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f718e31819857825315300ea3c2dbc3f26ff3b0e
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Apr 29 00:58:47 2008 -0700
cpu: fix section mismatch warnings in hotcpu_register
Fix following warnings:
WARNING: vmlinux.o(.data+0x5020): Section mismatch in reference from the variable cpu_vsyscall_notifier_nb.12876 to the function .cpuinit.text:cpu_vsyscall_notifier()
WARNING: vmlinux.o(.data+0x9ce0): Section mismatch in reference from the variable profile_cpu_callback_nb.17654 to the function .devinit.text:profile_cpu_callback()
WARNING: vmlinux.o(.data+0xd380): Section mismatch in reference from the variable workqueue_cpu_callback_nb.15004 to the function .devinit.text:workqueue_cpu_callback()
WARNING: vmlinux.o(.data+0x11d00): Section mismatch in reference from the variable relay_hotcpu_callback_nb.19626 to the function .cpuinit.text:relay_hotcpu_callback()
WARNING: vmlinux.o(.data+0x12970): Section mismatch in reference from the variable cpu_callback_nb.24694 to the function .devinit.text:cpu_callback()
WARNING: vmlinux.o(.data+0x3fee0): Section mismatch in reference from the variable percpu_counter_hotcpu_callback_nb.10903 to the function .cpuinit.text:percpu_counter_hotcpu_callback()
WARNING: vmlinux.o(.data+0x74ce0): Section mismatch in reference from the variable topology_cpu_callback_nb.12506 to the function .cpuinit.text:topology_cpu_callback()
Functions used as argument are by definition only used in HOTPLUG_CPU
situations so thay are annotated __cpuinit. Annotate the static variable used
by hotcpu_register with __cpuinitdata to match this definition.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Gautham R Shenoy <ego at in.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 63e3453e547b20321381b212cb1ee11537dc843d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 00:58:44 2008 -0700
befs: fix sparse warning in linuxvfs.c
Use link as the variable name to avoid shadowing the arg.
fs/befs/linuxvfs.c:492:8: warning: symbol 'p' shadows an earlier one
fs/befs/linuxvfs.c:488:77: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: "Sergey S. Kostyliov" <rathamahata at php4.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9fe76c763f0e18582bcb670c386978e83a755d05
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 00:58:44 2008 -0700
coda: add static to functions in dir.c
coda_unlink, coda_rmdir, coda_readdir can all be static, the forward
declarations already were.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jan Harkes <jaharkes at cs.cmu.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 679c9cd4acc2cf2872171813752eab3320273339
Author: Sripathi Kodi <sripathik at in.ibm.com>
Date: Tue Apr 29 00:58:42 2008 -0700
add RUSAGE_THREAD
Add the RUSAGE_THREAD option for the getrusage system call. This is
essentially Roland's patch from http://lkml.org/lkml/2008/1/18/589, but the
line about RUSAGE_LWP line has been removed, as suggested by Ulrich and
Christoph.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Sripathi Kodi <sripathik at in.ibm.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Michael Kerrisk <mtk.manpages at googlemail.com>
Cc: Ulrich Drepper <drepper at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e5949050f2610fa526b154e0d8379218e54f49d1
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 00:58:41 2008 -0700
adfs: work around bogus sparse warning
fs/adfs/dir_f.c:126:4: warning: do-while statement is not a compound statement
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 95b570c9cef3b12356454c7112571b7e406b4b51
Author: Nur Hussein <nurhussein at gmail.com>
Date: Tue Apr 29 00:58:39 2008 -0700
Taint kernel after WARN_ON(condition)
The kernel is sent to tainted within the warn_on_slowpath() function, and
whenever a warning occurs the new taint flag 'W' is set. This is useful to
know if a warning occurred before a BUG by preserving the warning as a flag
in the taint state.
This does not work on architectures where WARN_ON has its own definition.
These archs are:
1. s390
2. superh
3. avr32
4. parisc
The maintainers of these architectures have been added in the Cc: list
in this email to alert them to the situation.
The documentation in oops-tracing.txt has been updated to include the
new flag.
Signed-off-by: Nur Hussein <nurhussein at gmail.com>
Cc: Arjan van de Ven <arjan at infradead.org>
Cc: "Randy.Dunlap" <rdunlap at xenotime.net>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Kyle McMartin <kyle at mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
Cc: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bd3feb13e15a4859f629c9a076554e260c1d1397
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Tue Apr 29 00:58:37 2008 -0700
fs/coda: remove static inline forward declarations
They're defined later on in the same file with bodies and nothing in
between needs them.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Reviewed-by: Pekka Enberg <penberg at cs.helsinki.fi>
Acked-by: Jan Harkes <jaharkes at cs.cmu.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ede9c697bc7513f210103fa77a9031e89726ae40
Author: Eric Dumazet <dada1 at cosmosbay.com>
Date: Tue Apr 29 00:58:35 2008 -0700
Avoid divides in BITS_TO_LONGS
BITS_PER_LONG is a signed value (32 or 64)
DIV_ROUND_UP(nr, BITS_PER_LONG) performs signed arithmetic if "nr" is signed too.
Converting BITS_TO_LONGS(nr) to DIV_ROUND_UP(nr, BITS_PER_BYTE *
sizeof(long)) makes sure compiler can perform a right shift, even if "nr"
is a signed value, instead of an expensive integer divide.
Applying this patch saves 141 bytes on x86 when CONFIG_CC_OPTIMIZE_FOR_SIZE=y
and speedup bitmap operations.
Signed-off-by: Eric Dumazet <dada1 at cosmosbay.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cdac75e6f2fec9abc21d0abb4e5d80720eeebb10
Author: Davide Libenzi <davidel at xmailserver.org>
Date: Tue Apr 29 00:58:34 2008 -0700
epoll: avoid kmemcheck warning
Epoll calls rb_set_parent(n, n) to initialize the rb-tree node, but
rb_set_parent() accesses node's pointer in its code. This creates a
warning in kmemcheck (reported by Vegard Nossum) about an uninitialized
memory access. The warning is harmless since the following rb-tree node
insert is going to overwrite the node data. In any case I think it's
better to not have that happening at all, and fix it by simplifying the
code to get rid of a few lines that became superfluous after the previous
epoll changes.
Signed-off-by: Davide Libenzi <davidel at xmailserver.org>
Cc: Vegard Nossum <vegard.nossum at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b781ecb6a379f155568ef7093e38c6c1d857fe53
Author: Arjan van de Ven <arjan at linux.intel.com>
Date: Tue Apr 29 00:58:34 2008 -0700
make /dev/kmem a config option
Make /dev/kmem a config option; /dev/kmem is VERY rarely used, and when
used, it's generally for no good (rootkits tend to be the most common
users). With this config option, users have the choice to disable
/dev/kmem, saving some size as well.
A patch to disable /dev/kmem has been in the Fedora and RHEL kernels for
4+ years now without any known problems or legit users of /dev/kmem.
[akpm at linux-foundation.org: make CONFIG_DEVKMEM default to y]
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0cddc0a906ee3e47ce3e09107d385ff89f87cd6d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 29 00:58:29 2008 -0700
power: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Greg KH <greg at kroah.com>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Cc: Len Brown <lenb at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 551883ae8c9c31460e796e7b1b8aa9069de268b4
Author: Nishanth Aravamudan <nacc at us.ibm.com>
Date: Tue Apr 29 00:58:26 2008 -0700
page allocator: explicitly retry hugepage allocations
Add __GFP_REPEAT to hugepage allocations. Do so to not necessitate userspace
putting pressure on the VM by repeated echo's into /proc/sys/vm/nr_hugepages
to grow the pool. With the previous patch to allow for large-order
__GFP_REPEAT attempts to loop for a bit (as opposed to indefinitely), this
increases the likelihood of getting hugepages when the system experiences (or
recently experienced) load.
Mel tested the patchset on an x86_32 laptop. With the patches, it was easier
to use the proc interface to grow the hugepage pool. The following is the
output of a script that grows the pool as much as possible running on
2.6.25-rc9.
Allocating hugepages test
-------------------------
Disabling OOM Killer for current test process
Starting page count: 0
Attempt 1: 57 pages Progress made with 57 pages
Attempt 2: 73 pages Progress made with 16 pages
Attempt 3: 74 pages Progress made with 1 pages
Attempt 4: 75 pages Progress made with 1 pages
Attempt 5: 77 pages Progress made with 2 pages
77 pages was the most it allocated but it took 5 attempts from userspace
to get it. With the 3 patches in this series applied,
Allocating hugepages test
-------------------------
Disabling OOM Killer for current test process
Starting page count: 0
Attempt 1: 75 pages Progress made with 75 pages
Attempt 2: 76 pages Progress made with 1 pages
Attempt 3: 79 pages Progress made with 3 pages
And 79 pages was the most it got. Your patches were able to allocate the
bulk of possible pages on the first attempt.
Signed-off-by: Nishanth Aravamudan <nacc at us.ibm.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Tested-by: Mel Gorman <mel at csn.ul.ie>
Cc: Dave Hansen <haveblue at us.ibm.com>
Cc: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a41f24ea9fd6169b147c53c2392e2887cc1d9247
Author: Nishanth Aravamudan <nacc at us.ibm.com>
Date: Tue Apr 29 00:58:25 2008 -0700
page allocator: smarter retry of costly-order allocations
Because of page order checks in __alloc_pages(), hugepage (and similarly
large order) allocations will not retry unless explicitly marked
__GFP_REPEAT. However, the current retry logic is nearly an infinite
loop (or until reclaim does no progress whatsoever). For these costly
allocations, that seems like overkill and could potentially never
terminate. Mel observed that allowing current __GFP_REPEAT semantics for
hugepage allocations essentially killed the system. I believe this is
because we may continue to reclaim small orders of pages all over, but
never have enough to satisfy the hugepage allocation request. This is
clearly only a problem for large order allocations, of which hugepages
are the most obvious (to me).
Modify try_to_free_pages() to indicate how many pages were reclaimed.
Use that information in __alloc_pages() to eventually fail a large
__GFP_REPEAT allocation when we've reclaimed an order of pages equal to
or greater than the allocation's order. This relies on lumpy reclaim
functioning as advertised. Due to fragmentation, lumpy reclaim may not
be able to free up the order needed in one invocation, so multiple
iterations may be requred. In other words, the more fragmented memory
is, the more retry attempts __GFP_REPEAT will make (particularly for
higher order allocations).
This changes the semantics of __GFP_REPEAT subtly, but *only* for
allocations > PAGE_ALLOC_COSTLY_ORDER. With this patch, for those size
allocations, we will try up to some point (at least 1<<order reclaimed
pages), rather than forever (which is the case for allocations <=
PAGE_ALLOC_COSTLY_ORDER).
This change improves the /proc/sys/vm/nr_hugepages interface with a
follow-on patch that makes pool allocations use __GFP_REPEAT. Rather
than administrators repeatedly echo'ing a particular value into the
sysctl, and forcing reclaim into action manually, this change allows for
the sysctl to attempt a reasonable effort itself. Similarly, dynamic
pool growth should be more successful under load, as lumpy reclaim can
try to free up pages, rather than failing right away.
Choosing to reclaim only up to the order of the requested allocation
strikes a balance between not failing hugepage allocations and returning
to the caller when it's unlikely to every succeed. Because of lumpy
reclaim, if we have freed the order requested, hopefully it has been in
big chunks and those chunks will allow our allocation to succeed. If
that isn't the case after freeing up the current order, I don't think it
is likely to succeed in the future, although it is possible given a
particular fragmentation pattern.
Signed-off-by: Nishanth Aravamudan <nacc at us.ibm.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Tested-by: Mel Gorman <mel at csn.ul.ie>
Cc: Dave Hansen <haveblue at us.ibm.com>
Cc: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ab857d09386661145924c9403792234aeca4bdff
Author: Nishanth Aravamudan <nacc at us.ibm.com>
Date: Tue Apr 29 00:58:23 2008 -0700
mm: fix misleading __GFP_REPEAT related comments
The definition and use of __GFP_REPEAT, __GFP_NOFAIL and __GFP_NORETRY in the
core VM have somewhat differing comments as to their actual semantics.
Annoyingly, the flags definition has inline and header comments, which might
be interpreted as not being equivalent. Just add references to the header
comments in the inline ones so they don't go out of sync in the future. In
their use in __alloc_pages() clarify that the current implementation treats
low-order allocations and __GFP_REPEAT allocations as distinct cases.
To clarify, the flags' semantics are:
__GFP_NORETRY means try no harder than one run through __alloc_pages
__GFP_REPEAT means __GFP_NOFAIL
__GFP_NOFAIL means repeat forever
order <= PAGE_ALLOC_COSTLY_ORDER means __GFP_NOFAIL
Signed-off-by: Nishanth Aravamudan <nacc at us.ibm.com>
Acked-by: Mel Gorman <mel at csn.ul.ie>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 86051ca5eaf5e560113ec7673462804c54284456
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Date: Tue Apr 29 00:58:21 2008 -0700
mm: fix usemap initialization
usemap must be initialized only when pfn is within zone. If not, it corrupts
memory.
And this patch also reduces the number of calls to set_pageblock_migratetype()
from
(pfn & (pageblock_nr_pages -1)
to
!(pfn & (pageblock_nr_pages-1)
it should be called once per pageblock.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Acked-by: Mel Gorman <mel at csn.ul.ie>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Shi Weihua <shiwh at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 66fb9d120e91050093b8ce4c1daa2e440660152b
Author: Thomas Renninger <trenn at suse.de>
Date: Wed Apr 16 20:52:02 2008 +0200
ACPI: Cleanup: Remove unneeded, multiple local dummy variables
Signed-off-by: Thomas Renninger <trenn at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit c46e5658a0b81891532705bd65592afe091a5967
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Mon Nov 5 11:43:36 2007 -0500
ACPI: video - fix permissions on some proc entries
POST and DOS are supposed to be writable but permissions
did not allow it.
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
Acked-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 251cb0bc795f5c0d8ca27df093319e5b39966174
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Mon Nov 5 11:43:34 2007 -0500
ACPI: video - properly handle errors when registering proc elements
Have acpi_video_device_add_fs() and acpi_video_bus_add_fs()
properly unwind proc creation after error.
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
Acked-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 78eed028f13b1a0b2612368dff3786e400e6cf8b
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Mon Nov 5 11:43:33 2007 -0500
ACPI: video - do not store invalid entries in attached_array list
this is a cleanup, not a change to function.
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
Acked-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 2c6e33c366bff2f839df60d9235ff09143e28dd9
Author: Len Brown <len.brown at intel.com>
Date: Wed Apr 23 18:02:52 2008 -0400
ACPI: re-name acpi_pm_ops to acpi_suspend_ops
... as they are platform_suspend_ops after all.
cosmetic re-name only, no functional change.
Signed-off-by: Len Brown <len.brown at intel.com>
commit e7ae1e7ef9b4ef50444a49611dab92cb778eb97c
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue Apr 29 10:21:20 2008 +0200
ACER_WMI/ASUS_LAPTOP: fix build bug
randconfig testing in x86.git found the following upstream build bug:
drivers/built-in.o: In function `acer_led_exit':
acer-wmi.c:(.text+0xdc76e): undefined reference to `led_classdev_unregister'
drivers/built-in.o: In function `acer_platform_probe':
acer-wmi.c:(.devinit.text+0x63e6): undefined reference to `led_classdev_register'
which was due to acer-wmi.o only depending on CONFIG_LEDS_CLASS, while
also using a symbol offered by CONFIG_NEW_LEDS. Also fix a similar bug
in CONFIG_ASUS_LAPTOP.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 90fe17f4df2f830601ffd422b11d1f7f9a9d0355
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Fri Apr 18 13:27:29 2008 -0700
thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Acked-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a815ab8b5891f3d2515316655729272f68269e3b
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Fri Apr 18 13:27:29 2008 -0700
ACPI: check a return value correctly in acpi_power_get_context()
We should check *resource != NULL rather than resource != NULL, which will be
always true.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Acked-by: Zhao Yakui <yakui.zhao at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 2a241d77cfdab08544a78057a4b24c9a98dc79d0
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Mar 31 02:05:40 2008 +0300
#if 0 acpi/bay.c:eject_removable_drive()
This patch #if 0's the unused eject_removable_drive().
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e1faa9da284d14487ed4280b4e87cfde8e1539af
Author: Corentin Chary <corentincj at iksaif.net>
Date: Thu Mar 13 12:57:18 2008 +0100
eeepc-laptop: add hwmon fan control
Adds an hwmon interface to control the fan.
Signed-off-by: Corentin Chary <corentincj at iksaif.net>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a5fa429b4b19cccd3f91a98af891c7ba2706cc1d
Author: Corentin Chary <corentincj at iksaif.net>
Date: Thu Mar 13 12:56:37 2008 +0100
eeepc-laptop: add backlight
Add backlight class support to the eeepc-laptop driver.
Signed-off-by: Corentin Chary <corentincj at iksaif.net>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e59f87966adef2cb03d419530e3ade5159487d6d
Author: Eric Cooper <ecc at cmu.edu>
Date: Thu Mar 13 12:55:46 2008 +0100
eeepc-laptop: add base driver
This patch is based on Eric Cooper's work to clean the original asus_acpi
given by Asus. It's a platform driver (/sys/devices/platform/eeepc/)
wich support:
- hotkeys - wlan on/off - camera on/off - cardr on/off
Signed-off-by: Corentin Chary <corentincj at iksaif.net>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 68f12ae5d778279e13e406d3913c74c592307770
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:30 2008 -0300
ACPI: thinkpad-acpi: bump up version to 0.20
Full LED sysfs support, and the rest of the assorted minor fixes and
enhancements are a good reason to checkpoint a new version...
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 3f6cb5630a5994f58c3cf620d0f6d71ff626229d
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:29 2008 -0300
ACPI: thinkpad-acpi: fix selects in Kconfig
Add missing select for BACKLIGHT_LCD_SUPPORT, as select doesn't select the
dependencies of a symbol for us.
Also, "select INPUT" in Kconfig. We are not an Input device, nor are we
anywhere close to the input subsystem in the Kconfig tree, so using
"depends on INPUT" is not user-friendly at all.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e0e3c0615abdb1c3e28356595f7be87627288d5b
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:28 2008 -0300
ACPI: thinkpad-acpi: use a private workqueue
Switch all task workers to a private thinkpad-acpi workqueue.
This way, we don't risk causing trouble for other tasks scheduled to the
default work queue, as our workers end up needing to access the ACPI EC,
run ACPI AML code, trigger SMI traps... and none of those are exactly known
to be fast, simple operations.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 10cc92759bb5d6031d308bdde96775f74082bb44
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:27 2008 -0300
ACPI: thinkpad-acpi: fluff really minor fix
Fix a minor (nano?) thing that bothered me at exactly at the wrong time.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 65807cc284dd291b024dd6e55de88feb16b4230a
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:26 2008 -0300
ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
Change all occourences of the "led" word to full uppercase in user
documentation.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit af116101924914a9655dfad108548d0db58c40f9
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:25 2008 -0300
ACPI: thinkpad-acpi: add sysfs led class support to thinkpad leds (v3.2)
Add a sysfs led class interface to the led subdriver.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Cc: Richard Purdie <rpurdie at rpsys.net>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e306501d1c4ff610feaba74ac35dd13e470480e6
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:24 2008 -0300
ACPI: thinkpad-acpi: add sysfs led class support for thinklight (v3.1)
Add a sysfs led class interface to the thinklight (light subdriver).
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Cc: Richard Purdie <rpurdie at rpsys.net>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 4fa6811b8ade1b7839342824939817a8fc751539
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:23 2008 -0300
ACPI: thinkpad-acpi: prepare light and LED for sysfs support
Do some preparatory work to add sysfs support to the thinklight and
thinkpad leds driver.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 95e57ab2cbd8b016327b23d76da8a96cbd26ac0c
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:22 2008 -0300
ACPI: thinkpad-acpi: claim tpacpi as an official short handle (v1.1)
Unfortunately, a lot of stuff in the kernel has size limitations, so
"thinkpad-acpi" ends up eating up too much real estate. We were using
"tpacpi" in symbols already, but this shorthand was not visible to
userland.
Document that the driver will use tpacpi as a short hand where necessary,
and use it to name the kernel thread for NVRAM polling (now named
"ktpacpi_nvramd").
Also, register a module alias with the shorthand. One can refer to the
module using the shorthand name.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e11aecf1379e7c4a0293182096e38e5a336696b2
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:21 2008 -0300
ACPI: thinkpad-acpi: fix brightness dimming control bug
ibm-acpi and thinkpad-acpi did not know about bit 5 of the EC backlight
level control register (EC 0x31), so it was always forced to zero on
any writes.
This would disable the BIOS option to *not* use a dimmer backlight level
scale while on battery, and who knows what else (there are two other
control bits of unknown function).
Bit 5 controls the "reduce backlight levels when on battery" optional
functionality (active low). Bits 6 and 7 are better left alone as well,
instead of being forced to zero.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 2d5e94d7ca315f859a0eee1366838e8ad34dd7b2
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:20 2008 -0300
ACPI: thinkpad-acpi: rate-limit CMOS/EC unsynced error messages
If userspace applications mess with the CMOS NVRAM, or something causes
both the ACPI firmware and thinkpad-acpi to try to change the brightness at
the same time, it is possible to have the CMOS and EC registers for the
current brightness go out of sync.
Should that happen, thinkpad-acpi could be really obnoxious when using a
brightness_mode of 3 (both EC and CMOS). Instead of complaining a massive
number of times, make sure to complain only once until EC and CMOS are back
in sync.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Cc: Joerg Platte <lists at naasa.net>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 8c74adbc692a3cb040cc69d7ca3dfd86d75860a8
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:19 2008 -0300
ACPI: thinkpad-acpi: enhance box identification output (v2)
During initialization, thinkpad-acpi outputs some messages to make sure
releavant box identification information is easily available in-line with
the rest of the driver messages.
Enhance those messages to output the alfanumeric model number as well.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 92889022250d736e135ca92fbffd1ab0ea4780d1
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:18 2008 -0300
ACPI: thinkpad-acpi: warn once about weird hotkey masks
thinkpad-acpi knows for a while now how to best program the hotkeys by
default, and always enable them by default. Unfortunately, this
information has not filtered down everywhere it needs to, yet. Notably,
old ibm-acpi documentation and most "thinkpad setup guides" will have wrong
information on this area.
Warn the local admin once whenever any of the following patterns are met:
1. Attempts to set hotkey mask to 0xffff (artifact from docs and config
for the old ibm-acpi driver and behaviour). This mask makes no
real-world sense;
2. Attempts to set hotkey mask to 0xffffffff, which means the user is
trying to just have "everything work" without even reading the
documentation, or that we need to get a bug report, because there
is a new thinkpad out there with new exciting hot keys :-)
3. Attempts to set hotkey mask to 0xffffff, which is almost never the
correct way to set up volume and brightness event reporting (and with
the current state-of-the-art, it is known to never be right way to do
it).
The driver will perform any and all requested operations, though,
regardless of any warnings. I hope these warnings can be removed one or
two years from now.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit b59727965d7f286489206c292e2788d4835a8a23
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sat Apr 26 01:02:17 2008 -0300
ACPI: thinkpad-acpi: BIOS backlight mode helper (v2.1)
Lenovo ThinkPads with generic ACPI backlight level control can be easily
set to react to keyboard brightness key presses in a more predictable way
than what they do when in "DOS / bootloader" mode after Linux brings
up the ACPI interface.
The switch to the ACPI backlight mode in the firmware is designed to be
safe to use only as an one way trapdoor. One is not to force the firmware
to switch back to "DOS/bootloader" mode except by rebooting. The mode
switch itself is performed by calling any of the ACPI _BCL methods at least
once.
When in ACPI mode, the backlight firmware just issues (standard) events for
the brightness up/down hot key presses along with the non-standard HKEY
events which thinkpad-acpi traps, and doesn't touch the hardware.
thinkpad-acpi will:
1. Place the ThinkPad firmware in ACPI backlight control mode
if one is available
2. Suppress HKEY backlight change notifications by default
to avoid double-reporting when ACPI video is loaded when
the ThinkPad is in ACPI backlight control mode
3. Urge the user to load the ACPI video driver
The user is free to use either the ACPI video driver to get the brightness
key events, or to override the thinkpad-acpi default hotkey mask to get
them from thinkpad-acpi as well (this will result in duplicate events if
ACPI video is loaded, so let's hope distros won't screw this up).
Provided userspace is sane, all should work (and *keep* working), which is
more that can be said about the non-ACPI mode of the new Lenovo ThinkPad
BIOSes when coupled to current userspace and X.org drivers.
Full guidelines for backlight hot key reporting and use of the
thinkpad-acpi backlight interface have been added to the documentation.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Cc: Matthew Garrett <mjg59 at srcf.ucam.org>
Cc: Thomas Renninger <trenn at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 822252521651ad74a6d41e712d790e2f10838a67
Author: Bartlomiej Sieka <tur at semihalf.com>
Date: Tue Apr 15 20:36:36 2008 +1000
[POWERPC] mpc5200: defconfigs for CM5200, Lite5200B, Motion-PRO and TQM5200
Board-specific defconfigs based on current mpc5200_defconfig, archival
lite5200_defconfig, and [cm5200|motionpro|tqm5200]_defconfig from the
linux-2.6-denx tree. Kernels build using these defconfigs were verified
to boot with root filesystem mounted over NFS on Motion-PRO, TQM5200
and Lite5200B boards. CM5200 target was not tested due to hardware
unavailability.
Signed-off-by: Bartlomiej Sieka <tur at semihalf.com>
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit a2884f37b6fe0074df70ebeb3a6c54201267663c
Author: Grant Likely <grant.likely at secretlab.ca>
Date: Tue Apr 29 07:19:07 2008 -0600
[POWERPC] mpc5200: Switch mpc5200 dts files to dts-v1 format
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit 8f3ba2dc811228213bcbdc2c8b389a8d6fa66c09
Author: Sascha Hauer <s.hauer at pengutronix.de>
Date: Wed Apr 16 01:44:39 2008 +1000
[POWERPC] mpc5200: Fix FEC error handling on FIFO errors
The error handling for the mpc5200 fec interrupt is broken. The intended
behaviour is like this:
* If one of FEC_IEVENT_RFIFO_ERROR and FEC_IEVENT_XFIFO_ERROR happens,
the datasheet says (MPC5200B User's Guide R1.2, p. 14-13): "When this
occurs, software must ensure both the FIFO Controller and BestComm are
soft-reset".
* On any other error (non-TFINT) interrupt, just issue a debug message.
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit 106757b38fffbe1f015b10a6d4a4f92e8a3881b9
Author: s.hauer at pengutronix.de <s.hauer at pengutronix.de>
Date: Fri Apr 25 23:48:05 2008 +1000
[POWERPC] mpc5200: add Phytec pcm030 board support
Add board support for the Phytec pcm030 mpc5200b based board. It
does not need any platform specific fixups and as such is handled
as a mpc5200 simple platform.
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit 3cd2550c736688c7f2651134e08bd5b5db5bed70
Author: s.hauer at pengutronix.de <s.hauer at pengutronix.de>
Date: Fri Apr 25 20:56:04 2008 +1000
[POWERPC] mpc5200: add gpiolib support for mpc5200
This patch adds gpiolib support for mpc5200 SOCs.
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit f800ab44f5cd094743dc3df371bcf986375f5774
Author: Sascha Hauer <s.hauer at pengutronix.de>
Date: Wed Apr 16 01:29:54 2008 +1000
[POWERPC] mpc5200: add interrupt type function
Add a set_type function for external (GPIO) interrupts.
Signed-off-by: Juergen Beisert <j.beisert at pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit bc775eac63c16dbcfabc4c6e949c0228edf3e11f
Author: Grant Likely <grant.likely at secretlab.ca>
Date: Tue Apr 29 06:40:37 2008 -0600
[POWERPC] mpc5200: Fix unterminated of_device_id table
If CONFIG_PPC_MPC5121 is not set, then the of_device_id table for the
mpc5200 serial driver will not get terminated with a NULL entry.
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit ac9fafa1243640349aa481adf473db283a695766
Author: Alan D. Brunelle <Alan.Brunelle at hp.com>
Date: Tue Apr 29 14:44:19 2008 +0200
block: Skip I/O merges when disabled
The block I/O + elevator + I/O scheduler code spend a lot of time trying
to merge I/Os -- rightfully so under "normal" circumstances. However,
if one were to know that the incoming I/O stream was /very/ random in
nature, the cycles are wasted.
This patch adds a per-request_queue tunable that (when set) disables
merge attempts (beyond the simple one-hit cache check), thus freeing up
a non-trivial amount of CPU cycles.
Signed-off-by: Alan D. Brunelle <alan.brunelle at hp.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit d7e3c3249ef23b4617393c69fe464765b4ff1645
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue Apr 29 09:54:39 2008 +0200
block: add large command support
This patch changes rq->cmd from the static array to a pointer to
support large commands.
We rarely handle large commands. So for optimization, a struct request
still has a static array for a command. rq_init sets rq->cmd pointer
to the static array.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit d34c87e4ba3d1857f80a65179e81a18705a31656
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue Apr 29 14:37:52 2008 +0200
block: replace sizeof(rq->cmd) with BLK_MAX_CDB
This is a preparation for changing rq->cmd from the static array to a
pointer.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Boaz Harrosh <bharrosh at panasas.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit e7b241a7715d2a0885f779f5baa63711d71b1d75
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue Apr 29 09:54:38 2008 +0200
ide: use blk_rq_init() to initialize the request
This converts ide to use blk_rq_init to initialize the request.
This is a preparation for large command support, which needs to
initialize the request in a proper way (that is, just doing a memset()
will not work).
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Jens Axboe <jens.axboe at oracle.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 4f54eec8311c3325888c29ce8e4496daf4dbe624
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue Apr 29 09:54:37 2008 +0200
block: use blk_rq_init() to initialize the request
Any path needs to call it to initialize the request.
This is a preparation for large command support, which needs to
initialize the request in a proper way (that is, just doing a memset()
will not work).
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 2a4aa30c5f967eb6ae874c67fa6fceeee84815f9
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue Apr 29 09:54:36 2008 +0200
block: rename and export rq_init()
This rename rq_init() blk_rq_init() and export it. Any path that hands
the request to the block layer needs to call it to initialize the
request.
This is a preparation for large command support, which needs to
initialize the request in a proper way (that is, just doing a memset()
will not work).
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 992b5bceee447a32ef2d617730ae0d03c063eedd
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue Apr 29 09:54:36 2008 +0200
block: no need to initialize rq->cmd with blk_get_request
blk_get_request initializes rq->cmd (rq_init does) so the users don't
need to do that.
The purpose of this patch is to remove sizeof(rq->cmd) and &rq->cmd,
as a preparation for large command support, which changes rq->cmd from
the static array to a pointer. sizeof(rq->cmd) will not make sense and
&rq->cmd won't work.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Alasdair G Kergon <agk at redhat.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 4917fa292558593d36b2880977ea206f7727dbe5
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue Apr 29 09:54:35 2008 +0200
block: no need to initialize rq->cmd in prepare_flush_fn hook
The block layer initializes rq->cmd (queue_flush calls rq_init) so
prepare_flush_fn hooks don't need to do that.
The purpose of this patch is to remove sizeof(rq->cmd), as a
preparation for large command support, which changes rq->cmd from the
static array to a pointer. sizeof(rq->cmd) will not make sense.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 6f6a036e6e061563efecb61505fc4cc3ca415f80
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 09:49:06 2008 +0200
block/blk-barrier.c:blk_ordered_cur_seq() mustn't be inline
This patch fixes the following build error with UML and gcc 4.3:
<-- snip -->
...
CC block/blk-barrier.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c: In function ‘blk_do_ordered’:
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:57: sorry, unimplemented: inlining failed in call to ‘blk_ordered_cur_seq’: function body not available
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:252: sorry, unimplemented: called from here
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:57: sorry, unimplemented: inlining failed in call to ‘blk_ordered_cur_seq’: function body not available
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/blk-barrier.c:253: sorry, unimplemented: called from here
make[2]: *** [block/blk-barrier.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 72ed0bf60ade8d2cc1f58276cb16add0af2c3e25
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 29 09:49:05 2008 +0200
block/elevator.c:elv_rq_merge_ok() mustn't be inline
This patch fixes the following build error with UML and gcc 4.3:
<-- snip -->
...
CC block/elevator.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c: In function ‘elv_merge’:
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c:73: sorry, unimplemented: inlining failed in call to ‘elv_rq_merge_ok’: function body not available
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c:103: sorry, unimplemented: called from here
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c:73: sorry, unimplemented: inlining failed in call to ‘elv_rq_merge_ok’: function body not available
/home/bunk/linux/kernel-2.6/git/linux-2.6/block/elevator.c:495: sorry, unimplemented: called from here
make[2]: *** [block/elevator.o] Error 1
make[1]: *** [block] Error 2
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 75ad23bc0fcb4f992a5d06982bf0857ab1738e9e
Author: Nick Piggin <npiggin at suse.de>
Date: Tue Apr 29 14:48:33 2008 +0200
block: make queue flags non-atomic
We can save some atomic ops in the IO path, if we clearly define
the rules of how to modify the queue flags.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit e90955c26d8af318658c45caadb1d330ac6a506c
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Mon Apr 21 14:14:44 2008 -0700
x86: fix PCI MSI breaks when booting with nosmp
set up sane APIC state even in the nosmp case.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9752082560b440e6a45624569d26802e20d1b8b4
Author: Hugh Dickins <hugh at veritas.com>
Date: Sun Apr 27 00:39:36 2008 +0100
x86: vget_cycles() __always_inline
Mark vget_cycles() as __always_inline, so gcc is never tempted to make
the vsyscall vread_tsc() dive into kernel text, with resulting SIGSEGV.
This was a self-inflicted wound: I've not seen that happen with unhacked
sources; but for debug reasons I'd changed my x86/Makefile to compile
no-unit-at-a-time, and that in conjunction with OPTIMIZE_INLINING=y
ended up with vget_cycles() in kernel text. Perhaps it can happen
in other ways: safer to use __always_inline.
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4c0587e6e42c5b679234d3dffda8a888dc0ff9c1
Author: Ian Campbell <ijc at hellion.org.uk>
Date: Sun Apr 27 12:21:11 2008 +0100
x86: add more boot protocol documentation
Signed-off-by: Ian Campbell <ijc at hellion.org.uk>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Acked-by: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 781fe2ebc0f44b32418d203ac023a541afdd042f
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 26 23:14:36 2008 +0200
bootprotocol: cleanup
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8008abbd87644c84f93a7a86fec88f1e14031901
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Wed Apr 16 18:45:35 2008 +0200
x86: fix warning in "x86: clean up vSMP detection"
The function detect_vsmp_box is a void function in the PCI case.
Change the !PCI stub to void too.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit e686d34156ef0e56b2ebec505b809018bc0dc73b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Sat Apr 26 21:00:17 2008 -0700
x86: !x & y typo in mtrr code
As written, this can never be true.
Spotted by the Sparse checker.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit eff0dee54674a449e7f160aad9f3e0d38e6983eb
Author: Daniel Walker <dwalker at mvista.com>
Date: Tue Apr 29 03:39:29 2008 -0700
atm: ambassador: vcc_sf semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 220fc3fc60e9ebeb5ecfe727e4819d9504f2b0b0
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 03:37:41 2008 -0700
MAINTAINERS: The socketcan-core list is subscribers-only.
When I posted a copy_to_user fixes, the list daemon refused to accept
the Cc: <this-list>, because I was not a subscriber.
I found, that other lists with such a feature are marked respectively
in the MAINTAINERS file.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: Oliver Hartkopp <oliver.hartkopp at volkswagen.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 443a70d50bdc212e1292778e264ce3d0a85b896f
Author: Philip Craig <philipc at snapgear.com>
Date: Tue Apr 29 03:35:10 2008 -0700
netfilter: nf_conntrack: padding breaks conntrack hash on ARM
commit 0794935e "[NETFILTER]: nf_conntrack: optimize hash_conntrack()"
results in ARM platforms hashing uninitialised padding. This padding
doesn't exist on other architectures.
Fix this by replacing NF_CT_TUPLE_U_BLANK() with memset() to ensure
everything is initialised. There were only 4 bytes that
NF_CT_TUPLE_U_BLANK() wasn't clearing anyway (or 12 bytes on ARM).
Signed-off-by: Philip Craig <philipc at snapgear.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0010e46577a27c1d915034637f6c2fa57a9a091c
Author: Timo Teras <timo.teras at iki.fi>
Date: Tue Apr 29 03:32:25 2008 -0700
ipv4: Update MTU to all related cache entries in ip_rt_frag_needed()
Add struct net_device parameter to ip_rt_frag_needed() and update MTU to
cache entries where ifindex is specified. This is similar to what is
already done in ip_rt_redirect().
Signed-off-by: Timo Teras <timo.teras at iki.fi>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 980c478ddbb720948967b028ddbb4179a025bc2c
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date: Tue Apr 29 03:29:03 2008 -0700
sch_sfq: use del_timer_sync() in sfq_destroy()
Let's delete timer reliably in sfq_destroy().
Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 42908c69f61f75dd70e424263ab89ee52040382b
Author: David L Stevens <dlstevens at us.ibm.com>
Date: Tue Apr 29 03:23:22 2008 -0700
net: Add compat support for getsockopt (MCAST_MSFILTER)
This patch adds support for getsockopt for MCAST_MSFILTER for
both IPv4 and IPv6. It depends on the previous setsockopt patch,
and uses the same method.
Signed-off-by: David L Stevens <dlstevens at us.ibm.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit be666e0a1345ed80f29cb30c73da0ec2ea5c5863
Author: David L Stevens <dlstevens at us.ibm.com>
Date: Tue Apr 29 03:23:00 2008 -0700
net: Several cleanups for the setsockopt compat support.
1) added missing "__user" for kgsr and kgf pointers
2) verify read for only GROUP_FILTER_SIZE(0). The group_filter
structure definition (via RFC) includes space for one source
in the source list array, but that source need not be present.
So, sizeof(group_filter) > GROUP_FILTER_SIZE(0). Fixed
the user read-check for minimum length to use the smaller size.
3) remove unneeded "&" for gf_slist addresses
Signed-off-by: David L Stevens <dlstevens at us.ibm.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 2ad17defd596ca7e8ba782d5fc6950ee0e99513c
Author: Julian Anastasov <ja at ssi.bg>
Date: Tue Apr 29 03:21:23 2008 -0700
ipvs: fix oops in backup for fwmark conn templates
Fixes bug http://bugzilla.kernel.org/show_bug.cgi?id=10556
where conn templates with protocol=IPPROTO_IP can oops backup box.
Result from ip_vs_proto_get() should be checked because
protocol value can be invalid or unsupported in backup. But
for valid message we should not fail for templates which use
IPPROTO_IP. Also, add checks to validate message limits and
connection state. Show state NONE for templates using IPPROTO_IP.
Signed-off-by: Julian Anastasov <ja at ssi.bg>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8cd0ae3acc0154f3f9dfa1b4a2b7c02c271533f6
Author: Huang Weiyi <hwy at cn.fujitsu.com>
Date: Tue Apr 29 03:19:38 2008 -0700
sparc64: remove duplicated include
Remove dulicated include file <asm/timer.h> in arch/sparc64/kernel/smp.c.
Signed-off-by: Huang Weiyi <hwy at cn.fujitsu.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit d69efb16891ddfa6c0b527f912a7193054d50281
Author: Bodo Stroesser <bstroesser at fujitsu-siemens.com>
Date: Tue Apr 29 03:18:13 2008 -0700
bridge: kernel panic when unloading bridge module
There is a race condition when unloading bridge and netfilter.
The problem happens if __fake_rtable is in use by a skb
coming in, while someone starts to unload bridge.ko.
br_netfilter_fini() is called at the beginning of unload
in br_deinit() while skbs still are being forwarded and
transferred to local ip stack. Thus there is a possibility
of the __fake_rtable pointer not being removed in a skb that
goes up to ip stack. This results in a kernel panic, as
ip_rcv() calls the input-function of __fake_rtable, which
is NULL.
Moving the call of br_netfilter_fini() to the end of
br_deinit() solves the problem.
Signed-off-by: Bodo Stroesser <bstroesser at fujitsu-siemens.com>
Signed-off-by: Stephen Hemminger <stephen.hemminger at vyatta.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 43af8532ecd74a61f9e7aeb27c026c1ee27915ca
Author: Volodymyr G Lukiianyk <volodymyrgl at gmail.com>
Date: Tue Apr 29 03:17:42 2008 -0700
bridge: fix error handling in br_add_if()
When device is added to bridge its refcnt is incremented (in new_nbp()), but if
error occurs during further br_add_if() operations this counter is not
decremented back. Fix it by adding dev_put() call in the error path.
Signed-off-by: Volodymyr G Lukiianyk <volodymyrgl at gmail.com>
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9a732ed6d0e126d4c8a818f42a13f3df11755bee
Author: Arnaud Ebalard <arno at natisbad.org>
Date: Tue Apr 29 03:16:34 2008 -0700
netfilter: {nfnetlink,ip,ip6}_queue: fix skb_over_panic when enlarging packets
While reinjecting *bigger* modified versions of IPv6 packets using
libnetfilter_queue, things work fine on a 2.6.24 kernel (2.6.22 too)
but I get the following on recents kernels (2.6.25, trace below is
against today's net-2.6 git tree):
skb_over_panic: text:c04fddb0 len:696 put:632 head:f7592c00 data:f7592c00 tail:0xf7592eb8 end:0xf7592e80 dev:eth0
------------[ cut here ]------------
invalid opcode: 0000 [#1] PREEMPT
Process sendd (pid: 3657, ti=f6014000 task=f77c31d0 task.ti=f6014000)
Stack: c071e638 c04fddb0 000002b8 00000278 f7592c00 f7592c00 f7592eb8 f7592e80
f763c000 f6bc5200 f7592c40 f6015c34 c04cdbfc f6bc5200 00000278 f6015c60
c04fddb0 00000020 f72a10c0 f751b420 00000001 0000000a 000002b8 c065582c
Call Trace:
[<c04fddb0>] ? nfqnl_recv_verdict+0x1c0/0x2e0
[<c04cdbfc>] ? skb_put+0x3c/0x40
[<c04fddb0>] ? nfqnl_recv_verdict+0x1c0/0x2e0
[<c04fd115>] ? nfnetlink_rcv_msg+0xf5/0x160
[<c04fd03e>] ? nfnetlink_rcv_msg+0x1e/0x160
[<c04fd020>] ? nfnetlink_rcv_msg+0x0/0x160
[<c04f8ed7>] ? netlink_rcv_skb+0x77/0xa0
[<c04fcefc>] ? nfnetlink_rcv+0x1c/0x30
[<c04f8c73>] ? netlink_unicast+0x243/0x2b0
[<c04cfaba>] ? memcpy_fromiovec+0x4a/0x70
[<c04f9406>] ? netlink_sendmsg+0x1c6/0x270
[<c04c8244>] ? sock_sendmsg+0xc4/0xf0
[<c011970d>] ? set_next_entity+0x1d/0x50
[<c0133a80>] ? autoremove_wake_function+0x0/0x40
[<c0118f9e>] ? __wake_up_common+0x3e/0x70
[<c0342fbf>] ? n_tty_receive_buf+0x34f/0x1280
[<c011d308>] ? __wake_up+0x68/0x70
[<c02cea47>] ? copy_from_user+0x37/0x70
[<c04cfd7c>] ? verify_iovec+0x2c/0x90
[<c04c837a>] ? sys_sendmsg+0x10a/0x230
[<c011967a>] ? __dequeue_entity+0x2a/0xa0
[<c011970d>] ? set_next_entity+0x1d/0x50
[<c0345397>] ? pty_write+0x47/0x60
[<c033d59b>] ? tty_default_put_char+0x1b/0x20
[<c011d2e9>] ? __wake_up+0x49/0x70
[<c033df99>] ? tty_ldisc_deref+0x39/0x90
[<c033ff20>] ? tty_write+0x1a0/0x1b0
[<c04c93af>] ? sys_socketcall+0x7f/0x260
[<c0102ff9>] ? sysenter_past_esp+0x6a/0x91
[<c05f0000>] ? snd_intel8x0m_probe+0x270/0x6e0
=======================
Code: 00 00 89 5c 24 14 8b 98 9c 00 00 00 89 54 24 0c 89 5c 24 10 8b 40 50 89 4c 24 04 c7 04 24 38 e6 71 c0 89 44 24 08 e8 c4 46 c5 ff <0f> 0b eb fe 55 89 e5 56 89 d6 53 89 c3 83 ec 0c 8b 40 50 39 d0
EIP: [<c04ccdfc>] skb_over_panic+0x5c/0x60 SS:ESP 0068:f6015bf8
Looking at the code, I ended up in nfq_mangle() function (called by
nfqnl_recv_verdict()) which performs a call to skb_copy_expand() due to
the increased size of data passed to the function. AFAICT, it should ask
for 'diff' instead of 'diff - skb_tailroom(e->skb)'. Because the
resulting sk_buff has not enough space to support the skb_put(skb, diff)
call a few lines later, this results in the call to skb_over_panic().
The patch below asks for allocation of a copy with enough space for
mangled packet and the same amount of headroom as old sk_buff. While
looking at how the regression appeared (e2b58a67), I noticed the same
pattern in ipq_mangle_ipv6() and ipq_mangle_ipv4(). The patch corrects
those locations too.
Tested with bigger reinjected IPv6 packets (nfqnl_mangle() path), things
are ok (2.6.25 and today's net-2.6 git tree).
Signed-off-by: Arnaud Ebalard <arno at natisbad.org>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0e93bb9459f56b50a2f71f2c230f4ad00ec40a73
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Apr 29 03:15:35 2008 -0700
netfilter: x_tables: fix net namespace leak when reading /proc/net/xxx_tables_names
The seq_open_net() call should be accompanied with seq_release_net() one.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit be8d0d7903af85d396449b34366e7f5b0c9cc58b
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Tue Apr 29 03:15:10 2008 -0700
netfilter: xt_TCPOPTSTRIP: signed tcphoff for ipv6_skip_exthdr() retval
if tcphoff remains unsigned, a negative ipv6_skip_exthdr() return value will
go unnoticed,
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 246eb2af060fc32650f07203c02bdc0456ad76c7
Author: John Heffner <johnwheffner at gmail.com>
Date: Tue Apr 29 03:13:52 2008 -0700
tcp: Limit cwnd growth when deferring for GSO
This fixes inappropriately large cwnd growth on sender-limited flows
when GSO is enabled, limiting cwnd growth to 64k.
Signed-off-by: John Heffner <johnwheffner at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ce447eb91409225f8a488f6b7b2a1bdf7b2d884f
Author: John Heffner <johnwheffner at gmail.com>
Date: Tue Apr 29 03:13:02 2008 -0700
tcp: Allow send-limited cwnd to grow up to max_burst when gso disabled
This changes the logic in tcp_is_cwnd_limited() so that cwnd may grow
up to tcp_max_burst() even when sk_can_gso() is false, or when
sysctl_tcp_tso_win_divisor != 0.
Signed-off-by: John Heffner <johnwheffner at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 6c39103ce5192bdb2195f3daab7323dfa44fb52e
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:48 2008 -0700
[RAPIDIO] Change RapidIO doorbell source and target ID field to 16-bit
Change RapidIO doorbell source and target ID field to 16-bit for
support large system size, which max rio devid is 65535.
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 7f620df839661b37ee679402ced7e32da6aa5446
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:44 2008 -0700
[RAPIDIO] Add RapidIO connection info print out and re-training for broken connections
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 61b269179df582bb363f871e88f732fe8af62a5e
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:44 2008 -0700
[RAPIDIO] Add serial RapidIO controller support, which includes MPC8548, MPC8641
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 182e143beeb3529208f805f1ac543606c1e2cc8c
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:43 2008 -0700
[RAPIDIO] Add RapidIO node probing into MPC86xx_HPCN board id table
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 56fde1ff69b7f202171391b2d040a93e1d78b636
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:42 2008 -0700
[RAPIDIO] Add RapidIO node into MPC8641HPCN dts file
This adds properties describing the RapidIO controller to the
device-tree source for the MPC8641HPCN board.
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit e042323607f5c14844b1c59aebbca8d1251c7d89
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:42 2008 -0700
[RAPIDIO] Auto-probe the RapidIO system size
The RapidIO system size will auto probe in RIO setup. The route table
and rionet_active in rionet.c are changed to be allocated dynamically
according to the size of the system.
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit cc2bb6968a2c842149d285d77cb35200d2d37b15
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:41 2008 -0700
[RAPIDIO] Add OF-tree support to RapidIO controller driver
This initializes the RapidIO controller driver using addresses and
interrupt numbers obtained from the firmware device tree, rather than
using hardcoded constants.
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit ad1e9380b17addf112f89ce5a57d4d0bee129b7a
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:41 2008 -0700
[RAPIDIO] Add RapidIO multi mport support
The original RapidIO driver suppose there is only one mpc85xx RIO controller
in system. So, some data structures are defined as mpc85xx_rio global, such
as 'regs_win', 'dbell_ring', 'msg_tx_ring'. Now, I changed them to mport's
private members. And you can define multi RIO OF-nodes in dts file for multi
RapidIO controller in one processor, such as PCI/PCI-Ex host controllers in
Freescale's silicon. And the mport operation function declaration should be
changed to know which RapidIO controller is target.
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 5a7b60ed8892756b137496b629f2e7c689fe6d8d
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:40 2008 -0700
[RAPIDIO] Move include/asm-ppc/rio.h to asm-powerpc
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f1f389d558d3884be565f152e9dd756e57b23d50
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:39 2008 -0700
[RAPIDIO] Add RapidIO option to kernel configuration
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit d02443a6f89dbd7ff868db30ad18f90bb633f716
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Fri Apr 18 13:33:38 2008 -0700
[RAPIDIO] Change RIO function mpc85xx_ to fsl_
The driver is suitable for the Freescale MPC8641 processor as well as
85xx processors, so this changes the mpc85xx prefix to fsl.
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit e2fdd7fd99dd68b77caaf2a2272b75b5da890de7
Author: David S. Miller <davem at davemloft.net>
Date: Tue Apr 29 02:38:50 2008 -0700
sparc: Add kgdb support.
Current limitations:
1) On SMP single stepping has some fundamental issues,
shared with other sw single-step architectures such
as mips and arm.
2) On 32-bit sparc we don't support SMP kgdb yet. That
requires some reworking of the IPI mechanisms and
infrastructure on that platform.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4d7ffa49909a830f5f926a3280731d01e29f31fb
Author: David S. Miller <davem at davemloft.net>
Date: Tue Apr 29 01:36:14 2008 -0700
kgdbts: Sparc needs sstep emulation.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0a9e9b110c4ef05ab6c35440e2779ec4aa2c65e6
Author: David S. Miller <davem at davemloft.net>
Date: Tue Apr 29 01:14:10 2008 -0700
sparc32: Kill smp_message_pass() and related code.
Completely unused, and it just makes the SMP message
passing code on 32-bit sparc look more complex than
it is.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 68154e90c9d1492d570671ae181d9a8f8530da55
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Fri Apr 25 12:47:50 2008 +0200
block: add dma alignment and padding support to blk_rq_map_kern
This patch adds bio_copy_kern similar to
bio_copy_user. blk_rq_map_kern uses bio_copy_kern instead of
bio_map_kern if necessary.
bio_copy_kern uses temporary pages and the bi_end_io callback frees
these pages. bio_copy_kern saves the original kernel buffer at
bio->bi_private it doesn't use something like struct bio_map_data to
store the information about the caller.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 657e93be356f51888f56a58d2b374caefbf2fe86
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 25 12:46:58 2008 +0200
unexport blk_max_pfn
blk_max_pfn can now be unexported.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 31e103c595c0fa0d23eea5a4168362fba4c5ba62
Author: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Date: Fri Apr 25 12:46:20 2008 +0200
ps3disk: Remove superfluous cast
As ps3disk is a ppc64-only driver, sector_t equals to unsigned long, and the
cast is not needed.
Reuse in another (possibly 32-bit) driver is protected by the safety net called
`compiler warning' (with the cast, it may silently truncate to 32-bit).
If sector_t ever changes, we will get a compiler warning as well (with the
cast, we won't).
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Acked-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 1afb20f30151dd4160877c827f5b7203f98627fb
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Fri Apr 25 12:26:28 2008 +0200
block: make rq_init() do a full memset()
This requires moving rq_init() from get_request() to blk_alloc_request().
The upside is that we can now require an rq_init() from any path that
wishes to hand the request to the block layer.
rq_init() will be exported for the code that uses struct request
without blk_get_request.
This is a preparation for large command support, which needs to
initialize struct request in a proper way (that is, just doing a
memset() will not work).
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit c3270e577c18b3d0e984c3371493205a4807db9d
Author: Tom Zanussi <zanussi at comcast.ne>
Date: Thu Apr 24 12:52:20 2008 +0200
relay: fix splice problem
Splice isn't always incrementing the ppos correctly, which broke
relay splice.
Signed-off-by: Tom Zanussi <zanussi at comcast.net>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 51ae796f7fa1d8034252628572053f477bc29913
Author: Damián Viano <des at debian.org>
Date: Tue Apr 29 03:32:25 2008 -0400
ACPICA: always disable GPE when requested
acpi_ev_disable_gpe() has an optimization where it doesn't disable
a GPE that it "doesn't have to". Unfortunately, it can get tricked
by AML that scribbles on register state behind its back. So when asked
to disable a GPE, simply do it -- a redundant register write
in the common case is a fair price to pay to be bomb-proof
for the rare cases.
http://bugzilla.kernel.org/show_bug.cgi?id=6217
Signed-off-by: Damián Viano <des at debian.org>
Acked-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit dfd2e1b4e6eb46ff59c7e1c1111c967b8b5981c1
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:42 2008 -0600
PNPBIOS: remove include/linux/pnpbios.h
The contents of include/linux/pnpbios.h are used only inside the PNPBIOS
backend, so this file doesn't need to be visible outside PNP.
This patch moves the contents into an existing PNPBIOS-specific file,
drivers/pnp/pnpbios/pnpbios.h.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 261b20da4bd349f1b26e206f440809f1351be34b
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:41 2008 -0600
ISAPNP: remove unused pnp_dev->regs field
The "regs" field in struct pnp_dev is set but never read, so remove it.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 62cfb298b95d713825deb8faf2044c45a1e17a0a
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:40 2008 -0600
PNP: make interfaces private to the PNP core
The interfaces for registering protocols, devices, cards,
and resource options should only be used inside the PNP core.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit d152cf5d0c3325979e71ee53b425fdd51a1a285a
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:39 2008 -0600
PNPACPI: move _CRS/_PRS warnings closer to the action
Move warnings about _CRS and _PRS problems to the place where we
actually make the ACPI calls. Then we don't have to pass around
acpi_status values any more than necessary.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 01115e7d41c4eaeffa064d818b4abbd3efa94f80
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:38 2008 -0600
ISAPNP: fold isapnp_read_resources() back into isapnp_get_resources()
isapnp_get_resources() does very little besides call
isapnp_read_resources(), so just fold them back together.
Based on a patch by Rene Herman <rene.herman at gmail.com>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit d6180f36617953990bf90d4c1ff85b77e9995cd1
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:37 2008 -0600
PNP: make generic pnp_add_mem_resource()
Add a pnp_add_mem_resource() that can be used by all the PNP
backends. This consolidates a little more pnp_resource_table
knowledge into one place.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit cc8c2e308194f0997c718c7c735550ff06754d20
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:36 2008 -0600
PNP: make generic pnp_add_io_resource()
Add a pnp_add_io_resource() that can be used by all the PNP
backends. This consolidates a little more pnp_resource_table
knowledge into one place.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit dc16f5f2ede8cc2acf8ac22857a7fecf3a4296c2
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:35 2008 -0600
PNP: make generic pnp_add_dma_resource()
Add a pnp_add_dma_resource() that can be used by all the PNP
backends. This consolidates a little more pnp_resource_table
knowledge into one place.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit dbddd0383c59d588f8db5e773b062756e39117ec
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:34 2008 -0600
PNP: make generic pnp_add_irq_resource()
Add a pnp_add_irq_resource() that can be used by all the PNP
backends. This consolidates a little more pnp_resource_table
knowledge into one place.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a50b6d7b8d7e1a8b13bd1be65a865b115e1190d9
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:33 2008 -0600
PNP: add pnp_new_resource() to find a new unset pnp_resource
This encapsulates the code to locate a new pnp_resource of the
desired type. Currently this uses the pnp_resource_table, but
it will soon change to find a resource in a linked list.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 21855d69d1e3ace3efdb8159a4a7ab1ab98a6f19
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:32 2008 -0600
PNP: add pnp_resource index for ISAPNP
Save the ISAPNP config register index in the struct pnp_resource.
We need this because it is important to write ISAPNP configuration
back to the same registers we read it from. For example, if we
read valid regions from memory descriptors 0, 1, and 3, we'd
better write them back to the same registers, without compressing
them to descriptors 0, 1, and 2.
This was previously guaranteed by using the index into the
pnp_resource_table array as the ISAPNP config register index.
However, I am removing those fixed-size arrays, so we need to
save the ISAPNP register index elsewhere.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 0a977f15469457d9a19eed992caf71995c674064
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:31 2008 -0600
PNP: add pnp_get_pnp_resource()
In some places, we need to get the struct pnp_resource, not just
the struct resource, because ISAPNP needs to store the register
index in the pnp_resource.
I don't like pnp_get_pnp_resource() and hope that it is temporary,
but we need it for a little while.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 784f01d5bdeae7d7005ede17305306b042ba2617
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:30 2008 -0600
PNP: add struct pnp_resource
This patch adds a "struct pnp_resource". This currently
contains only a struct resource, but we will soon need
additional PNP-specific information.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 06cb58a6eb0b689f95a6c055cfc400fd30c500c6
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:29 2008 -0600
PNP: remove pnp_resource_table references from resource decoders
This removes a few more references to the pnp_resource_table.
No functional change.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 02d83b5da3efa3c278ce87db2637f3dd6837166d
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:28 2008 -0600
PNP: make pnp_resource_table private to PNP core
There are no remaining references to the PNP_MAX_* constants or
the pnp_resource_table structure outside of the PNP core. Make
them private to the PNP core.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 8766ad0ce8621aa6f0e4a91ef355509cc3364d5b
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:27 2008 -0600
rtc: dont reference pnp_resource_table directly
pnp_resource_table is going away soon, so use the more
generic public interfaces instead.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 95ab3669f7830682c7762e9c305a0c1dd44454cc
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:26 2008 -0600
PNP: remove PNP_MAX_* uses
Remove some PNP_MAX_* uses. The pnp_resource_table isn't
dynamic yet, but with pnp_get_resource(), we can start moving
away from the table size constants.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit f6505fef18644557f732468c1f22f84560d8a819
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:25 2008 -0600
PNP: convert assign, interface to use pnp_get_resource(), not pnp_resource_table
This removes more direct references to pnp_resource_table from the
pnp_assign_resources() path and the /sys user interface path.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 7e2cf31f1c97ac14b6d9dc5f1ce9e1e01aef9c18
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:24 2008 -0600
PNP: convert encoders to use pnp_get_resource(), not pnp_resource_table
This removes more direct references to pnp_resource_table. This
path is used when telling a device what resources it should use.
This doesn't convert ISAPNP because ISA needs to know the config
register index in addition to the resource itself.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit be81b4a4838ce329b9f3978c7fc007b047c23722
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:23 2008 -0600
PNP: convert resource checks to use pnp_get_resource(), not pnp_resource_table
This removes more direct references to pnp_resource_table.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit f5d94ff014cb7e6212f40fc6644f3fd68507df33
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:22 2008 -0600
PNP: pass resources, not indexes, to pnp_check_port(), et al
The caller already has the struct resource pointer, so no need for
pnp_check_port(), pnp_check_mem(), etc., to look it up again.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit db9eaeab3e7ab72d773820820f1ba33960ad24c4
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:21 2008 -0600
PNP: check for conflicts with all resources, not just earlier ones
This patch removes a use of "idx" in pnp_check_port() and similar
functions, in preparation for replacing idx with a pointer to the
resource itself.
I split this out because it changes the behavior slightly: we used
to check for conflicts only with earlier resources, e.g., we checked
resource 2 against resources 0 and 1 but not against 3, 4, etc. Now
we will check against all resources except 2.
Since resources are assigned in ascending order, the old behavior
was probably safe, but I don't like to depend on that ordering.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 470feb113a23de365b6051efde0d69de86d9d2f8
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:20 2008 -0600
PNP: reduce redundancy in pnp_set_current_resources()
Use a temporary "res" pointer to replace repeated lookups in
the pnp resource tables.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 30c016a0c8d2aae10be6a87bb98f0e85db8b09d5
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:19 2008 -0600
PNP: reduce redundancy in pnp_check_port() and others
Use a temporary "res" pointer to replace repeated lookups in
the pnp resource tables.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 28ccffcf028777e830cbdc30bc54ba8a37e2fc23
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:18 2008 -0600
PNP: reduce redundancy in pnp_assign_port() and others
Use a temporary "res" pointer to replace repeated lookups in
the pnp resource tables.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit ecfa935a2f7ef89543608f3ca05340c158c9a236
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:17 2008 -0600
PNP: use conventional "i" for loop indices
Cosmetic only: just use "i" instead of "tmp".
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 13575e81bb38fc797a5513ad1bd8e6fda17439b8
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:16 2008 -0600
PNP: convert resource accessors to use pnp_get_resource(), not pnp_resource_table
This removes more direct references to pnp_resource_table.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 53052feb6ddd05cb2b5c6e89fb489bf83bbb6803
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:15 2008 -0600
PNP: remove pnp_mem_flags() as an lvalue
A future change will change pnp_mem_flags() from a "#define that
simplifies to an lvalue" to "an inline function that returns the
flags value."
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit b90eca0a61ebd010036242e29610bc6a909e3f19
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:14 2008 -0600
PNP: add pnp_get_resource() interface
This adds a pnp_get_resource() that works the same way as
platform_get_resource(). This will enable us to consolidate
many pnp_resource_table references in one place, which will
make it easier to make the table dynamic.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit d948a8daa059cf5b3e7f002e7b92acf00fc70c49
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:13 2008 -0600
PNP: factor pnp_init_resource_table() and pnp_clean_resource_table()
Move the common part of pnp_init_resource_table() and
pnp_clean_resource_table() into a new pnp_init_resource().
This reduces a little code duplication and will be
useful later to initialize an individual resource.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit af11cb2d521f9d7e10c565bafe8f2358772baa65
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:12 2008 -0600
PNP: use dev_printk when possible
Use dev_printk() when possible for more informative error messages.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 2cd1393098073426256cb4543c897f8c340d0b93
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:11 2008 -0600
PNP: remove unused interfaces using pnp_resource_table
Rene Herman <rene.herman at gmail.com> recently removed the only in-tree
driver uses of:
pnp_init_resource_table()
pnp_manual_config_dev()
pnp_resource_change()
in this change:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=109c53f840e551d6e99ecfd8b0131a968332c89f
These are no longer used in the PNP core either, so we can just remove
them completely.
It's possible that there are out-of-tree drivers that use these
interfaces. They should be changed to either (1) use PNP quirks
to work around broken hardware or firmware, or (2) use the sysfs
interfaces to control resource usage from userspace.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 6969c7ed558cf5e9eff01734be0174a296938092
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:10 2008 -0600
PNP: remove pnp_resource_table from internal pnp_clean_resource_table interface
This changes pnp_clean_resource_table() to take a pnp_dev pointer
rather than a pnp_resource_table pointer. This reduces the visibility
of pnp_resource_table and removes an opportunity for error in the
caller.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit f44900020926b2cb06b87f0f52643d6285514fc3
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:09 2008 -0600
PNP: add pnp_init_resources(struct pnp_dev *) interface
Add pnp_init_resources(struct pnp_dev *) to replace
pnp_init_resource_table(), which takes a pointer to the
pnp_resource_table itself. Passing only the pnp_dev * reduces
the possibility for error in the caller and removes the
pnp_resource_table implementation detail from the interface.
Even though pnp_init_resource_table() is exported, I did not
export pnp_init_resources() because it is used only by the PNP
core.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 81b5c75f0ed22a93c3da00650d0898eec56e1d62
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:08 2008 -0600
PNP: add debug when assigning PNP resources
This patch adds code to dump PNP resources before and after
assigning resources and before writing them to the device.
This is enabled by CONFIG_PNP_DEBUG=y.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 72dcc883d8e5b59105e75ee5265442e458740575
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:07 2008 -0600
PNP: add debug output to encoders
Add debug output to encoders (enabled by CONFIG_PNP_DEBUG). This
uses dev_printk, so I had to add pnp_dev arguments at the same time.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 4ab55d8d4f7b910c4c60e0f8ff70d0dfdd484f02
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:06 2008 -0600
PNP: remove more pnp_resource_table arguments
Stop passing around struct pnp_resource_table pointers. In most cases,
the caller doesn't need to know how the resources are stored inside
the struct pnp_dev.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 59284cb4099411bc6f4915a5a4cb76414440c447
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:05 2008 -0600
PNP: remove pnp_resource_table from internal get/set interfaces
When we call protocol->get() and protocol->set() methods, we currently
supply pointers to both the pnp_dev and the pnp_resource_table even
though the pnp_resource_table should always be the one associated with
the pnp_dev.
This removes the pnp_resource_table arguments to make it clear that
these methods only operate on the specified pnp_dev.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit c1caf06ccfd3a4efd4b489f89bcdabd2362f31d0
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:04 2008 -0600
PNP: add debug output to option registration
Add debug output to resource option registration functions (enabled
by CONFIG_PNP_DEBUG). This uses dev_printk, so I had to add pnp_dev
arguments at the same time.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit cdef6254e17e98f1071ce1bfc8f2a87997c855d0
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:03 2008 -0600
PNPACPI: pass pnp_dev instead of acpi_handle
Pass the pnp_dev pointer when possible instead of the acpi_handle.
This allows better error messages and reduces the chance of error
in the caller.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit cd7ec927d9cd3d2001cbbdce872bd73f6e49c986
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:02 2008 -0600
PNPACPI: extend irq_flags() to set IORESOURCE_IRQ_SHAREABLE when appropriate
This simplifies IRQ resource parsing slightly by computing all the
IORESOURCE_IRQ_* flags at the same time.
This also keeps track of shareability information when parsing options
from _PRS. Previously we ignored shareability in _PRS.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit bb84b41d1a1e3ad1ebe7f91a7c97d3b6ca242e9d
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:01 2008 -0600
PNPACPI: hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource()
Hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() into its
caller. This makes pnpacpi_parse_allocated_dmaresource() more similar
to pnpbios_parse_allocated_dmaresource().
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 9570a20e9da282721afc6885dbeaa1b9c1e7ff4d
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:34:00 2008 -0600
PNPACPI: use temporaries to reduce repetition
No functional change, just fewer words and fewer chances for
transcription errors.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit f7e8466a045c690002c1926e695ae312dd73bb4a
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:59 2008 -0600
PNPACPI: pnpacpi_encode_ext_irq() wrongly set "irq" instead of "extended_irq"
pnpacpi_encode_ext_irq() should set resource->data.extended_irq, not
resource->data.irq.
This has been wrong since at least 2.6.12. I haven't seen any bug
reports, but it's clearly incorrect.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 6bf2aab24a5dc26bf8274c4b9dbbed8ca99ae82c
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:58 2008 -0600
PNP: add pnp_alloc_card()
Add pnp_alloc_card() to allocate a struct pnp_card and fill in the
protocol, instance number, and initial PNP ID. Now it is always
valid to use dev_printk() on any pnp_card pointer.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 068076d5517009654376ceda75ff44af0feb9b1d
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:57 2008 -0600
ISAPNP: pull pnp_add_card_id() out of isapnp_parse_card_id()
Split the pnp_add_card_id() part from the PNPID conversion part so we
can move the initial add_id() into the pnp_card allocation.
This makes the PNPID conversion generic so we can use the same
one for both devices and cards.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e436675f2a09ea389c1844507658f304924a2eca
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:56 2008 -0600
PNP: change pnp_add_card_id() to allocate its own pnp_id structures
This moves some of the pnp_id knowledge out of the backends and into
the PNP core.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 048825deea5f261335b5202cd1114c53a3a21ae7
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:55 2008 -0600
PNP: make pnp_add_card_id() internal to PNP core
pnp_add_card_id() doesn't need to be exposed outside the PNP core, so
move the declaration to an internal header file.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit bda1e4e5a3d976046378cd495a63e1ee0847deec
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:54 2008 -0600
PNP: add pnp_alloc_dev()
Add pnp_alloc_dev() to allocate a struct pnp_dev and fill in the
protocol, instance number, and initial PNP ID. Now it is always
valid to use dev_printk() on any pnp_dev pointer.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 25eb846189d20db4114cebf14fee96d69bef4667
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:53 2008 -0600
PNP: add pnp_eisa_id_to_string()
Converting the EISA ID to a string is messy and error-prone, and
we might as well use the same code for ISAPNP and PNPBIOS.
PNPACPI uses the conversion done by the ACPI core with
acpi_ex_eisa_id_to_string().
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 772defc6292bae8b6db298476d1dabd22a99492b
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:52 2008 -0600
PNP: change pnp_add_id() to allocate its own pnp_id structures
This moves some of the pnp_id knowledge out of the backends and into
the PNP core.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1692b27bf37826f85f9c12f8468848885643532a
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:51 2008 -0600
PNP: make pnp_add_id() internal to PNP core
pnp_add_id() doesn't need to be exposed outside the PNP core, so
move the declaration to an internal header file.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 4a490498643ea37520c315769b293085b6018ddd
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:50 2008 -0600
PNPACPI: continue after _CRS and _PRS errors
Keep going and register the device even if we have trouble parsing
_CRS or _PRS. A parsing problem might mean we ignore some resources
the device is using, or we might not be able to change its resources.
But we should still take note of anything we *could* parse correctly.
Also remove reference to dev_id because I plan to remove it soon.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit ca0e8b6fd29819891c874b86ff286987c5bfdc21
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:49 2008 -0600
ISAPNP: move config register addresses out of isapnp.h
These are used only in drivers/pnp/isapnp/core.c, so no need to
expose them to the world.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-By: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1bd17e63a068db6f464925a79b1cc4b27a8b1af9
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 16:33:48 2008 -0600
PNP: turn on -DDEBUG when CONFIG_PNP_DEBUG is set
Turn on -DDEBUG in CFLAGS when CONFIG_PNP_DEBUG=y. This makes
dev_dbg() do what you expect.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-by: Rene Herman <rene.herman at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit ff16cab69b6ed621686cf342306785175775152d
Author: Len Brown <len.brown at intel.com>
Date: Tue Apr 29 03:12:17 2008 -0400
thermal: re-name thermal.c to thermal_sys.c
thermal_sys was already the name of the resulting module,
and it is built from this one source file.
Signed-off-by: Len Brown <len.brown at intel.com>
commit 76ecb4f2d7ea5c3aac8970b9529775316507c6d2
Author: Zhang, Rui <rui.zhang at intel.com>
Date: Thu Apr 10 16:20:23 2008 +0800
ACPI: update thermal temperature
Fix the problem that thermal_get_temp returns the cached value,
which causes the temperature in generic thermal never updates.
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 9030062f3d61f87c1e787b3aa134fa3a8e4b2d25
Author: Julia Lawall <julia at diku.dk>
Date: Fri Apr 11 10:09:24 2008 +0800
ACPI: elide a non-zero test on a result that is never 0
thermal_cooling_device_register used to return NULL if THERMAL is "n".
As the ACPI fan, processor and video drivers SELECT the generic
thermal in PATCH 01, this is not a problem any more.
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e9ae71078b2c8657c0e8de808b76b76049806906
Author: Zhang Rui <rui.zhang at intel.com>
Date: Tue Apr 22 08:50:09 2008 +0800
thermal: update the documentation
Update the documentation for the thermal driver hwmon sys I/F.
Change the ACPI thermal zone type to be consistent with hwmon.
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e68b16abd91dca91e35ea47537ef8a1b7ad72841
Author: Zhang Rui <rui.zhang at intel.com>
Date: Mon Apr 21 16:07:52 2008 +0800
thermal: add hwmon sysfs I/F
Add hwmon sys I/F for generic thermal driver.
Note: we have one hwmon class device for EACH TYPE of the thermal zone device.
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 9ec732ff80b7e8a9096666f78ae584d3b393bc84
Author: Zhang, Rui <rui.zhang at intel.com>
Date: Thu Apr 10 16:13:10 2008 +0800
thermal: add new get_crit_temp callback
Add a new callback so that the generic thermal can get
the critical trip point info of a thermal zone,
which is needed for building the tempX_crit hwmon sysfs attribute.
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 63c4ec905d63834a97ec7dbbf0a2ec89ef5872be
Author: Zhang Rui <rui.zhang at intel.com>
Date: Mon Apr 21 16:07:13 2008 +0800
thermal: add the support for building the generic thermal as a module
Build the generic thermal driver as module "thermal_sys".
Make ACPI thermal, video, processor and fan SELECT the generic
thermal driver, as these drivers rely on it to build the sysfs I/F.
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 2f67a0695dc389247c05041b05d2a2b06fc102a3
Author: Zhang Rui <rui.zhang at intel.com>
Date: Tue Apr 29 02:34:42 2008 -0400
flush kacpi_notify_wq before removing notify handler
Flush kacpi_notify_wq before notify handler is removed,
this can fix a bug which the deferred notify handler is executed
after the notify_handler has already been removed.
http://bugzilla.kernel.org/show_bug.cgi?id=9772
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 65c0d4e54ae4b81d8c8bb685169e48306656bb5c
Author: Sonic Zhang <sonic.zhang at analog.com>
Date: Fri Apr 25 17:19:25 2008 +0800
Fix bug - Implement bfin ata interrupt handler to avoid "irq 68 nobody cared" (v2)
Return IRQ_HANDLED when bfin ata device is busy.
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3513
v1-v2:
- fold api breakage fixing patch together.
- mark 'static', not 'inline'.
Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7368f91926a2870a8c3f9546d86535ce71ae0757
Author: Mark Lord <liml at rtr.ca>
Date: Fri Apr 25 11:24:24 2008 -0400
sata_mv: Improve naming of main_irq cause/mask identifiers
Tidy up naming of things associated with the PCI / SOC chip
"main irq cause/mask" registers, as inspired by Jeff.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 87340e98345155631f7a1a4d8d66cf0ab286cb1b
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 28 17:48:51 2008 +0900
libata-scsi: improve rbuf handling for simulated commands
Buffer length handling in simulated commands is error-prone and full
of bugs. There are a number of places where necessary length checks
are missing and if the output buffer is passed in as sglist, nothing
works.
This patch adds a static buffer ata_scsi_rbuf which is sufficiently
large to handle the larges output from simulated commands (4k
currently), let all simulte functions write to the buffer and removes
all length checks as we know that there always is enough buffer space.
Copying in (for ATAPI inquiry fix up) and out are handled by
sg_copy_to/from_buffer() behind ata_scsi_rbuf_get/put() interface
which handles sglist properly.
This patch is inspired from buffer length check fix patch from Petr
Vandrovec.
Updated to use sg_copy_to/from_buffer() as suggested by FUJITA
Tomonori.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Petr Vandrovec <petr at vmware.com>
Cc: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f0761be344f9b1cc4284b1d945933cd983c233a4
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 28 17:16:52 2008 +0900
libata-scsi: clean up inquiry / mode sense related functions
* make ata_scsiop_*() static
* make ata_scsi_set_sense() static and move it above its users
* make ata_scsi_rbuf_fill() static
* kill unused ata_scsi_badcmd()
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3dd654bfdf8905d0acb6f6231b5e736d2b0d4bc6
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Mon Apr 28 12:41:36 2008 +0100
[MIPS] ATA: Rename routerboard 500 to 532
The platform is actually named routerboard 532 so let's call it this. This
patch only rename files, Kconfig and C symbols; no functional changes.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit adaa693b845373296631766176ebf0f73a342e10
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Tue Apr 22 15:26:13 2008 +1000
[XFS] Fix build failure after enabling CONFIG_XFS_DEBUG
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit c5acbaf43da139fe014d78d1f0ca7754fa856ddb
Author: Christoph Hellwig <hch at lst.de>
Date: Mon Apr 21 18:11:13 2008 +1000
[XFS] remove dmapi cruft in xfs_file.c
The dmapi cruft in xfs_file.c is totally out of date in mainline vs
CVS, and at this point just removing this code which can't be used on
mainline at all seems to be the best option to keep it maintainable.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 3a738a5c73e0617d11b27ac46dd6a1a8f752017b
Author: Christoph Hellwig <hch at lst.de>
Date: Mon Apr 21 17:25:35 2008 +1000
[XFS] remove sendfile leftovers
Remove the last sendfile leftovers in mainline. This code is already
gone in CVS.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 7788fae6cce616fe2c624273fcfe54cf50f5c38b
Author: Christoph Hellwig <hch at lst.de>
Date: Mon Apr 21 17:22:27 2008 +1000
[XFS] allow enabling CONFIG_XFS_DEBUG
Back when I first submitted XFS for mainline inclusion we made the
decision that the debug code is far to extensive to be accidentally
enabled by users in mainline. But then again it's often quite useful
to track problems down and hacking the makefile all the time is rather
annoying. Given all the debug options with even more overhead like
lockdep or DEBUG_PAGE_ALLOC users (or rather developers) should know
by now what they're doing.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 359346a9655c8800408ed3ca44517ac7ea95c197
Author: David Chinner <dgc at sgi.com>
Date: Tue Apr 29 12:53:32 2008 +1000
[XFS] Don't initialise new inode generation numbers to zero
When we allocation new inode chunks, we initialise the generation numbers
to zero. This works fine until we delete a chunk and then reallocate it,
resulting in the same inode numbers but with a reset generation count.
This can result in inode/generation pairs of different inodes occurring
relatively close together.
Given that the inode/gen pair makes up the "unique" portion of an NFS
filehandle on XFS, this can result in file handles cached on clients being
seen on the wire from the server but refer to a different file. This
causes .... issues for NFS clients.
Hence we need a unique generation number initialisation for each inode to
prevent reuse of a small portion of the generation number space. Use a
random number to initialise the generation number so we don't need to keep
any new state on disk whilst making the new number difficult to guess from
previous allocations.
SGI-PV: 979416
SGI-Modid: xfs-linux-melb:xfs-kern:31001a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 86c4d62305649848164ae311a0959fc569b0d964
Author: David Chinner <dgc at sgi.com>
Date: Tue Apr 29 12:53:21 2008 +1000
[XFS] Fix check for block zero access in xfs_write_iomap_allocate()
The check for block zero access should be done on non-realtime inodes. Fix
the logic error in xfs_write_iomap_allocate(), and simplify the logic on
all checks for block zero access in xfs_iomap.c
SGI-PV: 980888
SGI-Modid: xfs-linux-melb:xfs-kern:30998a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit d349404ff14758dc9a2d3df032073ed795085860
Author: David Chinner <dgc at sgi.com>
Date: Tue Apr 29 12:53:15 2008 +1000
[XFS] Don't double count reserved block changes on UP.
On uniprocessor machines, the incore superblock is used for all in memory
accounting of free blocks. in this situation, changes to the reserved
block count are accounted twice; once directly and once via
xfs_mod_incore_sb(). Seeing as the modification on SMP is done via
xfs_mod_incore_sb(), make this the only update mechanism that UP uses as
well.
SGI-PV: 980654
SGI-Modid: xfs-linux-melb:xfs-kern:30997a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit fe0754f0e5c0f070bf82b6e7e5e8fa5a188163fc
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Apr 29 12:53:08 2008 +1000
[XFS] remove xfs_log_ticket_zone on rmmod
Fix bug introduced in commit eb01c9cd87c7a9998c2edf209721ea069e3e3652 aka
"[XFS] Remove the xlog_ticket allocator"
SGI-PV: 980887
SGI-Modid: xfs-linux-melb:xfs-kern:30995a
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 7155054c9d8b5974f6e788b46939b419bd5fb020
Author: Eric Sandeen <sandeen at sandeen.net>
Date: Tue Apr 29 12:53:00 2008 +1000
[XFS] fix non-smp xfs build
xfs_reserve_blocks() calls xfs_icsb_sync_counters_locked(), which is not
defined if !CONFIG_SMP/!HAVE_PERCPU_SB
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30991a
Signed-off-by: Eric Sandeen <sandeen at sandeen.net>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit d0313587547092af7f5ee8a576793e1e5d61be89
Author: Paul Gortmaker <paul.gortmaker at windriver.com>
Date: Thu Apr 17 00:08:10 2008 -0400
[netdrvr] gianfar: Determine TBIPA value dynamically
TBIPA needs to be set to a value (on connected MDIO buses) that
doesn't conflict with PHYs on the bus. By hardcoding it to 0x1f,
we were preventing boards with PHYs at 0x1f from working properly.
Instead, scan the bus when it comes up, and find an address that
doesn't have a PHY on it. The TBI PHY configuration code then
trusts that the value in TBIPA is either safe, or doesn't matter
(ie - it's not an active bus with other PHYs).
Signed-off-by: Andy Fleming <afleming at freescale.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9d88a2eb6e05c07aa0d484b8fa1372722fa921d0
Author: Badari Pulavarty <pbadari at us.ibm.com>
Date: Fri Apr 18 13:33:53 2008 -0700
[POWERPC] Provide walk_memory_resource() for powerpc
Provide walk_memory_resource() for 64-bit powerpc. PowerPC maintains
logical memory region mapping in the lmb.memory structure. Walk
through these structures and do the callbacks for the contiguous
chunks.
Signed-off-by: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 98d5c21c812e4e3b795f5bd912f407ed7c5e4e38
Author: Badari Pulavarty <pbadari at us.ibm.com>
Date: Fri Apr 18 13:33:52 2008 -0700
[POWERPC] Update lmb data structures for hotplug memory add/remove
The powerpc kernel maintains information about logical memory blocks
in the lmb.memory structure, which is initialized and updated at boot
time, but not when memory is added or removed while the kernel is
running.
This adds a hotplug memory notifier which updates lmb.memory when
memory is added or removed. This information is useful for eHEA
driver to find out the memory layout and holes.
NOTE: No special locking is needed for lmb_add() and lmb_remove().
Calls to these are serialized by caller. (pSeries_reconfig_chain).
Signed-off-by: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: "David S. Miller" <davem at davemloft.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 57b539269e9eef4dedc533d83c94877bc6b4d44d
Author: Badari Pulavarty <pbadari at us.ibm.com>
Date: Fri Apr 18 13:33:50 2008 -0700
[POWERPC] Hotplug memory remove notifications for powerpc
Hotplug memory remove notifier for 64-bit powerpc. This gets invoked
by writing to /proc/ppc64/ofdt the string "remove_node " followed by
the firmware device tree pathname of the node that needs to be removed.
In response, this adjusts the sections and removes sysfs entries by
calling __remove_pages(). Then it calls arch-specific code to get rid
of the hardware MMU mappings for the section of memory.
Signed-off-by: Badari Pulavarty <pbadari at us.ibm.com>
Reviewed-by: Michael Ellerman <michael at ellerman.id.au>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 18d18208daced52123de9ba0808447058d3442d8
Author: Donald Douwsma <donaldd at sgi.com>
Date: Tue Apr 22 17:34:56 2008 +1000
[XFS] Fix broken HAVE_SPLICE removal commit.
Commit e687330b5ed1ea899fdaf0dea50aba196b6e019a was meant to remove the
unused HAVE_SPLICE macro, instead an unrelated change was checked enabling
QUOTADEBUG when building DEBUG XFS. Restore the intended changes.
SGI-PV: 971046
SGI-Modid: xfs-linux-melb:xfs-kern:30924a
Signed-off-by: Donald Douwsma <donaldd at sgi.com>
Signed-off-by: Barry Naujok <bnaujok at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit ce46193bcaaf3c769718bcec6eae94719b8f53ed
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:34:50 2008 +1000
[XFS] kill XFS_ICSB_SB_LOCKED
With the last two patches XFS_ICSB_SB_LOCKED is never checked and only
superflously passed to xfs_icsb_count, so kill it.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30920a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 80ff974dba8cc432ab81676fc09d3c357cb11276
Author: Étienne Bersac <bersace at gmail.com>
Date: Tue Apr 29 15:39:55 2008 +1000
[POWERPC] windfarm: Add PowerMac 12,1 support
This implements a new driver named windfarm_pm121, which drives the
fans on PowerMac 12,1 machines : iMac G5 iSight (rev C) 17" and
20". It's based on the windfarm_pm81 driver from Benjamin
Herrenschmidt.
This includes fixes from David Woodhouse correcting the names of some
of the sensors.
Signed-off-by: Étienne Bersac <bersace at gmail.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 21e38dfee53a2159d14a24a3d2277ae757599efa
Author: Tony Breeds <tony at bakeyournoodle.com>
Date: Tue Apr 29 11:42:32 2008 +1000
[POWERPC] Fix building of pmac32 when CONFIG_NVRAM=m
Kamalesh Babulal (kamalesh at linux.vnet.ibm.com) reports that CONFIG_NVRAM=m
is valid in terms of Kconfig but fails to build with:
Building modules, stage 2.
MODPOST 1401 modules
ERROR: "pmac_newworld" [arch/powerpc/platforms/powermac/nvram.ko] undefined!
ERROR: "__alloc_bootmem" [arch/powerpc/platforms/powermac/nvram.ko] undefined!
make[1]: *** [__modpost] Error
The arch/powerpc/platforms/powermac/nvram.c code really needs to be
builtin, but as its compilation is dependent on a generic Kconfig
symbol we force nvram.c to be builtin if CONFIG_NVRAM is 'y' or 'm'.
Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 85218827cc4ca900867807f19345418164ffc108
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Mon Apr 28 16:21:22 2008 +1000
[POWERPC] Add IRQSTACKS support on ppc32
This makes it possible to use separate stacks for hard and soft IRQs
on 32-bit powerpc as well as on 64-bit. The code for 32-bit is just
the 32-bit analog of the 64-bit code.
* Added allocation and initialization of the irq stacks. We limit the
stacks to be in lowmem for ppc32.
* Implemented ppc32 versions of call_do_softirq() and call_handle_irq()
to switch the stack pointers
* Reworked how we do stack overflow detection. We now keep around the
limit of the stack in the thread_struct and compare against the limit
to see if we've overflowed. We can now use this on ppc64 if desired.
[ paulus at samba.org: Fixed bug on 6xx where we need to reload r9 with the
thread_info pointer. ]
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit dd18434ff0b7d9b9ad3d596985fc84b329d2f9a8
Author: Paul Mackerras <paulus at samba.org>
Date: Mon Apr 28 14:44:08 2008 +1000
[POWERPC] Use __always_inline for xchg* and cmpxchg*
This changes the definitions of the xchg and cmpxchg families of
functions in include/asm-powerpc/system.h to be marked __always_inline
rather than __inline__. The reason for doing this is that we rely on
the compiler inlining them in order to eliminate the references to
__xchg_called_with_bad_pointer and __cmpxchg_called_with_bad_pointer,
which are deliberately left undefined. Thus this change will enable
us to make the inline keyword be just a hint rather than a directive.
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 745a14cc264b1832c638e41812e0cb04328b2db1
Author: Paul Mackerras <paulus at samba.org>
Date: Mon Apr 28 13:52:31 2008 +1000
[POWERPC] Add fast little-endian switch system call
This adds a system call on 64-bit platforms for switching between
little-endian and big-endian modes that is much faster than doing a
prctl call. This system call is handled as a special case right at
the start of the system call entry code, and because it is a special
case, it uses a system call number which is out of the range of
normal system calls, namely 0x1ebe.
Measurements with lmbench on a 4.2GHz POWER6 showed no measurable
change in the speed of normal system calls with this patch.
Switching endianness with this new system call takes around 60ns on a
4.2GHz POWER6, compared with around 300ns to switch endian mode with a
prctl. This can provide a significant performance advantage for
emulators for little-endian architectures that want to switch between
big-endian and little-endian mode frequently, e.g. because they are
generating instructions sequences on the fly and they want to run
those sequences in little-endian mode.
The other thing about this system call is that it doesn't clobber as
many registers as a normal system call. It only clobbers r12.
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 45af6c6de6453b385c80555c0ee40ab5fc4a033b
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:34:44 2008 +1000
[XFS] split xfs_icsb_balance_counter
Add an xfs_icsb_balance_counter_locked for the case where mp->m_sb_lock is
already locked.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30918a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit d4d90b577ee5af5c1b29bd693aca026a77a1a2f1
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:34:37 2008 +1000
[XFS] Add xfs_icsb_sync_counters_locked for when m_sb_lock already held
Add a new xfs_icsb_sync_counters_locked for the case where m_sb_lock
is already taken and add a flags argument to xfs_icsb_sync_counters so
that xfs_icsb_sync_counters_flags is not needed.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30917a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit dac2f83fce01f0c2900918a4a8abd4c652151804
Author: Krzysztof Halasa <khc at pm.waw.pl>
Date: Sun Apr 20 19:06:39 2008 +0200
Driver for IXP4xx built-in Ethernet ports
Adds a driver for built-in IXP4xx Ethernet ports.
Signed-off-by: Krzysztof Hałasa <khc at pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 770f867991155f9c9e36a845a142f770d55ee67c
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Wed Apr 23 23:44:03 2008 +0200
ARM: am79c961a: platform_get_irq() may return signed unnoticed
dev->irq is unsigned, platform_get_irq() may return signed unnoticed
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0a0a83107c01a8dba04fa40ddb29ff021d4f8112
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date: Thu Apr 24 10:15:28 2008 +0200
netiucv: Fix missing driver attributes.
Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit efe3df6f6cfb587e662aa6f0cf9a9fde93d8af0b
Author: Frank Blaschka <frank.blaschka at de.ibm.com>
Date: Thu Apr 24 10:15:27 2008 +0200
qeth: layer 2 allow ethtool to set TSO
Allow ethtool to turn on/off EDDP via ethtool TSO interface.
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a74b08c7fcfc49727cb9e4409ec0410674410c93
Author: Ursula Braun <braunu at de.ibm.com>
Date: Thu Apr 24 10:15:26 2008 +0200
qeth: read number of ports from card
Read out number of ports from the hardware.
Signed-off-by: Ursula Braun <braunu at de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8af7c5aebc9a7b46f6ea55ee5a216dce4005f538
Author: Frank Blaschka <frank.blaschka at de.ibm.com>
Date: Thu Apr 24 10:15:25 2008 +0200
qeth: layer 3 add missing dev_open/close to ccwgroup handler
In case the ccwgroup device is set online/offline we have to run
the corresponding dev_open/close for the netdevice.
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f90b744eb8ead0af7a7aa2f78ff861dff4863f2c
Author: Frank Blaschka <frank.blaschka at de.ibm.com>
Date: Thu Apr 24 10:15:24 2008 +0200
qeth: rework fast path
Remove unnecessary traces. Remove unnecessary wrappers for skb
functions.
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3f9975aa4d5b3c614eef8785ec63da13fbd55b51
Author: Frank Blaschka <frank.blaschka at de.ibm.com>
Date: Thu Apr 24 10:15:23 2008 +0200
qeth: provide get ethtool settings
Load balancing bonding queries the speed of the slave interfaces.
To support a bond consisting of different slave speeds we have to
report the speed by ethtool settings.
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 213298f862d10ade909bdb7d833493d4bdad683d
Author: Frank Blaschka <frank.blaschka at de.ibm.com>
Date: Thu Apr 24 10:15:22 2008 +0200
qeth: layer 3 support vlan IPv6 on hiper socket
hiper socket require the QETH_HDR_EXT_VLAN_FRAME flag in the
qdio header to handle vlan tagged frames.
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit cd023216e64cc0359ec51312bef14ef2449535dd
Author: Peter Tiedemann <ptiedem at de.ibm.com>
Date: Thu Apr 24 10:15:21 2008 +0200
qeth module size reduction.
Replace complex macro for s390dbf calls by equivalent function. This reduces
module size about 10% without visible performance impact.
Signed-off-by: Peter Tiedemann <ptiedem at de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 022b660ae5d075ed9eaddef6f6fb7abb48bdf63b
Author: Ursula Braun <braunu at de.ibm.com>
Date: Thu Apr 24 10:15:20 2008 +0200
ccwgroup: Unify parsing for group attribute.
Instead of having each driver for ccwgroup slave device parsing the
input itself and calling ccwgroup_create(), introduce a new function
ccwgroup_create_from_string() and handle parsing inside the ccwgroup
core.
Signed-off-by: Ursula Braun <braunu at de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8bbf84404b02f193c5422c252264d7b82ffe4443
Author: Ursula Braun <braunu at de.ibm.com>
Date: Thu Apr 24 10:15:19 2008 +0200
netiucv: get rid of in_atomic() use
There is no urgent need to restart a netiucv connection automatically,
if packets are sent while the netiucv device is not up and running.
Signed-off-by: Ursula Braun <braunu at de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 93ad37d94d0b42e493d95b8a79181112c76ab459
Author: Klaus D. Wacker <kdwacker at de.ibm.com>
Date: Thu Apr 24 10:15:18 2008 +0200
lcs: CCL-sequ. numbers required for protocol 802.2 only.
Sequence numbers in skbs (Receive path) are assigned only to
802.2 packets.
Signed-off-by: Klaus D. Wacker <kdwacker at de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 679dce39e3cdfcc641b2888ce04f1cd5ff0b3b92
Author: Bryan Wu <cooloney at kernel.org>
Date: Fri Apr 25 11:53:11 2008 +0800
Blackfin EMAC Driver: Initial version of ethtool support
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7ef0a7ee2f9ac7ee8e2a597821adb2a78b882791
Author: Bryan Wu <cooloney at kernel.org>
Date: Fri Apr 25 11:53:10 2008 +0800
Blackfin EMAC Driver: code cleanup
- replace specific "bf537" function or data structure name to "bfin_mac"
- cleanup bfin_mac_probe with error checking
- punt set_pin_mux function, call peripheral request/free list functions directly
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4e5b864e7cac67f06f18147b1980cb6b8fb213ec
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Sat Apr 26 23:44:03 2008 -0700
net: eepro autoport typo
Found by sparse dubious !x & y warning...hidden in the GetBit macro
why !Word doesn't make any sense.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4d9b1a022a33c57ca8f31a1364cef682c8c817d6
Author: Steve Glendinning <steve.glendinning at smsc.com>
Date: Mon Apr 28 18:37:29 2008 +0100
Add support for SMSC LAN8187 and LAN8700 PHYs
Add support for two additional SMSC PHY models with identical interrupt
source and mask registers to the LAN83C185
Signed-off-by: Steve Glendinning <steve.glendinning at smsc.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 48c41b9941233a85ccdb88c579bd4e9b0ee609cf
Author: Steve Glendinning <steve.glendinning at smsc.com>
Date: Mon Apr 28 18:36:46 2008 +0100
Rename SMSC phy functions to be more generic
Several models of SMSC PHY have the same interrupt status and mask
registers as the LAN83C185, so these functions can service multiple
different PHY drivers.
Signed-off-by: Steve Glendinning <steve.glendinning at smsc.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 5d12b132bc0bfb10d3f8d81f92606719b5032dcb
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Mon Apr 28 10:58:22 2008 -0700
drivers/net/phy: fix kernel-doc notation
Fix kernel-doc warning:
Warning(linux-2.6.25-git11//drivers/net/phy/phy_device.c:275): No
description found for parameter 'bus_id'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 23d9b3871fa03af32d06f4946f8d56b1af55997b
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date: Mon Apr 28 21:09:40 2008 -0400
S2io: Version update for multi ring patches
- Updated version number.
Signed-off-by: Surjit Reang <surjit.reang at neterion.com>
Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0425b46a4beef234c522f183d5c2934edbb0f625
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date: Mon Apr 28 21:08:45 2008 -0400
S2io: Enable multi ring support
- Seperate ring specific data
- Initialize all configured rings with equal priority.
- Updated boundary check for number of Rings.
- Updated per ring statistics of rx_bytes and rx_packets.
- Moved lro struct from struct s2io_nic to struct ring_info.
- Access respective rx ring directly in fill_rx_buffers.
- Moved rx_bufs_left struct s2io_nic to struct ring_info.
- Added per ring variables - rxd_mode, rxd_count, dev, pdev.
Signed-off-by: Surjit Reang <surjit.reang at neterion.com>
Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit dfd44151e8888b964b7f2400f26794154a58c86b
Author: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Date: Tue Apr 29 03:07:31 2008 +0300
3c515: use netstats in net_device structure
Use net_device_stats from net_device structure instead of local.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 815f8802d201aba1ce343ba832daf639165f01a1
Author: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Date: Tue Apr 29 02:45:43 2008 +0300
3c509: use netstats in net_device structure
Use net_device_stats from net_device structure instead of local.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ba0f6caeb5d9cf6fbb99f84ff0f2731f04996595
Author: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Date: Tue Apr 29 02:27:37 2008 +0300
3c505: use netstats in net_device structure
Use net_device_stats from net_device structure instead of local.
No need to memset it to 0, because it is allocated by kzalloc.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit e8b0ebaa115ac46b21622b103c29927f5805aeaa
Author: Barry Naujok <bnaujok at sgi.com>
Date: Tue Apr 22 17:34:31 2008 +1000
[XFS] Cleanup xfs_attr a bit with xfs_name and remove cred
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30913a
Signed-off-by: Barry Naujok <bnaujok at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 5df78e73d328e870a1cd8a9e0f39bf094e42ce9d
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:34:24 2008 +1000
[XFS] kill usesless IHOLD calls in xfs_remove and xfs_rmdir
The VFS always has an inode reference when we call these functions. So we
only need to grab a signle reference to each inode that's joined to a
transaction - all the other bumping and dropping is as useless as the
comments describing the IRIX semantics.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30912a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 82dab941a192d081dd0b7cde3ed32603372d5acc
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:34:18 2008 +1000
[XFS] kill parent == child checks in xfs_remove and xfs_rmdir
VFS guaranteed these can't happen.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30911a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit dd32f7effdd2f3f348ef91ca1649d78a0ab2b103
Merge: 090bf62199d6079cc47c0b78ced9508391b24fa1 21e197f231343201368338603cb0909a13961bac
Author: Jeff Garzik <jeff at garzik.org>
Date: Tue Apr 29 01:54:31 2008 -0400
Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream
commit 1ac74e01df959e3e91baded7c83399372af945a2
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:34:12 2008 +1000
[XFS] kill usesless IHOLD calls in xfs_rename
Similar to to the previous patch for remove and rmdir only grab a
reference to inodes when we join them to transaction to balance the
decrement on transaction completion. Everything else it taken care of by
the VFS.
Note that the old case had leaks of inode count when src == target or src
or target == one of the parent inodes, but these cases are fortunately
already rejected by the VFS.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30904a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit cfa853e47df4fbee441ac0ac3fb592f076233145
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:34:06 2008 +1000
[XFS] remove manual lookup from xfs_rename and simplify locking
->rename already gets the target inode passed if it exits. Pass it down to
xfs_rename so that we can avoid looking it up again. Also simplify locking
as the first lock section in xfs_rename can go away now: the isdir is an
invariant over the lifetime of the inode, and new_parent and the nlink
check are namespace topology protected by i_mutex in the VFS. The projid
check needs to move into the second lock section anyway to not be racy.
Also kill the now unused xfs_dir_lookup_int and remove the now-unused
first_locked argumet to xfs_lock_inodes.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30903a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 579aa9caf552c639fc78168db4cfe7ffcf00c3b3
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:34:00 2008 +1000
[XFS] shrink mrlock_t
The writer field is not needed for non_DEBU builds so remove it. While
we're at i also clean up the interface for is locked asserts to go through
and xfs_iget.c helper with an interface like the xfs_ilock routines to
isolated the XFS codebase from mrlock internals. That way we can kill
mrlock_t entirely once rw_semaphores grow an islocked facility. Also
remove unused flags to the ilock family of functions.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30902a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit eca450b7c23f804597b87085b2a05bfc5b3ccb8b
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:33:52 2008 +1000
[XFS] simplify xfs_lookup
Opencode xfs-kill-xfs_dir_lookup_int here, which gets rid of a lock
roundtrip, and lots of stack space. Also kill the di_mode == 0 check that
has been done in xfs_iget for a few years now.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30901a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit d4377d84189349357e1812eaff6d0504766eea06
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:33:46 2008 +1000
[XFS] xfs_rename: pass resblks to xfs_dir_removename
Similar to rmdir and remove - avoids a potential transaction reservation
overrun.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30900a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 6a7f422d47d4af461704ebb9d7a389d9e59766b2
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:33:40 2008 +1000
[XFS] kill di_mode checks after xfs_iget
Unless XFS_IGET_CREATE is passed xfs_iget will return ENOENT if it
encounters an inode with di_mode == 0. Remove the duplicated checks in the
callers.
(the log recovery case is not touched for now)
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30898a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 4e5dbb3498e74514b9936d691413afc55fb84ea9
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:33:33 2008 +1000
[XFS] kill xfs_getattr
It's currently used by the ACL code to read di_mode/di_uid, but these are
simple 32bit scalar values we can just read directly without locking.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30897a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 42173f6860af7e016a950a9a19a66679cfc46d98
Author: Christoph Hellwig <hch at infradead.org>
Date: Tue Apr 22 17:33:25 2008 +1000
[XFS] Remove VN_IS* macros and related cruft.
We can just check i_mode / di_mode directly.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30896a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 62478fa4b7cd1bdf0ba8ff8a5e3a95c45c7b8ac8
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Fri Apr 18 13:42:54 2008 -0700
m32r: cleanup: drop .data.idt section in vmlinux.lds script
The section .data.idt is not used at all - so drop it.
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Acked-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Hirokazu Takata <takata at linux-m32r.org>
commit 7622b46451543872e7c8e75ec98f411f59e051b1
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 00:33:02 2008 +0300
m32r: use KBUILD_DEFCONFIG
With using KBUILD_DEFCONFIG we don't have to ship a second copy of
m32700ut.smp_defconfig
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Hirokazu Takata <takata at linux-m32r.org>
commit 090bf62199d6079cc47c0b78ced9508391b24fa1
Merge: 8ceee660aacb29721e26f08e336c58dc4847d1bd 697c269610179051cf19e45566fee3dcebbb1e93
Author: Jeff Garzik <jeff at garzik.org>
Date: Tue Apr 29 01:45:04 2008 -0400
Merge branch 'sis190' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream
commit 8ceee660aacb29721e26f08e336c58dc4847d1bd
Author: Ben Hutchings <bhutchings at solarflare.com>
Date: Sun Apr 27 12:55:59 2008 +0100
New driver "sfc" for Solarstorm SFC4000 controller.
The driver supports the 10Xpress PHY and XFP modules on our reference
designs SFE4001 and SFE4002 and the SMC models SMC10GPCIe-XFP and
SMC10GPCIe-10BT.
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a01e035ebb552223c03f2d9138ffc73f2d4d3965
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 16:50:04 2008 -0700
drivers: fix integer as NULL pointer warnings
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a6a3a17b7fdaf824e6d73e8e4a94c9d149302f74
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 16:50:03 2008 -0700
media: fix integer as NULL pointer warnings
drivers/media/video/v4l2-common.c:719:16: warning: Using plain integer as NULL pointer
drivers/media/video/au0828/au0828-dvb.c:122:19: warning: Using plain integer as NULL pointer
drivers/media/video/ivtv/ivtv-yuv.c:1101:22: warning: Using plain integer as NULL pointer
drivers/media/video/ivtv/ivtv-yuv.c:1102:23: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-audio.c:78:39: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-video-v4l.c:84:39: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1264:9: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-context.c:197:28: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:126:39: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-dvb.c:133:32: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-dvb.c:145:31: warning: Using plain integer as NULL pointer
drivers/media/video/pvrusb2/pvrusb2-dvb.c:177:55: warning: Using plain integer as NULL pointer
drivers/media/video/videobuf-core.c:100:9: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 172c122df5186e7cbd413d61757ff90267331002
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 16:50:03 2008 -0700
scsi: fix integer as NULL pointer warnings
drivers/scsi/aic7xxx/aic7770_osm.c:53:58: warning: Using plain integer as NULL pointer
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:355:47: warning: Using plain integer as NULL pointer
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:372:55: warning: Using plain integer as NULL pointer
drivers/scsi/aha152x.c:997:28: warning: Using plain integer as NULL pointer
drivers/scsi/aha152x.c:1003:28: warning: Using plain integer as NULL pointer
drivers/scsi/aha152x.c:1165:46: warning: Using plain integer as NULL pointer
drivers/scsi/fdomain.c:1446:40: warning: Using plain integer as NULL pointer
drivers/scsi/sym53c8xx_2/sym_hipd.c:1650:51: warning: Using plain integer as NULL pointer
drivers/scsi/sym53c8xx_2/sym_hipd.c:3171:42: warning: Using plain integer as NULL pointer
drivers/scsi/sym53c8xx_2/sym_hipd.c:5732:52: warning: Using plain integer as NULL pointer
drivers/scsi/ncr53c8xx.c:8189:31: warning: Using plain integer as NULL pointer
drivers/scsi/ncr53c8xx.c:8225:34: warning: Using plain integer as NULL pointer
drivers/scsi/dpt_i2o.c:156:32: warning: Using plain integer as NULL pointer
drivers/scsi/ultrastor.c:954:42: warning: Using plain integer as NULL pointer
drivers/scsi/ultrastor.c:1104:18: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8ab68ab420d5fc084b8cdd76a72df72c5e1cdb5d
Merge: f05c463be51898e745c4aa8245b05e25d73fa975 7b255436df0543856faaae4704034fe83bc20717
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 28 17:30:26 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (35 commits)
siimage: coding style cleanup (take 2)
ide-cd: clean up cdrom_analyze_sense_data()
ide-cd: fix test unsigned var < 0
ide: add TSSTcorp CDDVDW SH-S202H to ivb_list[]
piix: add Asus Eee 701 controller to short cable list
ARM: always select HAVE_IDE
remove the broken ETRAX_IDE driver
ide: remove ->dma_prdtable field from ide_hwif_t
ide: remove ->dma_vendor{1,3} fields from ide_hwif_t
scc_pata: add ->dma_host_set and ->dma_start methods
ide: skip "VLB sync" if host uses MMIO
ide: add ide_pad_transfer() helper
ide: remove ->INW and ->OUTW methods
ide: use IDE I/O helpers directly in ide_tf_{load,read}()
ns87415: add ->tf_read method
scc_pata: add ->tf_{load,read} methods
ide-h8300: add ->tf_{load,read} methods
ide-cris: add ->tf_{load,read} methods
ide: add ->tf_load and ->tf_read methods
ide: move ide_tf_{load,read} to ide-iops.c
...
commit f05c463be51898e745c4aa8245b05e25d73fa975
Merge: 8da56309f04d76a474791fd27b33ddd52062bcd6 5a1aa8a1aff6191ecc55f21d8b5f0e47108ed91b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 28 17:29:43 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kconfig: add named choice group
kconfig: fix choice dependency check
kconifg: 'select' considered less evil
dontdiff: ignore timeconst.h
dontdiff: add modules.order
kbuild: fix unportability in gen_initramfs_list.sh
kbuild: fix help output to show correct arch
kbuild: show defconfig subdirs in make help
kconfig: reversed borderlines in inputbox
commit 8da56309f04d76a474791fd27b33ddd52062bcd6
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 14:13:20 2008 -0700
drivers: atm, char fix integer as NULL pointer warnings
drivers/atm/nicstar.c:418:25: warning: Using plain integer as NULL pointer
drivers/char/drm/r128_cce.c:820:25: warning: Using plain integer as NULL pointer
drivers/char/tty_io.c:1183:10: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7b8ee84d8926e6c6ec584548d23a12f1410b4db7
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 14:13:19 2008 -0700
mm: fix integer as NULL pointer warnings
mm/hugetlb.c:207:11: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b331d259b1147f82d692f3b866e036017cbde8fe
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 14:13:19 2008 -0700
kernel: fix integer as NULL pointer warnings
kernel/cpuset.c:1268:52: warning: Using plain integer as NULL pointer
kernel/pid_namespace.c:95:24: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Reviewed-by: Paul Jackson <pj at sgi.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d613c3e2d841889f32b1e74f251a6a6bcd9642cf
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 14:13:14 2008 -0700
init: fix integer as NULL pointer warnings
init/do_mounts_rd.c:215:13: warning: Using plain integer as NULL pointer
init/do_mounts_md.c:136:45: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7b255436df0543856faaae4704034fe83bc20717
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Mon Apr 28 23:44:44 2008 +0200
siimage: coding style cleanup (take 2)
Fix 18 errors and several warnings given by checkpatch.pl:
- use of C99 // comments;
- trailing whitespace;
- 'switch' and 'case' not at the same indentation level;
- no space before the open parenthesis of the 'if' and 'switch' statements;
- space between function name and open parenthesis (though I have introduced
such warnins in some places since the code looks prettier with the spaces);
- including <asm/io.h> instead of <linux/io.h>;
- line over 80 characters.
In addition to these changes, also do the following:
- make the arrays in sil_set_pio_mode() 'static', and make the arrays in
sil_set_dma_mode() 'static const';
- change the string of the 'if' statements into the 'switch' statement in
sil_pata_udma_filter();
- drop the needless '==' operators from the 'if' statements where a condition
is a mere bit test;
- remove needless initializer for the 'tmp' variable in init_chipset_siimage();
- beautify groups of the variable initializers and assignment operators;
- add new line after variable definitions;
- remove new line between the comment and the statements it refers to;
- remove needless curly braces and parentheses;
- fix typos, capitalize acronyms, etc. in the comments...
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit eee49298ddb17ff6646a82b843f151e6a7a10edd
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Mon Apr 28 23:44:43 2008 +0200
ide-cd: clean up cdrom_analyze_sense_data()
[bart: fix handling of bio_sectors(failed_command->bio) == 0]
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Cc: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit a83ead23449759b14aa1f194576ac442e84d3efb
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Mon Apr 28 23:44:43 2008 +0200
ide-cd: fix test unsigned var < 0
valid is unsigned and cannot be below 0.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Cc: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3ced5c49bd2d1f2c7f769e3a54385883de63a652
Author: Alexander Smal <avsmal at gmail.com>
Date: Mon Apr 28 23:44:43 2008 +0200
ide: add TSSTcorp CDDVDW SH-S202H to ivb_list[]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1fa5a40f27e832b7c31e93d6dc2952a41ed277f7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:43 2008 +0200
piix: add Asus Eee 701 controller to short cable list
Based on ata_piix patch by Dan McGee.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 2064c946eaca641d28281264d01d0c8b977f1f20
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 28 23:44:43 2008 +0200
ARM: always select HAVE_IDE
It's plain wrong for PCMCIA to select HAVE_IDE that implies e.g. the
availability of an asm/ide.h
It turns out this was done for ARM, and we can simply always select
HAVE_IDE on ARM instead of manually tracking which platforms might
possible have an IDE controller directly or indirectly.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Russell King <rmk+lkml at arm.linux.org.uk>
Cc: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3f31b874600bcee53bac6846f72fbee5c33c8805
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 28 23:44:42 2008 +0200
remove the broken ETRAX_IDE driver
ETRAX_IDE was marked as broken last year with the comment
"it doesn't even compile currently".
Remove it since it won't get fixed in the near future.
On Mon, Apr 14, 2008 at 02:50:19PM +0200, Mikael Starvik wrote:
> You can remove it for now and we will resubmit a new if/when we get around
> to fix it.
[bart: ported it over IDE tree]
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Mikael Starvik <mikael.starvik at axis.com>
Cc: Jesper Nilsson <Jesper.Nilsson at axis.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 55224bc86a39409d55e47fd45573642ac709bb8f
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:42 2008 +0200
ide: remove ->dma_prdtable field from ide_hwif_t
* Use 'hwif->dma_base + {4,8}' instead of hwif->dma_prdtable in
{ide,scc}_dma_setup().
* Remove no longer needed ->dma_prdtable field from ide_hwif_t.
While at it:
* Use ATA_DMA_TABLE_OFS define.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 41051a141dcc67f4c5011a2ab2b547e80b9ac509
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:42 2008 +0200
ide: remove ->dma_vendor{1,3} fields from ide_hwif_t
* Use 'hwif->dma_base + {1,3}' instead of hwif->dma_vendor{1,3} in
pdc202xx_new host driver.
* Remove no longer needed ->dma_vendor{1,3} fields from ide_hwif_t.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 669185e98c242fa4dcd68cf11899412da1a70dd7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:41 2008 +0200
scc_pata: add ->dma_host_set and ->dma_start methods
Add ->dma_host_set and ->dma_start methods (+ __scc_dma_end() helper)
so scc_ide_{in,out}b() can be used directly.
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 22cdd6cedc93653a95965191e65a30619234a640
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:41 2008 +0200
ide: skip "VLB sync" if host uses MMIO
* Skip "VLB sync" in ata_{in,out}put_data() if host uses MMIO.
* Use I/O ops directly in ata_vlb_sync() an drop no longer needed
'ide_drive_t *drive' argument.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9f87abe892f899f19df8d472f937ee955cd6264b
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:41 2008 +0200
ide: add ide_pad_transfer() helper
* Add ide_pad_transfer() helper (which uses ->{in,out}put_data methods
internally so the transfer is also padded to drive+host requirements)
and use it instead of ide_atapi_{write_zeros,discard_data}().
* Remove no longer needed ide_atapi_{write_zeros,discard_data}().
Cc: Borislav Petkov <petkovbb at gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7c0daf2681f140dd9f39cd95966f471b5c904d8a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:41 2008 +0200
ide: remove ->INW and ->OUTW methods
* Remove no longer used ->INW and ->OUTW methods.
While at it:
* scc_pata.c: scc_ide_{out,in}w() is called only in scc_tf_{load,read}()
so inline it there.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ca545c1e75cd017bfd9a9b6c4f81f9b82ba20947
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:41 2008 +0200
ide: use IDE I/O helpers directly in ide_tf_{load,read}()
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ea23b8ba0068df281988bfba605f107edb01bf7f
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:40 2008 +0200
ns87415: add ->tf_read method
Add ->tf_read method so out{b,w}(), in{b,w}() and superio_ide_inb()
can be used directly.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit db2432c40f4afbf5869d4885adbd023c581dbd0b
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:40 2008 +0200
scc_pata: add ->tf_{load,read} methods
Add ->tf_{load,read} methods so scc_ide_{outb,outw,inb,inw}()
can be used directly.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 92fcaaa85ec2004abc148b70b667812a42ae8272
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:40 2008 +0200
ide-h8300: add ->tf_{load,read} methods
Add ->tf_{load,read} methods so outb()/inb() and mm_outw()/mm_inw()
can be used directly.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 6dbceb8c8083634ed4f5006deac12f0a45e6a7bc
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:40 2008 +0200
ide-cris: add ->tf_{load,read} methods
Add ->tf_{load,read} methods so cris_ide_{outb,outw,inb,inw}()
can be used directly.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 94cd5b62ff9bb07ef065333eb97438f115a75890
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:40 2008 +0200
ide: add ->tf_load and ->tf_read methods
* Add ->tf_load and ->tf_read methods to ide_hwif_t and set the default
methods in default_hwif_transport().
* Use ->tf_{load,read} instead o calling ide_tf_{load,read}() directly.
* Make ide_tf_{load,read}() static.
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d309e0bb8e5f29692f10790f3e966f05bbfc9355
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:39 2008 +0200
ide: move ide_tf_{load,read} to ide-iops.c
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 089c5c7e0089c3461545be936bcd236cbf16b79a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:39 2008 +0200
ide: factor out debugging code from ide_tf_load()
Factor out debugging code from ide_tf_load() to ide_tf_dump() helper
and update ide_tf_load() users accordingly.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1fc142589e58b20a67582974b8848595a2c7432e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:39 2008 +0200
ide: add ide_execute_pkt_cmd() helper
Add ide_execute_pkt_cmd() helper for executing PACKET command,
then convert ATAPI device drivers to use it.
As a nice side-effect this fixes ide-{floppy,tape,scsi} w.r.t.
ide_lock taking (ide-cd was OK).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3910dde6410e742f8bd3f516ee9b1a7114abbad0
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:39 2008 +0200
ide-{floppy,tape,scsi}: 400ns delay is required after executing the command
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 32b3fe4fff0974d823a0c0d17d7b25690ecd5fc8
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:38 2008 +0200
ide: always use ->OUTBSYNC method for executing commands
Always use ->OUTBSYNC method for executing commands so the posting is done
if needed (this affects only pmac and scc_pata host drivers at the moment).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 24cc434acc2b3aaf70eba4ba20890eca5fcfa686
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:38 2008 +0200
siimage: remove proc_reports_siimage()
* proc_reports_siimage() is now only called by init_chipset_siimage()
so inline it there.
* Use array instead of switch statement for reporting clock modes.
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 165701d9fc0e4e2bf2784119514877484ab361c5
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:38 2008 +0200
siimage: add sil_* I/O ops
Add sil_iowrite{8,16,32}() and sil_ioread{8,16}() helpers, then use them to
merge code accessing configuration registers through PCI and MMIO together.
[ because of this SATA initialization bits from setup_mmio_siimage() are
moved to init_chipset_siimage() ]
This also cuts code size a bit:
text data bss dec hex filename
4437 164 0 4601 11f9 drivers/ide/pci/siimage.o.before
3979 164 0 4143 102f drivers/ide/pci/siimage.o.after
While at it:
* Use I/O ops directly instead of using ->IN{B,W} and ->OUT{B,W}.
* Fixup CodingStyle in setup_mmio_siimage().
* Rename 'tmpbyte' variable to 'tmp' in init_chipset_siimage().
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 24a96ae0e34e743f3ee00501ad38f1cb4aa31429
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:38 2008 +0200
siimage: do clocking register posting earlier in setup_mmio_siimage()
Do clocking register posting earlier in setup_mmio_siimage()
to match code in init_chipset_siimage().
This is a preparation for the next patch which merges PCI and MMIO
code paths together.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 16bb69c14a42e64faef1ec5c724ffaca916347a1
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:37 2008 +0200
ide: remove ->INS{W,L} and ->OUTS{W,L} methods
* Use ins{w,l}()/outs{w,l}() and __ide_mm_ins{w,l}()/__ide_mm_outs{w,l}()
directly in ata_{in,out}put_data() (by using IDE_HFLAG_MMIO host flag to
decide which I/O ops are required).
* Remove no longer needed ->INS{W,L} and ->OUTS{W,L} methods (ide-h8300,
au1xxx-ide and scc_pata implement their own ->{in,out}put_data methods).
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit c5dd43ec65c1e1e378df043d517d40ed70a32cbe
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:37 2008 +0200
ide: add IDE_HFLAG_MMIO host flag (take 2)
* Add IDE_HFLAG_MMIO host flag and set it for hosts which use
default_hwif_mmiops().
v2:
* Fix kernel panic in pmac host driver (',' should be '|').
Thanks to Kamalesh for reporting it + testing the fix
and to Andrew for hinting me about the source of the issue.
Cc: Kamalesh Babulal <kamalesh at linux.vnet.ibm.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Cc: Andy Whitcroft <apw at shadowen.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f04ff9cbb6389a6db64659cf917a1b6ac159f9f2
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:37 2008 +0200
ide-h8300: add ->{in,out}put_data methods (take 2)
v2:
* Update ->{in,out}_data methods to take 'struct request *rq' argument.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 70f91e0d1410f77e0a22aa78fa2d591f1fd691a5
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:37 2008 +0200
au1xxx-ide: add ->{in,out}put_data methods (take 2)
v2:
* Update ->{in,out}_data methods to take 'struct request *rq' argument.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit efa3db1bb70c45a384419fdc257723cb167905ff
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:36 2008 +0200
scc_pata: add ->{in,out}put_data methods (take 2)
v2:
* Update ->{in,out}_data methods to take 'struct request *rq' argument
(thanks to Stephen Rothwell for catching it).
There should be no functional changes caused by this patch.
Cc: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Cc: Akira Iguchi <akira2.iguchi at toshiba.co.jp>
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9567b349f7e7dd7e2483db99ee8e4a6fe0caca38
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:36 2008 +0200
ide: merge ->atapi_*put_bytes and ->ata_*put_data methods
* Merge ->atapi_{in,out}put_bytes and ->ata_{in,out}put_data methods
into new ->{in,out}put_data methods which take number of bytes to
transfer as an argument and always do padding.
While at it:
* Use 'hwif' or 'drive->hwif' instead of 'HWIF(drive)'.
There should be no functional changes caused by this patch (all users
of ->ata_{in,out}put_data methods were using multiply-of-4 word counts).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 92d3ab27e8fd23d1a9dc3b69d17b2afb83e5c6f5
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:36 2008 +0200
falconide/q40ide: add ->atapi_*put_bytes and ->ata_*put_data methods (take 2)
* Add ->atapi_{in,out}put_bytes and ->ata_{in,out}put_data methods to
falconide and q40ide host drivers (->ata_* methods are implemented on
top of ->atapi_* methods so they also do byte-swapping now).
* Cleanup atapi_{in,out}put_bytes().
v2:
* Add 'struct request *rq' argument to ->ata_{in,out}put_data methods
and don't byte-swap disk fs requests (we shouldn't un-swap fs requests
because fs itself is stored byte-swapped on the disk) - this is how
things were done before the patch (ideally device mapper should be
used instead but it would break existing setups and would have some
performance impact).
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Michael Schmitz <schmitz at debian.org>
Cc: Roman Zippel <zippel at linux-m68k.org>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Cc: Richard Zidlicky <rz at linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 284aa76b5339ce79d5ad2ac1c7cbf717082816a7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Mon Apr 28 23:44:35 2008 +0200
ide: fix au1xxx-ide breakage
On Monday 28 April 2008, Sergei Shtylyov wrote:
> Hello, I wrote:
>
> > Fix these warnings emitted when compiling drivers/ide/mips/au1xxx-ide.c:
>
> > include/asm/mach-au1x00/au1xxx_ide.h:137: warning: 'auide_tune_drive' declared
> > `static' but never defined
> > include/asm/mach-au1x00/au1xxx_ide.h:138: warning: 'auide_tune_chipset' declared
> > `static' but never defined
>
> > by wiping out the whole "function prototyping" section from the header file
> > <asm-mips/mach-au1x00/au1xxx_ide.h> as it mostly declared functions that are
> > already dead in the IDE driver; move the only useful prototype into the driver.
> >
> > Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
>
> > ---
> > I'm not sure thru which tree this should go -- probably thru Linux/MIPS one...
>
> > Bart, au1xxx-ide-fix-mwdma-support.patch will probably need to be updated to
> > remove that added prototype since it won't be needed anymore...
>
> Which you haven't done either in that patch or in
> au1xxx-ide-use-init_dma-method.patch. So, face the consequences:
>
> drivers/ide/mips/au1xxx-ide.c:456: error: conflicting types for 'auide_ddma_init'
> drivers/ide/mips/au1xxx-ide.c:51: error: previous declaration of
> 'auide_ddma_init' was here
> drivers/ide/mips/au1xxx-ide.c:456: error: conflicting types for 'auide_ddma_init'
> drivers/ide/mips/au1xxx-ide.c:51: error: previous declaration of
> 'auide_ddma_init' was here
> drivers/ide/mips/au1xxx-ide.c:51: warning: 'auide_ddma_init' used but never
> defined
Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9d04d9280c4bbf6950b70b705bc4ace41de65615
Author: Roland McGrath <roland at redhat.com>
Date: Mon Apr 28 13:57:19 2008 -0700
ptrace: conditionalize compat_ptrace_request
My recent additions to compat_ptrace_request made it mandatory
for CONFIG_COMPAT arch's to define copy_siginfo_from_user32.
This broke some builds, though they all really should get cleaned
up in that way.
Since all the arch's that actually call compat_ptrace_request have
now been cleaned up to use the generic compat_sys_ptrace, we can
avoid the build problems on the crufty arch's by changing the
conditionals on the definition.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e97e386b126c2d60b8da61ce1e4964b41b3d1514
Merge: d9dedc13851f9cbd568fbc631a17b0be83404957 c124f5b54f879e5870befcc076addbd5d614663f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 28 14:08:56 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: pack objects denser
slub: Calculate min_objects based on number of processors.
slub: Drop DEFAULT_MAX_ORDER / DEFAULT_MIN_OBJECTS
slub: Simplify any_slab_object checks
slub: Make the order configurable for each slab cache
slub: Drop fallback to page allocator method
slub: Fallback to minimal order during slab page allocation
slub: Update statistics handling for variable order slabs
slub: Add kmem_cache_order_objects struct
slub: for_each_object must be passed the number of objects in a slab
slub: Store max number of objects in the page struct.
slub: Dump list of objects not freed on kmem_cache_close()
slub: free_list() cleanup
slub: improve kmem_cache_destroy() error message
slob: fix bug - when slob allocates "struct kmem_cache", it does not force alignment.
commit 5a1aa8a1aff6191ecc55f21d8b5f0e47108ed91b
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Fri Feb 29 05:11:50 2008 +0100
kconfig: add named choice group
As choice dependency are now fully checked, it's quite easy to add support
for named choices. This lifts the restriction that a choice value can only
appear once, although it still has to be within the same group,
but multiple choices can be joined by giving them a name.
While at it I cleaned up a little the choice type logic to simplify it a
bit.
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 48981178869bf7d9770f11fc361996ad11217a75
Author: Roman Zippel <zippel at linux-m68k.org>
Date: Fri Feb 29 05:10:24 2008 +0100
kconfig: fix choice dependency check
Properly check the dependency of choices as a group.
Also fix that sym_check_deps() correctly terminates the dependency loop
error check (otherwise it would continue printing the dependency chain).
Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit dfecbec8b54038ef02835d2f8181e1f44bd080d2
Author: Matthew Wilcox <matthew at wil.cx>
Date: Sat Apr 19 14:45:11 2008 -0600
kconifg: 'select' considered less evil
While select should be used with care, it is not actually evil.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit beda8ae7160bd7b521d9db274a27d8964dfba8ab
Author: Ben Dooks <ben-linux at fluff.org>
Date: Fri Apr 18 16:28:35 2008 +0100
dontdiff: ignore timeconst.h
Ignore the autobuilt kernel/timeconst.h when
using diff on an built kernel tree.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit a72a431bf8aefee7552bffd2bcdfd5c3a09605d1
Author: Ben Dooks <ben-linux at fluff.org>
Date: Fri Apr 18 16:18:16 2008 +0100
dontdiff: add modules.order
Add modules.order to the list of files that
shoud be ignored when using diff on a built
kernel tree.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit b5a5e4c73228e1c5f646ee2524f5e13ae5f08b4d
Author: Felix Fietkau <nbd at openwrt.org>
Date: Wed Apr 2 14:50:05 2008 +0200
kbuild: fix unportability in gen_initramfs_list.sh
On a Mac OS X machine the output of ls -l is different from a standard
Linux machine. Use readlink instead of parsing a hardcoded field number
from the ls output.
Signed-off-by: Felix Fietkau <nbd at openwrt.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit d9dedc13851f9cbd568fbc631a17b0be83404957
Author: Roland McGrath <roland at redhat.com>
Date: Sun Apr 27 18:45:38 2008 -0700
x86_64 vDSO: use initdata
The 64-bit vDSO image is in a special ".vdso" section for no reason
I can determine. Furthermore, the location of the vdso_end symbol
includes some wrongly-calculated padding space in the image, which
is then (correctly) rounded to page size, resulting in an extra page
of zeros in the image mapped in to user processes.
This changes it to put the vdso.so image into normal initdata as we
have always done for the 32-bit vDSO images. The extra padding is
gone, so the user VMA is one page instead of two. The image that
was already copied around at boot time is now in initdata, so we
recover that wasted space after boot.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7f6c69dcf40a227b8c98e5619367269b427164d7
Merge: 1e5ad9a3b9b78767a2eb1345201e46f41f9457ef e56a727b023d40d1adf660168883f30f2e6abe0a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 28 13:47:21 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] Make acpi-cpufreq more robust against BIOS freq changes behind our back.
[CPUFREQ] change cpu freq tables to per_cpu variables
[CPUFREQ] fix show_trans_table
[CPUFREQ] Warn when cpufreq_register_notifier called before pure initcalls
[CPUFREQ] Refactor locking in cpufreq_add_dev
[CPUFREQ] more CodingStyle
[CPUFREQ] CodingStyle
[CPUFREQ] Slightly shorten the error paths of cpufreq_suspend/cpufreq_resume
commit 01dee1881d7cbcd5c456735085e52de94da8d4e1
Author: Andres Salomon <dilinger at queued.net>
Date: Fri Apr 25 22:34:58 2008 -0400
kbuild: fix help output to show correct arch
Signed-off-by: Andres Salomon <dilinger at debian.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 1e5ad9a3b9b78767a2eb1345201e46f41f9457ef
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 28 20:40:08 2008 +0300
mm/memory_hotplug.c must #include "internal.h"
This patch fixes the following compile error caused by commit
04753278769f3b6c3b79a080edb52f21d83bf6e2 ("memory hotplug: register
section/node id to free"):
CC mm/memory_hotplug.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/memory_hotplug.c: In function ‘put_page_bootmem’:
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/memory_hotplug.c:82: error: implicit declaration of function ‘__free_pages_bootmem’
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/memory_hotplug.c: At top level:
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/memory_hotplug.c:87: warning: no previous prototype for ‘register_page_bootmem_info_section’
make[2]: *** [mm/memory_hotplug.o] Error 1
[ Andrew: "Argh. The -mm-only memory-hotplug-add-removable-to-sysfs-
to-show-memblock-removability.patch debugging patch adds that include
so nobody hit this before. ]
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5dffbe811b78684fc4d8538cb7b38d9c47f96f9f
Author: Segher Boessenkool <segher at kernel.crashing.org>
Date: Sun Apr 6 22:16:07 2008 +0200
kbuild: show defconfig subdirs in make help
PowerPC will start moving board defconfigs into subarch-specific
subdirs soon. "make help" currently does not look in subdirs to
find the defconfigs to show. This is partially a good thing,
since there are way too many defconfigs for one list.
This patch makes the main "make help" display something like
help-40x - Show 40x-specific targets
help-44x - Show 44x-specific targets
help-boards - Show all of the above
and wires up stuff so those new help-* commands actually work.
[sam: fixed it up to display x86 defconfigs too]
Cc: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Signed-off-by: Segher Boessenkool <segher at kernel.crashing.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 79d6e539df8260fe5d12a2117494aaf80ca1b3e8
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Thu Mar 20 21:30:32 2008 +0100
kconfig: reversed borderlines in inputbox
Fix reversal of dlg.border.atr and dlg.dialog.atr for draw_box()
Makes the inputbox look like expected
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 6501faf8c1bbaa51dc493f3681df016d2ebce833
Author: Shaohua Li <shaohua.li at intel.com>
Date: Sun Apr 27 13:46:56 2008 -0700
[CPUFREQ] state info wrong after resume
Sometimes old_index != stat->last_index, see cpufreq_update_policy, bios can
change cpu setting in resume. In my test, after resume cpu is in lowest
speed, but the stat info shows cpu is in full speed. This patch makes the
stat info correct after a resume.
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Jones <davej at redhat.com>
commit 30d221db4439973076953e2ed44344fa92d1d09f
Author: Alessandro Guido <alessandro.guido at gmail.com>
Date: Fri Apr 18 13:31:13 2008 -0700
[CPUFREQ] allow use of the powersave governor as the default one
Allow use of the powersave cpufreq governor as the default one for EMBEDDED
configs.
Signed-off-by: Alessandro Guido <alessandro.guido at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Jones <davej at redhat.com>
commit 605400a8ab44131698b206cbe253e48380daaa69
Author: Darrick J. Wong <djwong at us.ibm.com>
Date: Fri Apr 18 13:31:13 2008 -0700
[CPUFREQ] document the currently undocumented parts of the sysfs interface
There is a description of some of the sysfs files. However, there are some
that are not mentioned in the documentation, so add them to the user's guide.
Signed-off-by: Darrick J. Wong <djwong at us.ibm.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Jones <davej at redhat.com>
commit e8628dd06d66f2e3965ec9742029b401d63434f1
Author: Darrick J. Wong <djwong at us.ibm.com>
Date: Fri Apr 18 13:31:12 2008 -0700
[CPUFREQ] expose cpufreq coordination requirements regardless of coordination mechanism
Currently, affected_cpus shows which CPUs need to have their frequency
coordinated in software. When hardware coordination is in use, the contents
of this file appear the same as when no coordination is required. This can
lead to some confusion among user-space programs, for example, that do not
know that extra coordination is required to force a CPU core to a particular
speed to control power consumption.
To fix this, create a "related_cpus" attribute that always displays the
coordination map regardless of whatever coordination strategy the cpufreq
driver uses (sw or hw). If the cpufreq driver does not provide a value, fall
back to policy->cpus.
Signed-off-by: Darrick J. Wong <djwong at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Jones <davej at redhat.com>
commit 681587c58639444215a7c88f7471819997d2f226
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Wed Apr 23 23:59:36 2008 +0200
[ARM] serial: s3c2410: platform_get_irq() may return signed unnoticed
port->irq is unsigned, platform_get_irq() may return signed unnoticed
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 62783679540fbdfd74e10fbe9478d978141ba45f
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Wed Apr 23 23:44:03 2008 +0200
[ARM] am79c961a: platform_get_irq() may return signed unnoticed
dev->irq is unsigned, platform_get_irq() may return signed unnoticed
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 0c96c5979a522c3323c30a078a70120e29b5bdbc
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Mon Apr 28 09:23:24 2008 +0200
hrtimer: raise softirq unlocked to avoid circular lock dependency
The scheduler hrtimer bits in 2.6.25 introduced a circular lock
dependency in a rare code path:
=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.25-sched-devel.git-x86-latest.git #19
-------------------------------------------------------
X/2980 is trying to acquire lock:
(&rq->rq_lock_key#2){++..}, at: [<ffffffff80230146>] task_rq_lock+0x56/0xa0
but task is already holding lock:
(&cpu_base->lock){++..}, at: [<ffffffff80257ae1>] lock_hrtimer_base+0x31/0x60
which lock already depends on the new lock.
The scenario which leads to this is:
posix-timer signal is delivered
-> posix-timer is rearmed
timer is already expired in hrtimer_enqueue()
-> softirq is raised
To prevent this we need to move the raise of the softirq out of the
base->lock protected code path.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: stable at kernel.org
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
commit 0ed1507183adea174bc4b6611b50d90e044730c2
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Thu Apr 24 01:31:45 2008 -0400
[ARM] Feroceon: Feroceon-specific WA-cache compatible {copy,clear}_user_page()
This patch implements a set of Feroceon-specific
{copy,clear}_user_page() routines that perform more optimally than
the generic implementations. This also deals with write-allocate
caches (Feroceon can run L1 D in WA mode) which otherwise prevents
Linux from booting.
[nico: optimized the code even further]
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Tested-by: Sylver Bruneau <sylver.bruneau at googlemail.com>
Tested-by: Martin Michlmayr <tbm at cyrius.com>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit 6b29e681aa7e80792e6e6be4ac2577014018c2fd
Author: Nicolas Pitre <nico at cam.org>
Date: Fri Apr 25 13:56:32 2008 -0400
[ARM] Feroceon: fix function alignment in proc-feroceon.S
One overzealous .align 10 fixed, and a few .align5 added.
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit b46926bb2d9977799c88aef17a4386ee02c326d8
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Fri Apr 25 16:31:32 2008 -0400
[ARM] Orion: catch a couple more alternative spellings of PCIe
Unify a couple more spellings of "PCIe" ("PCI-E", "PCIE".)
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit 994cab846422bc9c636cc780a48b7370e837a3bb
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Fri Apr 25 16:30:21 2008 -0400
[ARM] Orion: fix orion-ehci platform resource end addresses
End addresses in 'struct resource' are inclusive -- fix the common
orion5x code to pass in the proper end addresses when instantiating
the two on-chip EHCI controllers.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit 92b913b08b18faa487b0c744282fafd944446ade
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Fri Apr 25 16:28:33 2008 -0400
[ARM] Orion: fix ->map_irq() PCIe bus number check
The current orion5x board ->map_irq() routines check whether a
given bus number lives on the PCIe controller by comparing it with
the PCIe controller's primary bus number. This doesn't work in
case there are multiple buses in the PCIe domain, i.e. if there
exists a PCIe bridge on the primary PCIe bus.
This patch adds a helper function (orion5x_pci_map_irq()) that
returns the IRQ number for the given PCI device if that device has
a hard-wired IRQ, or -1 otherwise, and makes each board's
->map_irq() function use this helper function.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit fd153abb01c3fbcc47cd4ac3c0bc8801cfcc0009
Author: Nicolas Pitre <nico at cam.org>
Date: Fri Apr 25 14:28:55 2008 -0400
[ARM] Orion: fix ioremap() optimization
The ioremap() optimization used for internal register didn't cope
with the fact that paddr + size can wrap to zero if the area extends
to the end of the physical address space.
Issue isolated by Sylver Bruneau <sylver.bruneau at googlemail.com>.
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit c5a1e8f7091c33c7f6b53f070d13380facab6607
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Thu Apr 24 01:31:46 2008 -0400
[ARM] feroceon: remove CONFIG_CPU_CACHE_ROUND_ROBIN check
Since the Feroceon cache replacement policy is always pseudorandom
(and the relevant control register bit is ignored), remove the
CONFIG_CPU_CACHE_ROUND_ROBIN check from proc-feroceon.S.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit a7039bd6daa32f5ea1a185b7cb0b3b519e1f5018
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Thu Apr 24 01:31:46 2008 -0400
[ARM] feroceon: remove CONFIG_CPU_DCACHE_WRITETHROUGH check
Since the Feroceon doesn't have a global WT override bit like
ARM926 does, remove all code relating to this mode of operation
from proc-feroceon.S.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
commit a3fd133c24e16d430ba21f3d9f5c0b8faeeb37fe
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Thu Apr 24 01:31:45 2008 -0400
kprobes/arm: fix decoding of arithmetic immediate instructions
The ARM kprobes arithmetic immediate instruction decoder
(space_cccc_001x()) was accidentally zero'ing out not only the Rn and
Rd arguments, but the lower nibble of the immediate argument as well
-- this patch fixes this.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Acked-by: Nicolas Pitre <nico at marvell.com>
commit 8f79ff0cb5330a92032c30ff586745d3016b34ca
Author: Nicolas Pitre <nico at cam.org>
Date: Wed Apr 23 18:44:15 2008 -0400
kprobes/arm: fix cache flush address for instruction stub
It is more useful to flush the cache with the actual buffer address
rather than the address containing a pointer to the buffer.
Signed-off-by: Nicolas Pitre <nico at marvell.com>
Acked-by: Lennert Buytenhek <buytenh at marvell.com>
commit ee69439cc1dcadbae42ece1caa1ec1786560f7aa
Author: Jesse Barnes <jbarnes at hobbes.lan>
Date: Mon Apr 28 12:30:35 2008 -0700
PCI: don't expose struct pci_vpd to userspace
We just need to forward declare it for struct pci_dev, not expose it outside of
__KERNEL__.
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit e56a727b023d40d1adf660168883f30f2e6abe0a
Author: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Date: Mon Apr 28 15:13:43 2008 -0400
[CPUFREQ] Make acpi-cpufreq more robust against BIOS freq changes behind our back.
We checked the hardware freq with OS cached freq value in get_cur_freqon_cpu().
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Thomas Renninger <trenn at suse.de>
Signed-off-by: Dave Jones <davej at redhat.com>
commit c938ac21329f19ad286eaaed7e26434943c8061b
Author: Mike Travis <travis at sgi.com>
Date: Wed Mar 5 08:31:29 2008 -0800
[CPUFREQ] change cpu freq tables to per_cpu variables
Change cpufreq tables from arrays to per_cpu variables in
drivers/acpi/processor_thermal.c
Based on git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Cc: Len Brown <len.brown at intel.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Dave Jones <davej at codemonkey.org.uk>
commit 25aca347d49ffc38aa3b7e63ce9b90df7f8b79c8
Author: Cesar Eduardo Barros <cesarb at cesarb.net>
Date: Sat Feb 16 08:41:25 2008 -0200
[CPUFREQ] fix show_trans_table
Fix show_trans_table when it overflows PAGE_SIZE.
* Not all snprintf calls were protected against being passed a negative
length.
* When show_trans_table overflows, len might be > PAGE_SIZE. In that case,
returns PAGE_SIZE.
Signed-off-by: Cesar Eduardo Barros <cesarb at cesarb.net>
Signed-off-by: Dave Jones <davej at codemonkey.org.uk>
commit 74212ca432982903d0fc6a0f282b199e000ad8b1
Author: Cesar Eduardo Barros <cesarb at cesarb.net>
Date: Sat Feb 16 08:41:24 2008 -0200
[CPUFREQ] Warn when cpufreq_register_notifier called before pure initcalls
If cpufreq_register_notifier is called before pure initcalls,
init_cpufreq_transition_notifier_list will overwrite whatever it did,
causing notifiers to be ignored.
Print some noise to the kernel log if that happens.
Signed-off-by: Cesar Eduardo Barros <cesarb at cesarb.net>
Signed-off-by: Dave Jones <davej at codemonkey.org.uk>
commit 457091181176643787a547dc04eb3cf5dcd822ce
Author: Dave Jones <davej at redhat.com>
Date: Wed Mar 5 14:07:34 2008 -0500
[CPUFREQ] Refactor locking in cpufreq_add_dev
Simplify this by moving the unlocking out of the error
paths into the exit path.
Signed-off-by: Dave Jones <davej at codemonkey.org.uk>
commit 905d77cd95e856b8e0b2d099fb70b9b8ccb7337e
Author: Dave Jones <davej at redhat.com>
Date: Wed Mar 5 14:28:32 2008 -0500
[CPUFREQ] more CodingStyle
void * p -> void *p
no space between function parameters
removed excess whitespace
Signed-off-by: Dave Jones <davej at codemonkey.org.uk>
commit 4d34a67d0204029079815c8c2753ca647cd0e7e9
Author: Dave Jones <davej at redhat.com>
Date: Thu Feb 7 16:33:49 2008 -0500
[CPUFREQ] CodingStyle
return is not a function.
Signed-off-by: Dave Jones <davej at redhat.com>
commit c906049447019d69b9cc2d591a142af561afa7f9
Author: Dave Jones <davej at redhat.com>
Date: Thu Feb 7 16:32:18 2008 -0500
[CPUFREQ] Slightly shorten the error paths of cpufreq_suspend/cpufreq_resume
Signed-off-by: Dave Jones <davej at redhat.com>
commit e31a94ed371c70855eb30b77c490d6d85dd4da26
Merge: 9d9ad4b51d2b29b5bbeb4011f5e76f7538119cf9 fcbd3b4b92efe29b59df16b910138cf43683be88
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 28 10:51:43 2008 -0700
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (45 commits)
[MIPS] Pb1200/DBAu1200: move platform code to its proper place
[MIPS] Fix handling of trap and breakpoint instructions
[MIPS] Pb1200: do register SMC 91C111
[MIPS] DBAu1200: fix bad SMC 91C111 resource size
[NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532
[MIPS] IP27: Fix build bug due to missing include
[MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
[MIPS] cevt-gt641xx: Kill unnecessary include
[MIPS] DS1287: Add clockevent driver
[MIPS] add DECstation I/O ASIC clocksource
[MIPS] rbtx4938: minor cleanup
[MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro
[MIPS] rbtx4938: misc cleanups
[MIPS] jmr3927: use generic txx9 gpio
[MIPS] rbhma4500: use generic txx9 gpio
[MIPS] generic txx9 gpio support
[MIPS] make fallback gpio.h gpiolib-friendly
[MIPS] unexport null_perf_irq() and make it static
[MIPS] unexport rtc_mips_set_time()
[MIPS] unexport copy_from_user_page()
...
commit 9d9ad4b51d2b29b5bbeb4011f5e76f7538119cf9
Author: PJ Waskiewicz <peter.p.waskiewicz.jr at intel.com>
Date: Fri Apr 25 17:58:52 2008 -0700
x86: Fix 32-bit MSI-X allocation leakage
This bug was introduced in the 2.6.24 i386/x86_64 tree merge, where
MSI-X vector allocation will eventually fail. The cause is the new
bit array tracking used vectors is not getting cleared properly on
IRQ destruction on the 32-bit APIC code.
This can be seen easily using the ixgbe 10 GbE driver on multi-core
systems by simply loading and unloading the driver a few times.
Depending on the number of available vectors on the host system, the
MSI-X allocation will eventually fail, and the driver will only be
able to use legacy interrupts.
I am generating the same patch for both stable trees for 2.6.24 and
2.6.25.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr at intel.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a04140e17be54c4d44b9f88068f83256584f052a
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Mon Apr 28 10:21:40 2008 -0700
docbook: fix bitops fatal filename error
bitops source file was renamed, so fix docbook for that.
docproc: linux-2.6.25-git11/include/asm-x86/bitops_32.h: No such file or directory
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cfd299dffe6f47c04c47b95893708cdc65876fbd
Merge: 6b8588f71890fba78742f90e22390028a6cd706f c9b7b9793764b171a118d049d4b721a7f5d8ac82
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 28 10:08:49 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
SELinux: Fix a RCU free problem with the netport cache
SELinux: Made netnode cache adds faster
SELinux: include/security.h whitespace, syntax, and other cleanups
SELinux: policydb.h whitespace, syntax, and other cleanups
SELinux: mls_types.h whitespace, syntax, and other cleanups
SELinux: mls.h whitespace, syntax, and other cleanups
SELinux: hashtab.h whitespace, syntax, and other cleanups
SELinux: context.h whitespace, syntax, and other cleanups
SELinux: ss/conditional.h whitespace, syntax, and other cleanups
SELinux: selinux/include/security.h whitespace, syntax, and other cleanups
SELinux: objsec.h whitespace, syntax, and other cleanups
SELinux: netlabel.h whitespace, syntax, and other cleanups
SELinux: avc_ss.h whitespace, syntax, and other cleanups
Fixed up conflict in include/linux/security.h manually
commit 97a34eb77c758ff7821c2d29b3b5a84299c93aa1
Author: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Date: Mon Apr 28 09:33:27 2008 -0700
doc: fix an incorrect suggestion to pass NULL for PCI like buses
Fix an incorrect suggestion to pass NULL to pci_alloc_consistent
for PCI like buses where devices don't have struct pci_dev (like ISA, EISA).
Signed-off-by: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Acked-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>
commit 6b8588f71890fba78742f90e22390028a6cd706f
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 07:00:26 2008 +0100
usb input endianness annotations and fixes
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 24caa6a0c7cde9309026880f8cc7eba587e1272a
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 06:59:45 2008 +0100
celleb_scc_pciex __iomem annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fd05e720099e8eeddb378305d1a41c1445344b91
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 07:00:16 2008 +0100
drivers/usb annotations and fixes
* endianness annotations
* endianness fixes
* missing get_unaligned/put_unaligned
It's pretty much all over the place, changes to different files are independent.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Serial-parts-Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 01d7b369887b6feb7c9ce2b20988fafe3f70841c
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 07:00:05 2008 +0100
usbhid endianness annotations and fixes
usb_control_msg() converts arguments to little-endian itself,
doing that in caller means breakage on big-endian boxen.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d28aa3ac4cdc2d03a2bde4b78780064a00f7ef61
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 06:59:35 2008 +0100
q40ide breakage
again, fallout from ide merge
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ac2f217baf0f24965e40bce9a5d1a780a06596d1
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 06:59:55 2008 +0100
typo in sata_fsl
it's ata_link, not ata_linke
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7d896e0b8e37ae7f74088ce74bf81b58b423b48b
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 06:59:25 2008 +0100
more icside breakage (from next ide merge)
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b7505680538375e3e562805851e3f061675369b7
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 06:59:15 2008 +0100
fix ia64 local_irq_save() et.al.
psr is not a good name for local variable in macro body when it
has a good chance of being the argument of said macro (actually
is at least in one place)
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ea696f9cf37d8ab9236dd133ddb2727264f3add6
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 06:59:05 2008 +0100
ia64 kvm fixes for O=... builds
* EXTRA_CFLAGS do not apply for *.S
* don't bother with symlinks to ../lib/mem*.S, just add ../lib/mem*.o
to object list
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ff471b2464ca7344eba347d360f23ea415a774dc
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Apr 28 06:58:56 2008 +0100
frv si_addr annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 819e32377e401669d2c010f1a0ce12fe43ea5261
Author: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Date: Mon Apr 28 09:48:10 2008 -0700
Consistently use pdev as the variable of type struct pci_dev *.
Update DMA mapping documentation to use 'pdev' rather than 'dev' in
example code that calls routines expecting 'struct pci_device *', since 'dev'
might make readers think they're passing 'struct device *' parameters.
Bug 10397.
Signed-off-by: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Acked-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit e945e849e18006c131fe59252ab920c6b5f7959c
Merge: 77a50df2b14c8d3ee3c58c21c4a0e0157570df09 194f1a68b93e959ede6ec363db4714e630bdbb6a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 28 09:45:57 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: video drivers: add facility level
sparc: tcx.c make tcx_init and tcx_exit static
sparc: ffb.c make ffb_init and ffb_exit static
sparc: cg14.c make cg14_init and cg15_exit static
sparc: bw2.c fix bw2_exit
sparc64: Fix accidental syscall restart on child return from clone/fork/vfork.
sparc64: Clean up handling of pt_regs trap type encoding.
sparc: Remove old style signal frame support.
sparc64: Kill bogus RT_ALIGNEDSZ macro from signal.c
sparc: sunzilog.c remove unused argument
sparc: fix drivers/video/tcx.c warning
sparc64: Kill unused local ISA bus layer.
input: Rewrite sparcspkr device probing.
sparc64: Do not ignore 'pmu' device ranges.
sparc64: Kill ISA_FLOPPY_WORKS code.
sparc64: Kill CONFIG_SPARC32_COMPAT
sparc64: Cleanups and corrections for arch/sparc64/Kconfig
sparc64: Fix wedged irq regression.
commit 77a50df2b14c8d3ee3c58c21c4a0e0157570df09
Merge: 96fffeb4b413a4f8f65bb627d59b7dfc97ea0b39 358c12953b88c5a06a57c33eb27c753b2e7934d1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 28 09:44:11 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
iwlwifi: Allow building iwl3945 without iwl4965.
wireless: Fix compile error with wifi & leds
tcp: Fix slab corruption with ipv6 and tcp6fuzz
ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
[IPSEC]: Use digest_null directly for auth
sunrpc: fix missing kernel-doc
can: Fix copy_from_user() results interpretation
Revert "ipv6: Fix typo in net/ipv6/Kconfig"
tipc: endianness annotations
ipv6: result of csum_fold() is already 16bit, no need to cast
[XFRM] AUDIT: Fix flowlabel text format ambibuity.
commit 96fffeb4b413a4f8f65bb627d59b7dfc97ea0b39
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Apr 28 01:39:43 2008 +0200
make CC_OPTIMIZE_FOR_SIZE non-experimental
this option has been the default on a wide range of distributions
for a long time - time to make it non-experimental.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 513694b5f931a62561d21eb97a4740ce37464a45
Merge: 46b958eb808b73a232efc962e730faffe7cff5c5 d7b41a24bfb5d7fa02f7b49be1293d468814e424
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 28 09:36:40 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
hrtimer: timeout too long when using HRTIMER_CB_SOFTIRQ
commit fcbd3b4b92efe29b59df16b910138cf43683be88
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Mon Apr 28 19:54:38 2008 +0400
[MIPS] Pb1200/DBAu1200: move platform code to its proper place
Since both the IDE interface and SMC 91C111 Ethernet chip are on-board
devices, not SOC devices, move the platform device registration form the
common to the board specific code.
While at it, remove semicolon (which didn't break compilation only by
chance) from the AU1XXX_ATA_DDMA_REQ macro and do some renaming:
- change 'au1200_ide0_' variable name prefix to the mere 'ide_';
- change 'smc91x_' variable name prefix to 'smc91c111_' since that's the
name of the chip used on the boards;
- drop 'AU1XXX_' prefix from the names of macros describing IDE and Ethernet
on-board devices;
- change 'SMC91111_' to 'SMC91C111_', change 'IRQ' to 'INT' in the names of
the macros describing the Ethernet chip for consistency with the IDE
macros;
- change 'ATA_' to 'IDE_' and 'OFFSET' to 'SHIFT' (since this value is
indeed a shift count) in the names of the macros describing the IDE
interface.
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit df2700519c84ee8ee1e5ea165725c651f6d4d1a4
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Sun Apr 20 16:28:54 2008 +0100
[MIPS] Fix handling of trap and breakpoint instructions
With fixes and cleanups from Atsushi Nemoto (anemo at mba.ocn.ne.jp).
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit cf85c109831ce11ffa9befd4e970d6363e410a10
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Tue Apr 15 22:26:18 2008 +0400
[MIPS] Pb1200: do register SMC 91C111
Pb1200 does have SMC 91C111 Ethernet chip on board but the platform code
did not register it, so one couldn't mount NFS...
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 3854c69a0d3080c8647f7b041da2382702f574b7
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Tue Apr 15 22:20:45 2008 +0400
[MIPS] DBAu1200: fix bad SMC 91C111 resource size
The on-board SMC 91C111 chip only decodes 16 bytes of memory (obviously, it
can not decode a whole megabyte starting from address 0x19000300).
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit f57b2061ab7d444ae0c98764a9c9e09b33c36050
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Mon Apr 28 12:48:40 2008 +0100
[NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532
The platform is actually named routerboard 532 so let's call it this.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
Acked-by: Jeff Garzik <jeff at garzik.org>
commit a4a8f70d2db2998cf28532287ee89776d4d8a2ca
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Apr 23 18:55:59 2008 +0300
[MIPS] IP27: Fix build bug due to missing include
asm-mips/mach-ip27/topology.h must #include <asm-generic/topology.h>
This fixes the following compile error:
...
CC kernel/sched.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function 'find_next_best_node':
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: implicit declaration of function 'node_to_cpumask_ptr'
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: '__tmp__' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: (Each undeclared identifier is reported only once
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7015: error: for each function it appears in.)
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function 'sched_domain_node_span':
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7047: error: 'nodemask' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7048: warning: ISO C90 forbids mixed declarations and code
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7059: error: implicit declaration of function 'node_to_cpumask_ptr_next'
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c: In function '__build_sched_domains':
/home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/sched.c:7605: error: 'pnodemask' undeclared (first use in this function)
make[2]: *** [kernel/sched.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 411ba7fcba54b30ba4ce2c492ea8d20f1d0db996
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sat Apr 26 01:55:30 2008 +0900
[MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
* Declare board_bind_eic_interrupt, board_watchpoint_handler in traps.h
* Make msc_bind_eic_interrupt static and fix its argument types.
* Make msc_levelirq_type, msc_edgeirq_type static.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 855808392adf499a29e6bdb418f9474726ecbace
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Apr 24 23:08:55 2008 +0900
[MIPS] cevt-gt641xx: Kill unnecessary include
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 6457d9fc3bb87c72db03cfb34cd414c8fb9b8edf
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Fri Apr 25 12:11:44 2008 +0900
[MIPS] DS1287: Add clockevent driver
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 4247417d8457b326ede001cb74af8570b5aa302b
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Thu Apr 24 09:48:40 2008 +0900
[MIPS] add DECstation I/O ASIC clocksource
Add DECstation I/O ASIC clocksource
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 05a96fae433a662e12879b543a6838b6c2129402
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Tue Apr 22 23:59:30 2008 +0900
[MIPS] rbtx4938: minor cleanup
Do not initialize res->parent for platform device.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 6ed436932d1417534aa1a738fd9585795f954304
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Tue Apr 22 23:28:57 2008 +0400
[MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 66140c8e9f0d978bd26c58f236d0d86aa666d8fc
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Mon Apr 14 21:49:07 2008 +0900
[MIPS] rbtx4938: misc cleanups
* Do not use non-standard I/O accessors, such as reg_rd08, etc.
* Kill unnecessary wbflush()
* Kill tx4938_mips.h
* Kill unnecessary includes
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 1bd0962e3d5bc66ee0ee207a61485c6a436cfac2
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sat Apr 5 00:56:27 2008 +0900
[MIPS] jmr3927: use generic txx9 gpio
Use generic txx9 gpio (and gpiolib) for JMR3927 board.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 4cad154b30e7471628cb1943081c72b6368b079a
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sat Apr 5 00:56:09 2008 +0900
[MIPS] rbhma4500: use generic txx9 gpio
Use generic txx9 gpio (and gpiolib) for RBHMA4500 board.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit a9aec7fe74cd912cad74ca621ed91cb1c37566ae
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sat Apr 5 00:55:41 2008 +0900
[MIPS] generic txx9 gpio support
This is a board-independent TXx9 gpio API implementation using gpiolib.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 8aa62adafada6e3f29e12dacf1d6f491d2ba5f7f
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sat Apr 5 00:55:24 2008 +0900
[MIPS] make fallback gpio.h gpiolib-friendly
If gpiolib was selected, asm-generic/gpio.h provides some prototypes
for gpio API and implementation helpers. With this patch, platform
code can implement its GPIO API using gpiolib without custom gpio.h
file.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 46684734dd6a55af09c3fe799af7d74cb938684c
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Wed Apr 2 03:58:38 2008 +0400
[MIPS] unexport null_perf_irq() and make it static
This patch unexports the null_perf_irq() symbol, and simultaneously
makes this function static.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit c5b0680aa1d7a751b7dd8ebf6854e5baf0a2e54b
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Wed Apr 2 03:58:37 2008 +0400
[MIPS] unexport rtc_mips_set_time()
No users for the rtc_mips_set_time() routine exist outside of the
core kernel code. Therefore, EXPORT_SYMBOL(rtc_mips_set_time) is
useless, and this patch removes it.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit e698d66b813bbe38940d2d80a2488214bdaf96b6
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Wed Apr 2 03:58:36 2008 +0400
[MIPS] unexport copy_from_user_page()
No users for the copy_from_user_page() routine exist outside of the
core kernel code. Therefore, EXPORT_SYMBOL(copy_from_user_page) is
useless, and this patch removes it.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 715243e6c3e8e74202eb663a8e45880ff6a1dff7
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Wed Apr 2 03:58:35 2008 +0400
[MIPS] unexport copy_to_user_page()
The copy_to_user_page() function is called only in the core kernel
code. Therefore, there is no need to export it. This patch removes
EXPORT_SYMBOL(copy_to_user_page).
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 11327ef77f8b6104bd4a855bbe783cce84416b03
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Wed Apr 2 03:58:34 2008 +0400
[MIPS] unexport copy_user_highpage()
The copy_user_highpage() routine has no users outside of the
core kernel code, so exporting this symbol is pointless.
This patch removes EXPORT_SYMBOL(copy_user_highpage).
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 6e766458f78ca15198cf046bc098b36e40c8b471
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Fri Apr 4 00:02:53 2008 +0400
[MIPS] Alchemy: move UART platform code to its proper place
Move the code registering the Alchemy UART platform devices from
drivers/serial/ to its proper place, into the Alchemy platform code. Fix
the related Kconfig entry, while at it...
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit ce28f94ca5a9ba3cd6bdcc47b52ea1b7a3bd933b
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Wed Apr 23 22:43:55 2008 +0400
[MIPS] Alchemy: kill useless #include's, #define's and extern's
Go thru the Alchemy code and hunt down every unneeded #include, #define, and
extern (some of which refer to already long dead functions).
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit b57c1913b4dd3bc070cbfccffff3768965a81282
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Tue Apr 1 02:03:25 2008 +0400
[MIPS] malta_int.c: make 4 variables static
The following variables defined in arch/mips/mips-boards/malta/malta_int.c
can become static: msc_irqmap[], msc_nr_irqs, msc_eicirqmap[], and
msc_nr_eicirqs. This patch makes them static.
Successfully build-tested using default configs for Malta, Atlas
and SEAD boards.
Runtime test successfully performed by booting the Malta 4Kc board
up to the shell prompt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 52d65cf87f439c5264527c3628d12a26322524eb
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Tue Apr 1 02:03:24 2008 +0400
[MIPS] make standard_io_resources[] static
The array standard_io_resources[] needs not to be exposed in the kernel
global namespace. This patch makes it static.
Successfully build-tested using default configs for Malta, Atlas
and SEAD boards.
Runtime test successfully performed by booting the Malta 4Kc board
up to the shell prompt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit b31dc3c4ff530923e471a66a8ad20801326e3951
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Tue Apr 1 02:03:23 2008 +0400
[MIPS] make plat_perf_setup() static
There is no need for the plat_perf_setup() function to be global,
so make it static.
Successfully build-tested using default configs for Malta, Atlas
and SEAD boards.
Runtime test successfully performed by booting the Malta 4Kc board
up to the shell prompt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit ddaf5740b9e822d3650a19ab9757b49ddf5c95de
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Tue Apr 1 02:03:22 2008 +0400
[MIPS] make mdesc and prom_getmdesc() static
Neither the mdesc[] array nor the prom_getmdesc() function need to
be global. This patch makes them static.
Successfully build-tested using default configs for Malta, Atlas
and SEAD boards.
Runtime test successfully performed by booting the Malta 4Kc board
up to the shell prompt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 33d69d2a784851431f24c55abb00dfec13502b0b
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Tue Apr 1 02:03:21 2008 +0400
[MIPS] make mips_ejtag_setup() static
This change makes the needlessly global function mips_ejtag_setup() static.
Successfully build-tested using default configs for Malta, Atlas
and SEAD boards.
Runtime test successfully performed by booting the Malta 4Kc board
up to the shell prompt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit cd2675fba90d3e87fa7c9902fd7fdedc2e5022e0
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Tue Apr 1 02:03:20 2008 +0400
[MIPS] make mips_nmi_setup() static
This change makes the needlessly global function mips_nmi_setup() static.
Successfully build-tested using default configs for Malta, Atlas
and SEAD boards.
Runtime test successfully performed by booting the Malta 4Kc board
up to the shell prompt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit bb09a954b64c61b691c095e0a20708265b5bc2bc
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Mar 28 14:34:39 2008 -0700
[MIPS] replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit f2ce89f30ede4cb32fa8f9aaec884087069c81ba
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Fri Mar 28 14:34:37 2008 -0700
[MIPS] remove redundant display of free swap space in show_mem()
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit eba8291b514e6e590be161afcbfdab58cc5da6b8
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Thu Mar 27 22:05:57 2008 +0300
[MIPS] Alchemy: kill useless time variables
Since the commit 91a2fcc88634663e9e13dcdfad0e4a860e64aeee ([MIPS]
Consolidate all variants of MIPS cp0 timer interrupt handlers) removed the
Alchemy specific timer handler, 'r4k_offset' and 'r4k_cur' variables became
practically useless, so get rid of them at last, renaming cal_r4off()
function into calc_clock() and making it return CPU frequency. Also, make
'no_au1xxx_32khz' variable static...
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 0167509574ef1cdb516906db5e8b6ad5ca64ab61
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Mon Mar 24 23:15:50 2008 +0300
[MIPS] Alchemy: don't unmask timer IRQ early
Defer the unmasking of the count/compare interrupt (IRQ5) till the
clockevent driver initialization:
- only enable the cascaded IRQs 0 thru 4 in arch_init_irq(); kill the
ALLINTS macro -- this change is blessed by AMD as I saw it in their own
patch; :-)
- do not force IRQ5 enabled in plat_time_init() if PM is enabled and there's
no 32 KHz crystal.
Update the copyrights (taking into account my prior changes), also removing
Pete Popov's old email...
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit a92b05880d261e9017ef8e7d5b6b01e0e5aa991d
Author: Daniel Laird <daniel.j.laird at nxp.com>
Date: Thu Mar 6 09:07:18 2008 +0000
[MIPS] Move arch/mips/philips to arch/mips/nxp
Signed-off-by: daniel.j.laird <daniel.j.laird at nxp.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 389310e2b0c195f176e7d4be788bc245e9102412
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Mar 4 17:17:16 2008 -0800
[MIPS] replace __inline with inline
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 39b8d5254246ac56342b72f812255c8f7a74dca9
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Mon Apr 28 17:14:26 2008 +0100
[MIPS] Add support for MIPS CMP platform.
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 308402445e005a039a72b315cd9b5ceeaea0063c
Author: Chris Dearman <chris at mips.com>
Date: Fri Sep 21 14:50:08 2007 +0100
[MIPS] Add CoreFPGA5 support; distinguish between SOCit/ROCit
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit bdc94eb41e6090961695747508ac7e33ea5d6c08
Author: Chris Dearman <chris at mips.com>
Date: Wed Oct 3 10:43:56 2007 +0100
[MIPS] Add noulri kernel argument to disable "rdhwr $29" usermode support.
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 351336929ccf222ae38ff0cb7a8dd5fd5c6236a0
Author: Chris Dearman <chris at mips.com>
Date: Wed Sep 19 00:58:24 2007 +0100
[MIPS] Allow setting of the cache attribute at run time.
Slightly tacky, but there is a precedent in the sparc archirecture code.
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit bec5052743ec8ae4c5669918cf9b130bf15709a2
Author: Chris Dearman <chris at mips.com>
Date: Wed Sep 19 00:51:57 2007 +0100
[MIPS] Tidy up cache attributes
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 962f480e0f9024ecdcfe2ba1d216c038ee328ced
Author: Chris Dearman <chris at mips.com>
Date: Wed Sep 19 00:46:32 2007 +0100
[MIPS] All MIPS32 processors support64-bit physical addresses.
Still, only the 4K may actually implement it.
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 0bfa130e741f8f73a7bbf6a89aad4816e9094a71
Author: Chris Dearman <chris at mips.com>
Date: Fri Sep 14 21:21:58 2007 +0100
[MIPS] Remove TLB sanitation code
It is not being used by Malta and shouldn't be needed for MIPSsim.
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 0b6d497fcbb72b356c9d6446810a9597ee55c432
Author: Chris Dearman <chris at mips.com>
Date: Thu Sep 13 12:32:02 2007 +0100
[MIPS] Basic SPRAM support
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit fb2a27e743cd565c25cd896911e494482a8b7251
Author: Thiemo Seufer <ths at networkno.de>
Date: Mon Feb 18 19:32:49 2008 +0000
[MIPS] Reimplement clear_page/copy_page
Fold the SB-1 specific implementation of clear_page/copy_page in the
generic version, and rewrite that one in tlbex style. The immediate
benefits:
- It converts the compile-time workaround for SB-1 pass 1 prefetches
to a more efficient run-time check.
- It allows adjustment of loop unfolling, which helps to reduce the
number of redundant cdex cache ops.
- It fixes some esoteric cornercases (the cache line length calculations
can go wrong, and support for 64k pages without prefetch instructions
will overflow the addiu immediate).
- Somewhat better guesses of "good" prefetch values.
Signed-off-by: Thiemo Seufer <ths at networkno.de>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 26eed9a5c61edd93d88e147188d4feae6770174e
Author: Linus Walleij <triad at df.lth.se>
Date: Sat Apr 26 23:39:44 2008 +0100
[ARM] 5022/1: Race in ARM MMCI PL18x driver, V2
Updated version of 4446/1. This also drops the suggested comparison
of host_remain for == 0, since that doesn't make sense (still works
for us, too). We have verified that this patch solve race problems
on atleast 2 archs at high frequencies.
(Verbatim copy of old patch text below.)
The patch below fixes a race condition in the ARM MMCI PL18x driver.
If new data arrives in the FIFO while existing data is being read then
we get a second iteration of the loop in mmci_pio_read.
However host->size is not updated until after mmci_pio_read returns,
so we get count = number of new bytes PLUS number of bytes already
copied in the first iteration. This results in a FIFO underrun as
we try and read mode data than is available.
The fix is to compensating for data read on previous iterations
when calculating the amount of data in the FIFO.
Signed-off-by: Linus Walleij <triad at df.lth.se>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 136eb955773dc99f82e6e754038eb1c530e03fdf
Author: David Brownell <david-b at pacbell.net>
Date: Thu Apr 24 20:58:33 2008 +0100
[ARM] 5021/1: at91: buildfix for sam9263 + PM
Build fix for power management on at91sam9263: it has two memory
controllers instead of just one, so it might have two banks of
DRAM to put into selfrefresh mode. For now we continue to assume
only the first bank is populated.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Andrew Victor <linux at maxim.org.za>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit fe6cfde60012d4891470828a391274d94e0ea3a0
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Thu Apr 24 10:05:43 2008 +0100
[ARM] 5018/1: RealView: Fix the ARM11MPCore Oprofile compilation
This patch fixes the Oprofile for ARM11MPCore compilation introduced by
changes to the RealView code. Only RealView/EB is supported.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit fb8b131ba8f6618f84d87ef1f62067dcf5905a8f
Author: Nicolas Ferre <nicolas.ferre at atmel.com>
Date: Tue Apr 22 13:54:52 2008 +0100
[ARM] 5016/1: AT91: typo in mci configuration for at91cap at91sam9263
typo in mci configuration in devices files
Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 46b958eb808b73a232efc962e730faffe7cff5c5
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Mon Apr 28 02:16:35 2008 -0700
kernel-doc: detect trailing kernel-doc line trash
Print a warning when a kernel-doc comment block ends with text on the same
line as the ending comment characters, e.g.:
* this text is lost. */
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 94dc7ad5502e7d74e2fd74651743f5f1773aa1fe
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Mon Apr 28 02:16:34 2008 -0700
kernel-doc: detect/prevent duplicate doc section names
I saw this problem recently. With this kernel-doc:
* Note: some important info
*
* Note: other important info
kernel-doc uses the "section name" (preceding the ':', like "Note") as a hash
key for storing the descriptive text ("blah important info"). It is (was)
possible to have duplicate (colliding) section names, without any kind of
warning or error.
kernel-doc happily used the latter descriptive text for all instances of
printing the <section-name> descriptive text and the former important info
was lost.
One way to "fix" this is to modify the kernel-doc comments, e.g.:
* Note1: foo bar
*
* Note.2: blah zay
For now, kernel-doc will signal an error when it sees colliding section names
like this.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9f354858b8ea29e969b82dd96caea376157d76ca
Author: Olof Johansson <olof at lixom.net>
Date: Mon Apr 28 02:16:32 2008 -0700
fatfs: fix build warning with 64k PAGE_SIZE
Annoying gcc warning:
fs/fat/inode.c: In function 'fat_fill_super':
fs/fat/inode.c:1222: warning: comparison is always false due to limited range of data type
Change it to compare with 4K instead of PAGE_CACHE_SIZE, as suggested
by OGAWA-san.
[FAT spec says: logical_sector_size should be 512, 1024, 2048 4096]
So, at least for now, we limit it to 4096.
Signed-off-by: Olof Johansson <olof at lixom.net>
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0607fd02587a6b4b086dc746d63123c1f284db68
Author: Frank Seidel <fseidel at suse.de>
Date: Mon Apr 28 02:16:31 2008 -0700
fat: detect media without partition table correctly
I received a complaint that some FAT formated medias (e.g. sd memory cards)
trigger a "unknown partition table" message even though there is no partition
table and they work correctly, while in general (when e.g. formated with
mkdosfs or even Windows Vista) this message is not shown.
Currently this seems only to happen when the medias get formatted with Windows
XP (and possibly Win 2000). Then the boot indicator byte contains garbage
(part of text message) and so do the other parts checked by msdos_paritition
which then later triggers this message.
References: novell bug #364365
Most fat formatted media without partition table contains zeros in the boot
indication and the other tested bytes and so falls through the checks in
msdos_partition, leading it to return with 1 (all is fine).
But some (e.g. WinXP formatted) fat fomated medias don't use boot_ind and so
the check fails and causes a "unkown partition table" warning eventhough there
is none and everything would be fine.
This additional check directly verifies if there is a fat formatted medium
without a partition table.
Signed-off-by: Frank Seidel <fseidel at suse.de>
Cc: Andreas Dilger <adilger at sun.com>
Acked-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 73f20e58b1d586e9f6d3ddc3aad872829aca7743
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 28 02:16:30 2008 -0700
FAT_VALID_MEDIA(): remove pointless test
The on-disk media specification field in FAT is only 8-bits, so testing for
<=0xff is pointless, and can generate a "comparison is always true due to
limited range of data type" warning.
While we're there, convert FAT_VALID_MEDIA() into a C function - the present
implementation is buggy: it generates either one or two references to its
argument.
Cc: Frank Seidel <fseidel at suse.de>
Acked-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c7a6c4edc74ee5c3d990325fe93b6916f43499f4
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Mon Apr 28 02:16:29 2008 -0700
fat: use __getname()
__getname() is faster than __get_free_page(). Use it.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f22032ba8de2960a64a3dd9719fb5c99b1f1ae6e
Author: Keith Mok <ek9852 at gmail.com>
Date: Mon Apr 28 02:16:29 2008 -0700
vfat: bug fix for vfat cannot handle filename with 255
This patch fix the problem that the buffer allocated for convert of unicode to
utf8 in fat/dir.c is too small.
And cannot handle filename with 255 asian characters when mounted with utf8
options.
Also it fix the filename length limitation checking in vfat/namei.c that the
filename length should be checked against the number of converted unicode
characters.
Not the length before NLS/UTF8 converted.
Signed-off-by: Keith Mok <ek9852 at gmail.com>
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 061e97469f46f924cf14bbf1dd4805b46986691a
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Mon Apr 28 02:16:28 2008 -0700
Add balance_dirty_pages_ratelimited() to cont_expand_zero()
On the systems, ftruncate() which expand size for FAT became the cause
of OOM. The cont_expand_zero() filled all memory with dirty pages,
and since disk is very slow, limit of page scanning was exceeded, then
it triggered OOM.
This adds balance_dirty_pages_ratelimited() to avoid filling memory
with dirty pages.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e69be4c9c4ac1b6bb6380512557da0afa6262e98
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Mon Apr 28 02:16:27 2008 -0700
fat: Remove fat_clusters_flush()
This removes unneeded fat_clusters_flush().
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 606e423e43bac0c2f7b85b682eb1ddd2a634586e
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Mon Apr 28 02:16:27 2008 -0700
fat: Update free_clusters even if it is untrusted
Currently, free_clusters is not updated until it is trusted, because
Windows doesn't update it correctly.
But if user is using FAT driver of Linux, it updates free_clusters
correctly. Instead, this updates it even if it's untrusted, so if
free_clustes is correct, now keep correct value.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1ae43f826b6cb951fc5b0f9c92372a8d5b63c7f9
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Mon Apr 28 02:16:26 2008 -0700
fat: Add allow_utime option
Normally utime(2) checks current process is owner of the file, or it
has CAP_FOWNER capability. But FAT filesystem doesn't have uid/gid as
on disk info, so normal check is too unflexible.
With this option you can relax it.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e97e8de388723f9491514fa0434ddf1fd713a188
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Mon Apr 28 02:16:26 2008 -0700
fat: fat_setattr() fix
Fix fat_setattr() on the case of showexec option. If user specified
showexec option, inode->i_mode may not have S_IXUGO. This just use
inode->i_mode to fix it.
And with this patch, we don't allow chmod() on memory inode, it's just
bad behaviour. IOW, we allow changing S_IWUGO only which can be stored
to disk.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1278fdd34b12214b5c2e91e64848a5e54e57ed96
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Mon Apr 28 02:16:25 2008 -0700
fat: fat_notify_change() and check_mode() cleanup
- Rename fat_notify_change() to fat_setattr()
- check_mode() cleanup
- Change layout of code
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3754a544474b9fd4fdd32a96d98bc4ab558b2bb6
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Mon Apr 28 02:16:24 2008 -0700
fat: kill is_bad_inode() check
FAT doesn't need to check bad inode anymore.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d5dee5c395062a55236318ac4eec1f4ebb9de6db
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:16:23 2008 -0700
reiserfs: unpack tails on quota files
Quota files cannot have tails because quota_write and quota_read functions do
not support them. So far when quota files did have tail, we just refused to
turn quotas on it. Sadly this check has been wrong and so there are now
plenty installations where quota files don't have NOTAIL flag set and so now
after fixing the check, they suddently fail to turn quotas on. Since it's
easy to unpack the tail from kernel, do this from reiserfs_quota_on() which
solves the problem and is generally nicer to users anyway.
Signed-off-by: Jan Kara <jack at suse.cz>
Reported-by: <urhausen at urifabi.net>
Cc: Jeff Mahoney <jeffm at suse.com>
Cc: Chris Mason <chris.mason at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a2fe594fa3732298947377409b5d8111b14f56ec
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:16:23 2008 -0700
reiserfs: fix hang on umount with quotas when journal is aborted
Call dquot_drop() from reiserfs_dquot_drop() even if we fail to start a
transaction. Otherwise we never get to dropping references to quota
structures from the inode and umount will hang indefinitely.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fbe5498b3d5af44a8671800e85b2858c2ea236fa
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:16:22 2008 -0700
reiserfs: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Chris Mason <chris.mason at oracle.com>
Cc: Jeff Mahoney <jeffm at suse.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8acc570fabc022d41baedc0c9bf976a4b9d16d6f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:16:21 2008 -0700
reiserfs: fix more sparse warnings in do_balan.c
fs/reiserfs/do_balan.c:1467:10: warning: symbol 'ret_val' shadows an earlier one
fs/reiserfs/do_balan.c:275:6: originally declared here
fs/reiserfs/do_balan.c:1471:23: warning: symbol 'ih' shadows an earlier one
fs/reiserfs/do_balan.c:249:67: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Chris Mason <chris.mason at oracle.com>
Cc: Jeff Mahoney <jeffm at suse.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e13601bc6aa427a6483e7f66fde55ac3b5fed335
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:16:21 2008 -0700
reiserfs: fix sparse warning in journal.c
fs/reiserfs/journal.c:4319:2: warning: returning void-valued expression
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Chris Mason <chris.mason at oracle.com>
Cc: Jeff Mahoney <jeffm at suse.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9e902df6be2cb7444e5a0f7e2e72bcbf3b978f3e
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Mon Apr 28 02:16:20 2008 -0700
reiserfs: le*_add_cpu conversion
replace all:
little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) +
expression_in_cpu_byteorder);
with:
leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: Jeff Mahoney <jeffm at suse.com>
Cc: Chris Mason <chris.mason at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 78e917d59c30c3d5a4cda7f47e0f40f1c98f9b02
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:16:19 2008 -0700
udf: fix sparse warning in namei.c
Let's use bsize instead.
fs/udf/namei.c:960:12: warning: symbol 'elen' shadows an earlier one
fs/udf/namei.c:937:15: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jan Kara <jack at ucw.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 36a53ddf859b0a9aa56e2e72978997bf68eec37a
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:16:18 2008 -0700
ufs: replace __inline with inline
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Evgeniy Dushistov <dushistov at mail.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0045edaaf980e577272eeb11832daebaeb5d63c4
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Mon Apr 28 02:16:18 2008 -0700
ufs: remove unused fs64_add and fs64_sub
remove fs64_add and fs64_sub - they probably weren't ever used because
their prototypes used u32 instead of __fs64
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: Evgeniy Dushistov <dushistov at mail.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9746077a71d01b8d86f5e471a3a2c8f1fa91ef94
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:16:17 2008 -0700
ufs: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jan Engelhardt <jengelh at linux01.gwdg.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3c5afae2bac974fe2c15cd9439f921526b3ea2d7
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Mon Apr 28 02:16:16 2008 -0700
ufs: [bl]e*_add_cpu conversion
replace all:
big/little_endian_variable = cpu_to_[bl]eX([bl]eX_to_cpu(big/little_endian_variable) +
expression_in_cpu_byteorder);
with:
[bl]eX_add_cpu(&big/little_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: Evgeniy Dushistov <dushistov at mail.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 08fc99bfc39d5b394aa27498ac5f14df0ef8e52a
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:16:16 2008 -0700
jbd: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e05b6b524bd5c5c2bae1b64a7cbe08d46d57a6fe
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:16:15 2008 -0700
ext3: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fa1ff1e02fee908dfdc3f92902d39acc38041e4c
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:16:14 2008 -0700
ext3: fix mount messages when quota disabled
When quota is disabled, we should not print 'journaled quota not supported'
when user tried to mount non-journaled quota. Also fix typo in the message.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2588ef83f7933d8ae42868d7bf68fc8a3001186b
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Mon Apr 28 02:16:14 2008 -0700
ext3: retry block allocation if new blocks are allocated from system zone
If the block allocator gets blocks out of system zone ext3 calls ext3_error.
But if the file system is mounted with errors=continue retry block allocation.
We need to mark the system zone blocks as in use to make sure retry don't
pick them again
System zone is the block range mapping block bitmap, inode bitmap and inode
table.
[akpm at linux-foundation.org: fix typo in comment]
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 07c9938a4e2c92b796b163dc70e99d3d1870aaee
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:16:13 2008 -0700
ext3: fix hang on umount with quotas when journal is aborted
Call dquot_drop() from ext3_dquot_drop() even if we fail to start a
transaction. Otherwise we never get to dropping references to quota
structures from the inode and umount will hang indefinitely. Thanks to
Payphone LIOU for spotting the problem.
Signed-off-by: Jan Kara <jack at suse.cz>
Cc: Payphone LIOU <lioupayphone at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0b23076988b44b2c165e060248345de6f2337387
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:16:12 2008 -0700
ext3: fix update of mtime and ctime on rename
Make ext3 update mtime and ctime of the directory into which we move file even
if the directory entry already exists.
Signed-off-by: Jan Kara <jack at suse.cz>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5b9a499d77e9dd39c9e6611ea10c56a31604f274
Author: Josef Bacik <jbacik at redhat.com>
Date: Mon Apr 28 02:16:12 2008 -0700
jbd: fix possible journal overflow issues
There are several cases where the running transaction can get buffers added to
its BJ_Metadata list which it never dirtied, which makes its t_nr_buffers
counter end up larger than its t_outstanding_credits counter.
This will cause issues when starting new transactions as while we are logging
buffers we decrement t_outstanding_buffers, so when t_outstanding_buffers goes
negative, we will report that we need less space in the journal than we
actually need, so transactions will be started even though there may not be
enough room for them. In the worst case scenario (which admittedly is almost
impossible to reproduce) this will result in the journal running out of space.
The fix is to only
refile buffers from the committing transaction to the running transactions
BJ_Modified list when b_modified is set on that journal, which is the only way
to be sure if the running transaction has modified that buffer.
This patch also fixes an accounting error in journal_forget, it is possible
that we can call journal_forget on a buffer without having modified it, only
gotten write access to it, so instead of freeing a credit, we only do so if
the buffer was modified. The assert will help catch if this problem occurs.
Without these two patches I could hit this assert within minutes of running
postmark, with them this issue no longer arises. Thank you,
Signed-off-by: Josef Bacik <jbacik at redhat.com>
Cc: <linux-ext4 at vger.kernel.org>
Acked-by: Jan Kara <jack at ucw.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5bc833feaa8b2236265764e7e81f44937be46eda
Author: Josef Bacik <jbacik at redhat.com>
Date: Mon Apr 28 02:16:10 2008 -0700
jbd: fix the way the b_modified flag is cleared
Currently at the start of a journal commit we loop through all of the buffers
on the committing transaction and clear the b_modified flag (the flag that is
set when a transaction modifies the buffer) under the j_list_lock.
The problem is that everywhere else this flag is modified only under the jbd
lock buffer flag, so it will race with a running transaction who could
potentially set it, and have it unset by the committing transaction.
This is also a big waste, you can have several thousands of buffers that you
are clearing the modified flag on when you may not need to. This patch
removes this code and instead clears the b_modified flag upon entering
do_get_write_access/journal_get_create_access, so if that transaction does
indeed use the buffer then it will be accounted for properly, and if it does
not then we know we didn't use it.
That will be important for the next patch in this series. Tested thoroughly
by myself using postmark/iozone/bonnie++.
Signed-off-by: Josef Bacik <jbacik at redhat.com>
Cc: <linux-ext4 at vger.kernel.org>
Acked-by: Jan Kara <jack at ucw.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 269b26191650be46ce6c91dec24cf20f59650529
Author: Julia Lawall <julia at diku.dk>
Date: Mon Apr 28 02:16:09 2008 -0700
fs/ext3: use BUG_ON
if (...) BUG(); should be replaced with BUG_ON(...) when the test has no
side-effects to allow a definition of BUG_ON that drops the code completely.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ disable unlikely @ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (unlikely(E)) { BUG(); }
+ BUG_ON(E);
)
@@ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (E) { BUG(); }
+ BUG_ON(E);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 33575f8ffe99bf9e381161ccd76b39079c0aa92f
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Mon Apr 28 02:16:08 2008 -0700
ext3: check ext3_journal_get_write_access() errors
Check ext3_journal_get_write_access() errors.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e0e369a7dd39894465b6501a9492173e8104a19b
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Mon Apr 28 02:16:08 2008 -0700
ext3: use ext3_get_group_desc()
Use ext3_get_group_desc()
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 22a5daf5375a900e1a4efe8ffe2daef9be01e873
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Mon Apr 28 02:16:07 2008 -0700
ext3: add missing ext3_journal_stop()
Add missing ext3_journal_stop() in error handling.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1eaafeae4b6f87eabdbabe3277826696f4ca196f
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Mon Apr 28 02:16:07 2008 -0700
ext3: use ext3_group_first_block_no()
Use ext3_group_first_block_no()
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 15633005e07883b57c6c7ca539c32148c3a7f588
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 28 02:16:06 2008 -0700
make ext3_xattr_list() static
Make the needlessly global ext3_xattr_list() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e7f23ebdef879226817ce94ae6e298afc8cd093d
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Mon Apr 28 02:16:06 2008 -0700
ext3: convert byte order of constant instead of variable
Convert byte order of constant instead of variable which can be done at
compile time (vs run time).
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3d61f75eefedf75914ab4453c67aaa2ee64bcf93
Author: Hisashi Hifumi <hifumi.hisashi at oss.ntt.co.jp>
Date: Mon Apr 28 02:16:05 2008 -0700
ext3: fdatasync should skip metadata writeout when overwriting
Currently fdatasync is identical to fsync in ext3.
I think fdatasync should skip journal flush in data=ordered and
data=writeback mode when it overwrites to already-instantiated blocks on
HDD. When I_DIRTY_DATASYNC flag is not set, fdatasync should skip journal
writeout because this indicates only atime or/and mtime updates.
Following patch is the same approach of ext2's fsync code(ext2_sync_file).
I did a performance test using the sysbench.
#sysbench --num-threads=128 --max-requests=50000 --test=fileio --file-total-size=128G
--file-test-mode=rndwr --file-fsync-mode=fdatasync run
The result on ext3 was:
-2.6.24
Operations performed: 0 Read, 50080 Write, 59600 Other = 109680 Total
Read 0b Written 782.5Mb Total transferred 782.5Mb (12.116Mb/sec)
775.45 Requests/sec executed
Test execution summary:
total time: 64.5814s
total number of events: 50080
total time taken by event execution: 3713.9836
per-request statistics:
min: 0.0000s
avg: 0.0742s
max: 0.9375s
approx. 95 percentile: 0.2901s
Threads fairness:
events (avg/stddev): 391.2500/23.26
execution time (avg/stddev): 29.0155/1.99
-2.6.24-patched
Operations performed: 0 Read, 50009 Write, 61596 Other = 111605 Total
Read 0b Written 781.39Mb Total transferred 781.39Mb (16.419Mb/sec)
1050.83 Requests/sec executed
Test execution summary:
total time: 47.5900s
total number of events: 50009
total time taken by event execution: 2934.5768
per-request statistics:
min: 0.0000s
avg: 0.0587s
max: 0.8938s
approx. 95 percentile: 0.1993s
Threads fairness:
events (avg/stddev): 390.6953/22.64
execution time (avg/stddev): 22.9264/1.17
Filesystem I/O throughput was improved.
Signed-off-by :Hisashi Hifumi <hifumi.hisashi at oss.ntt.co.jp>
Acked-by: Jan Kara <jack at suse.cz>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8b91582500ae750db22bd515379616e5e9ad06ab
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Mon Apr 28 02:16:04 2008 -0700
ext2: retry block allocation if new blocks are allocated from system zone
If the block allocator gets blocks out of system zone ext2 calls ext2_error.
But if the file system is mounted with errors=continue retry block allocation.
We need to mark the system zone blocks as in use to make sure retry don't
pick them again
System zone is the block range mapping block bitmap, inode bitmap and inode
table.
[akpm at linux-foundation.org: fix typo in comment]
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 605afd60ef6dde254fc9b8667c5bccebade251c3
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:16:03 2008 -0700
ext2: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2c11619a590e13fecc801c9c50859cba29740f38
Author: Julia Lawall <julia at diku.dk>
Date: Mon Apr 28 02:16:02 2008 -0700
fs/ext2: use BUG_ON
if (...) BUG(); should be replaced with BUG_ON(...) when the test has no
side-effects to allow a definition of BUG_ON that drops the code completely.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ disable unlikely @ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (unlikely(E)) { BUG(); }
+ BUG_ON(E);
)
@@ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (E) { BUG(); }
+ BUG_ON(E);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4c8b3125f8dcefd1ee2990113fe69cfa9e9fa609
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Mon Apr 28 02:16:02 2008 -0700
ext2: use ext2_fsblk_t type
Use ext2_fsblk_t type for filesystem-wide blocks number
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 24097d12efbb97bff14fb6e350508853db0f9595
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Mon Apr 28 02:16:01 2008 -0700
ext2: use ext2_group_first_block_no()
Use ext2_group_first_block_no() and assign the return values to
ext2_fsblk_t variables.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bbff28602436cc7ca660757bba81f03b99e8586d
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Mon Apr 28 02:16:00 2008 -0700
ext2: improve ext2_readdir() return value
Improve ext2_readdir() return value for ext2_get_page() failure by using the
actual result of ext2_get_page().
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 31f68e130149809c5d49583e1ff225dd5d404d83
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Mon Apr 28 02:16:00 2008 -0700
ext2: convert byte order of constant instead of variable
Convert byte order of constant instead of variable which can be done at
compile time (vs run time).
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fba4d3997f4c3dc6de927f7f516168580033ae1a
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Mon Apr 28 02:15:59 2008 -0700
ext2: le*_add_cpu conversion
replace all:
little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) +
expression_in_cpu_byteorder);
with:
leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1e3832b0b1518232f47d89bc9d1f68e151a749ff
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 02:15:59 2008 -0700
PNP: use dev_printk for quirk messages
Convert quirk printks to dev_printk().
[akpm at linux-foundation.org: fix warnings, improve output text]
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Cc: Adam Belay <ambx1 at neo.rr.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b8068162806266552933e395877452de4f2427e7
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 02:15:58 2008 -0700
PNP: simplify quirk debug output
print_fn_descriptor_symbol() prints the address if we don't have a symbol,
so no need to print both.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0bc11fd446d2ca29459c3c8e04a6d36db9bbbea4
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 02:15:57 2008 -0700
PNP: skip dev->protocol NULL checks
Every PNP device should have a valid protocol pointer. If it doesn't,
something's wrong and we should oops so we can find and fix the problem.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Cc: Adam Belay <ambx1 at neo.rr.com>
Cc: Adrian Bunk <bunk at kernel.org>
Cc: Rene Herman <rene.herman at keyaccess.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 62b0559aad5cba060568cb962e4bbb111ec73a14
Author: Julia Lawall <julia at diku.dk>
Date: Mon Apr 28 02:15:56 2008 -0700
drivers/md: use time_before, time_before_eq, etc
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ change_compare_np @
expression E;
@@
(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)
@ include depends on change_compare_np @
@@
#include <linux/jiffies.h>
@ no_include depends on !include && change_compare_np @
@@
#include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Julia Lawall <julia at diku.dk>
Cc: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d7a420c9472a95c46600a0345434b7b166e0b9c7
Author: Nick Andrew <nick at nick-andrew.net>
Date: Mon Apr 28 02:15:55 2008 -0700
raid: remove leading TAB on printk messages
MD drivers use one printk() call to print 2 log messages and the second line
may be prefixed by a TAB character. It may also output a trailing space
before newline. klogd (I think) turns the TAB character into the 2 characters
'^I' when logging to a file. This looks ugly.
Instead of a leading TAB to indicate continuation, prefix both output lines
with 'raid:' or similar. Also remove any trailing space in the vicinity of
the affected code and consistently end the sentences with a period.
Signed-off-by: Nick Andrew <nick at nick-andrew.net>
Cc: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4ef197d87ad7d4bb326de3e9b8ecbb26f9e86253
Author: Dan Williams <dan.j.williams at intel.com>
Date: Mon Apr 28 02:15:54 2008 -0700
md: raid5.c convert simple_strtoul to strict_strtoul
strict_strtoul handles the open-coded sanity checks in
raid5_store_stripe_cache_size and raid5_store_preread_threshold
Acked-by: NeilBrown <neilb at suse.de>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8b3e6cdc53b7f29f7026955d6cb6902a49322a15
Author: Dan Williams <dan.j.williams at intel.com>
Date: Mon Apr 28 02:15:53 2008 -0700
md: introduce get_priority_stripe() to improve raid456 write performance
Improve write performance by preventing the delayed_list from dumping all its
stripes onto the handle_list in one shot. Delayed stripes are now further
delayed by being held on the 'hold_list'. The 'hold_list' is bypassed when:
* a STRIPE_IO_STARTED stripe is found at the head of 'handle_list'
* 'handle_list' is empty and i/o is being done to satisfy full stripe-width
write requests
* 'bypass_count' is less than 'bypass_threshold'. By default the threshold
is 1, i.e. every other stripe handled is a preread stripe provided the
top two conditions are false.
Benchmark data:
System: 2x Xeon 5150, 4x SATA, mem=1GB
Baseline: 2.6.24-rc7
Configuration: mdadm --create /dev/md0 /dev/sd[b-e] -n 4 -l 5 --assume-clean
Test1: dd if=/dev/zero of=/dev/md0 bs=1024k count=2048
* patched: +33% (stripe_cache_size = 256), +25% (stripe_cache_size = 512)
Test2: tiobench --size 2048 --numruns 5 --block 4096 --block 131072 (XFS)
* patched: +13%
* patched + preread_bypass_threshold = 0: +37%
Changes since v1:
* reduce bypass_threshold from (chunk_size / sectors_per_chunk) to (1) and
make it configurable. This defaults to fairness and modest performance
gains out of the box.
Changes since v2:
* [neilb at suse.de]: kill STRIPE_PRIO_HI and preread_needed as they are not
necessary, the important change was clearing STRIPE_DELAYED in
add_stripe_bio and this has been moved out to make_request for the hang
fix.
* [neilb at suse.de]: simplify get_priority_stripe
* [dan.j.williams at intel.com]: reset the bypass_count when ->hold_list is
sampled empty (+11%)
* [dan.j.williams at intel.com]: decrement the bypass_count at the detection
of stripes being naturally promoted off of hold_list +2%. Note, resetting
bypass_count instead of decrementing on these events yields +4% but that is
probably too aggressive.
Changes since v3:
* cosmetic fixups
Tested-by: James W. Laferriere <babydr at baby-dragons.com>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e46b272b6608783ed7aa7b0594871550ce20b849
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:15:50 2008 -0700
md: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9a7b2b0f36c40beeb252cb5ceff36bb295e88d97
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:15:49 2008 -0700
md: fix integer as NULL pointer warnings in md.c
drivers/md/md.c:734:16: warning: Using plain integer as NULL pointer
drivers/md/md.c:1115:16: warning: Using plain integer as NULL pointer
Add some braces to match the else-block as well.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5ae121705bed9ea7425daef4d7d29038f7312f3f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:15:47 2008 -0700
video: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: Antonino Daplas <adaplas at gmail.com>
Cc: Antonino A. Daplas <adaplas at gmail.com>
Cc: Antonino Daplas <adaplas at pol.net>
Cc: Richard Purdie <rpurdie at rpsys.net>
Cc: Jean Delvare <khali at linux-fr.org>
Cc: Adrian Bunk <bunk at stusta.de>
Cc: Russell King <rmk+kernel at arm.linux.org.uk>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e7a05aa9e697ff6fc165d45671cdcca601942f62
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Mon Apr 28 02:15:47 2008 -0700
BF54x Framebuffer Driver: BF542 does not have EPPI0, so dont allow the LQ034 driver for now
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6002db8287cdf9a8497aa345be2d27936a3b6a52
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Mon Apr 28 02:15:46 2008 -0700
BF54x Framebuffer Driver: drop request_irq cast
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8224c3b166db81a8dbd128df455453897fe2b48b
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 28 02:15:45 2008 -0700
drivers/video/w100fb.c: avoid a couple of error-path NULL derefs
Fix a couple of error-patch oopses identified by Marcio Buss in
http://bugzilla.kernel.org/show_bug.cgi?id=9567.
Cc: Marcio Buss <marciobuss at gmail.com>
Cc: Jeff Zhou <xinzhou.sjtu at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0e170c72c0c55bd78213a0f5053bd9a1dde403b7
Author: Maik Broemme <mbroemme at plusserver.de>
Date: Mon Apr 28 02:15:43 2008 -0700
fbdev: intelfb: add support for the Intel Integrated Graphics Controller 965G/965GM
Add support for the 965G and 965GM graphic chipsets to the intelfb driver. I
have a notebook with an Intel Mobile GM965/GL960 Integrated Graphics
Controller and with the attached patch the framebuffer comes up. I have
tested it a bit with DirectFB to make sure it is working stable.
I also have an Intel Mobile GM945 and I compared the results, the programming
interface of the 9xx series from Intel is mostly the same, so I think the
patch should add all the functionality which the 945GM has.
Signed-off-by: Maik Broemme <mbroemme at plusserver.de>
Cc: Dave Airlie <airlied at linux.ie>
Cc: Antonino Daplas <adaplas at pol.net>
Cc: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Cc: Krzysztof Halasa <khc at pm.waw.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0aa163418edfb96ca3b39133979d8e4352aaac3c
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Mon Apr 28 02:15:42 2008 -0700
fb: convert /proc/fb to seq_file interface
Note: looks like accesses to "registered_fb" are done without any exclusion
so there're none in new proc code, too. This should be fixed in separate
patch.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 60c1645dfac320e992bb5635887b7698ae6606bc
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 28 02:15:41 2008 -0700
drivers/video/uvesafb.c: fix error-path memory leak
Fix bug identified by Daniel Marjamki: `m' is leaked on the error path.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10452
Cc: Daniel Marjamki <danielm77 at spray.se>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: "Randy.Dunlap" <rdunlap at xenotime.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0e27aa3dabb541edee9f23b37114856a528de01e
Author: Jaya Kumar <jayakumar.lkml at gmail.com>
Date: Mon Apr 28 02:15:40 2008 -0700
fbdev: platforming hecubafb and n411
This patch splits hecubafb into the platform independent hecubafb and the
platform dependent n411.
Signed-off-by: Jaya Kumar <jayakumar.lkml at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2422fbba0684ddf08898ec2f3cf23cb16a54b3f5
Author: Sebastian Siewior <frame+buffer at ml.breakpoint.cc>
Date: Mon Apr 28 02:15:39 2008 -0700
metronomefb: don't free firmware twice in error path
Right now, if request_irq or anthing after it fails than we free the firmware
for the second time what might end bad :)
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Acked-by: Jaya Kumar <jayakumar.lkml at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 03c33a4f002b2521debf1efc269cade983b6e86a
Author: Jaya Kumar <jayakumar.lkml at gmail.com>
Date: Mon Apr 28 02:15:38 2008 -0700
fbdev: platforming metronomefb and am200epd
This patch splits metronomefb into the platform independent metronomefb and
the platform dependent am200epd.
Signed-off-by: Jaya Kumar <jayakumar.lkml at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 963654a9c919d18f8b9137f8ffd9d2d30a139269
Author: Jaya Kumar <jayakumar.lkml at gmail.com>
Date: Mon Apr 28 02:15:37 2008 -0700
fbdev: hecubafb bugfix
This patch is a bugfix for hecubafb_write which would return an incorrect
error value for the bytecount from framebuffer writes.
Signed-off-by: Jaya Kumar <jayakumar.lkml at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 555514fabc1c24fac69ff46feac384180828182c
Author: Jaya Kumar <jayakumar.lkml at gmail.com>
Date: Mon Apr 28 02:15:36 2008 -0700
fbdev: metronomefb bugfix
This patch is a bugfix for the use of cfb_* functions instead of sys_*
functions. sys_* should be used with vmalloced framebuffers. the previous
cfb_ use would not work for callers of imageblit/etc.
Signed-off-by: Jaya Kumar <jayakumar.lkml at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6f90a8bdd17e63fb27b4f6d50e8a2919704ea254
Author: York Sun <yorksun at freescale.com>
Date: Mon Apr 28 02:15:36 2008 -0700
powerpc: Add DIU platform code for MPC8610HPCD
Add platform code to support Freescale DIU. The platform code includes
framebuffer memory allocation, pixel format, monitor port, etc.
Signed-off-by: York Sun <yorksun at freescale.com>
Signed-off-by: Timur Tabi <timur at freescale.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9b53a9e28a34ed82516191dc46ae018e0e899546
Author: York Sun <yorksun at freescale.com>
Date: Mon Apr 28 02:15:34 2008 -0700
fbdev: powerpc: driver for Freescale 8610 and 5121 DIU
The following features are supported:
plane 0 works as a regular frame buffer, can be accessed by /dev/fb0
plane 1 has two AOIs (area of interest), can be accessed by /dev/fb1 and /dev/fb2
plane 2 has two AOIs, can be accessed by /dev/fb3 and /dev/fb4
Special ioctls support AOIs
All /dev/fb* can be used as regular frame buffer devices, except hardware
change can only be made through /dev/fb0. Changing pixel clock has no effect
on other fbs.
Limitation of usage of AOIs:
AOIs on the same plane can not be horizonally overlapped
AOIs have horizonal order, i.e. AOI0 should be always on top of AOI1
AOIs can not beyond phisical display area. Application should check AOI geometry
before changing physical resolution on /dev/fb0
required command line parameters to preallocate memory for frame buffer diufb.
optional command line parameters to set modes and monitor
video=fslfb:[resolution][,bpp][,monitor]
Syntax:
Resolution
xres x yres-bpp at refresh_rate, the -bpp and @refresh_rate are optional
eg, 1024x768, 1280x1024, 1280x1024-32, 1280x1024 at 60, 1280x1024-32 at 60, 1280x480-32 at 60
Bpp
bpp=32, bpp=24, or bpp=16
Monitor
monitor=0, monitor=1, monitor=2
0 is DVI
1 is Single link LVDS
2 is Double link LVDS
Note: switching monitor is a board feather, not DIU feather. MPC8610HPCD has three
monitor ports to swtich to. MPC5121ADS doesn't have additional monitor port. So switching
monirot port for MPC5121ADS has no effect.
If compiled as a module, it takes pamameters mode, bpp, monitor with the same syntax above.
Signed-off-by: York Sun <yorksun at freescale.com>
Signed-off-by: Timur Tabi <timur at freescale.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7d345b2253f92804948d66f4db17a49c1932b9a3
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Mon Apr 28 02:15:33 2008 -0700
fbdev: nv: fix sparse noise
Mostly signedness fixes. nv10_sim_state existence in both drivers suggests
that one of them should be removed, but that's for later.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Antonino A. Daplas <adaplas at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7ce3ab100e4e115ca2c4fd931844a0f1a50df406
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Mon Apr 28 02:15:33 2008 -0700
fbdev: nv: drop useless CONFIG_PCI checks
Both FB_RIVA and FB_NVIDIA depends on PCI, so CONFIG_PCI always defined for
them.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Antonino A. Daplas <adaplas at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit affc23d11631a47d35dfd552ded8ca255c001490
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Mon Apr 28 02:15:32 2008 -0700
fbdev: nv: drop useless MODULE ifdefs
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Antonino A. Daplas <adaplas at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3553a2fa8cbfc9f85f1809366be5884054f52c6d
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:31 2008 -0700
OLPC: gxfb/lxfb: add DCON panel modes to framebuffer drivers
Since there's no way to autodetect panel modes, we're forced to hardcode them
in the driver and add a big fat #ifdef. The OLPC DCON needs a specific mode
line (at 1200x900). This adds it to both gxfb and lxfb.
(Jordan said: We could probably detect the panel mode, but there isn't any
reason to since the panel timings are well known and won't change. While OFW
detection would be good computer science fu, it would be a wasted effort since
its so easy to hard code them into the table.)
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fd96795630428ceca775bd1effc5bf41a9fe5272
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:30 2008 -0700
gxfb/lxfb: detect framebuffer size using an MSR if VSA2 isn't available
If there's no VSA2 (ie, if we're using tinybios or OpenFirmware), use the
GLIU's P2D Range Offset Descriptor to determine how much memory we have
available for the framebuffer.
Originally based on a patch by Jordan Crouse. Tested with OpenFirmware;
Pascal informs me that tinybios has a stub that fills in P2D_RO0.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 61a517a063abf659cbf61df11f8e2131fdafccec
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:30 2008 -0700
gxfb/lxfb: use VSA definitions when fetching framebuffer size
..Rather than using magic constants.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4537f93ae88c77a26e77d192ca32a0c2cd359592
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:29 2008 -0700
lxfb/gxfb: when blanking with FB_BLANK_POWERDOWN, also turn off the CRT
The Display Control's CRT_EN can be shut off when we enter FB_BLANK_POWERDOWN
in an attempt to save additional power.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 564820d42aaa55e6ce60a59c0f60832e1330c58b
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:28 2008 -0700
lxfb: disable suspend VT switch by default
By default disable VT switch, but allow it to be overridden via the
'vt_switch' module arg.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c805df3d6205573fa7a8ef2334b1c8d67381dc8b
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:27 2008 -0700
lxfb: rename kernel arg fbsize to vram
Match other fb drivers (including gxfb). Also, document the current boot
arguments in Documentation/fb/lxfb.txt.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f694e53bd0db69557ee8e0db2d1602818ff173b0
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:27 2008 -0700
lxfb: add power management functionality
This adds the ability to suspend/resume the lxfb driver, which includes:
- Register and palette saving code; registers are stored in lxfb_par.
A few MSR values are saved as well.
- lx_powerup and lx_powerdown functions which restore/save registers and
enable/disable graphic engines.
- lxfb_suspend/lxfb_resume
Originally based on a patch by Jordan Crouse.
[akpm at linux-foundation.org: be conventional, save an ifdef]
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aec40532c4d1183fa1ec415bb7dae08e19fc6b01
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:26 2008 -0700
lxfb: rearrange/rename MSR bitfields
Finally, move the MSR bitfields around in lxfb.h, and rename them. Alas, most
of that crap appears to be undocumented.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 31f51fa8d47943f14a270955415b94a22e174a10
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:25 2008 -0700
lxfb: clean up final bits of df_regs
Finally drop the last remnants of df_regs, using vp_regs instead. Also, drop
panel_width and panel_height from lxfb_par; they're unused.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f5c90e85dc77669a55fecfb593bb8e7f47374ee2
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:24 2008 -0700
lxfb: clean up register definitions
- Rename various bitfield defines to match the data sheet names.
- Rename DF_ register definitions to VP_ to match the data sheet;
ie, DF_PAR -> VP_PAR.
- for GP/DC registers, rather than defining to specific addresses, use
an enum to number them sequentially and just multiply by 4 (bytes) to
access them (in read_*/write_* functions).
- for VP/FP registers, use an enum and multiple by 8 (bytes). They're
64bit registers.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9286361beab8ef5c928ecb2bfefe68ab0176238b
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:24 2008 -0700
lxfb: create GP/DC/VP/FP-specific handlers rather than using readl/writel
This creates read_gp/write_gp, read_dc/write_dc, read_vp/write_vp, and
read_fp/write_fp for reading and updating those registers. Note that we don't
follow the 'DF' naming; those will be renamed to VP shortly.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3888d4639e78802c4ec1086127124e890461b9e4
Author: Jens Rottmann <JRottmann at LiPPERT-AT.de>
Date: Mon Apr 28 02:15:22 2008 -0700
lxfb: extend PLL table to support dotclocks below 25 MHz
Extends the PLL frequency table of the AMD Geode-LX frame buffer driver to
make use of the DIV4 bit, thus adding support for dotclocks between 6 and 25
MHz. These are needed for small LCDs (e.g. 320x240). Also inserts some
intermediate steps between pre-existing frequencies.
Signed-off-by: Jens Rottmann <JRottmann at LiPPERT-AT.de>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5fb2d929a070fd31b8fb8f74cef8694a09853fdb
Author: Nicolas Ferre <nicolas.ferre at atmel.com>
Date: Mon Apr 28 02:15:21 2008 -0700
atmel_lcdfb: adjust fifo size for at91sam9rl
AT91SAM9RL soc has a 2048 bytes deep FIFO, like AT91SAM9263.
[bn at niasdigital.com: fix build breakage in atmel_lcdfb]
Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Nicolas FERRE <nicolas.ferre at rfo.atmel.com>
Cc: Andrew Victor <andrew at sanpeople.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fd0858017eb67aa0d41dd4e8499ca6a7bfb63941
Author: Nicolas Ferre <nicolas.ferre at atmel.com>
Date: Mon Apr 28 02:15:21 2008 -0700
atmel_lcdfb: wiring BGR to RGB color mode
Adds different wiring mode for the LCD screen.
The legacy atmel LCDC IP uses a non standard color mode, "BGR-555.1" instead
"RGB-565". The major part of graphic stacks for embedded systems uses only
"RGB-565". It is possible to swap LCD IOs instead of doing this bit swapping
by software (See application note AT91SAM9 LCD Controller
http://www.atmel.com/dyn/resources/prod_documents/doc6300.pdf)
This wire swapping is done on the at91sam9rl-ek board (board code
using this patch will come later).
Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>
Cc: David Brownell <dbrownell at users.sourceforge.net>
Cc: Hans-Christian Egtvedt <hcegtvedt at atmel.com>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
Cc: Andrew Victor <avictor.za at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cf19a37e0641d975d271a5a30f097dd6b96d232f
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Mon Apr 28 02:15:20 2008 -0700
atmel_lcdfb: suspend/resume support
Teach atmel_lcdfb driver how to suspend/resume.
Note that the backlight control should probably do more of the same stuff:
turning off display power (more than just the backlight) and stopping the
clocks (and dma to drive the no-longer-seen display). No point in wasting
power to generate images that can't be observed, after all...
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>
Cc: Hans-Christian Egtvedt <hcegtvedt at atmel.com>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
Cc: Andrew Victor <avictor.za at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 01d3a5e7fab7732cfc5d5d4533e9378ea435295a
Author: Haavard Skinnemoen <hskinnemoen at atmel.com>
Date: Mon Apr 28 02:15:19 2008 -0700
atmel_lcdfb: don't initialize a pre-allocated framebuffer
If the user specified a fixed framebuffer address on the command line, it may
have been initialized already with a splash image or something, so we
shouldn't clear it.
Therefore, we should only initialize the framebuffer if we allocated it
ourselves. This patch also updates the AVR32 setup code to clear the
framebuffer if it allocated it itself, i.e. the user didn't provide a fixed
address or the reservation failed.
I've updated the at91 platform code as well so that it initializes the
framebuffer if it is located in SRAM, but I haven't tested that it actually
works.
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Nicolas FERRE <nicolas.ferre at rfo.atmel.com>
Cc: Andrew Victor <andrew at sanpeople.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 20e061fb750d36ec0ffcb2e44ed7dafa9018223b
Author: Ondrej Zajicek <santiago at crfreenet.org>
Date: Mon Apr 28 02:15:18 2008 -0700
fbdev: framebuffer_alloc() fixes
Correct the dev arg of framebuffer_alloc() in arkfb, s3fb and vt8623fb.
Signed-off-by: Ondrej Zajicek <santiago at crfreenet.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8f5af9de9cf3cbf51c5758a1d5ea266aea6fe175
Author: Ondrej Zajicek <santiago at crfreenet.org>
Date: Mon Apr 28 02:15:17 2008 -0700
fbdev: vt8623fb: better resume from STR
After resume from STR, image is shifted by 8 pixels to the left. This patch
fixes it.
Signed-off-by: Ondrej Zajicek <santiago at crfreenet.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9201a8584c9bdb45b7b32cb3d2280c3dfbc76e39
Author: Jean Delvare <khali at linux-fr.org>
Date: Mon Apr 28 02:15:16 2008 -0700
savagefb: speed up the I2C bus
There is no reason to drive the savagefb I2C bus at such a low speed, so bump
it from 12.5 kbps to 50 kbps. The Intel (i810) and Matrox framebuffer drivers
already run their I2C bus at this speed, and so are the legacy i2c-savage4 and
i2c-prosavage drivers.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a1e68927c1d7030001590113181e0c8b6107649b
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Mon Apr 28 02:15:15 2008 -0700
drivers/video/imsttfb.c: add missing curly brackets
in #if 0 inactivated function msttfb_load_cursor_image() the call eieio()
occurs after rather than in the loop due to missing curly brackets.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5e72b32d86841e4a4a3045d8e35a39eb53ce7ce2
Author: Michal Januszewski <spock at gentoo.org>
Date: Mon Apr 28 02:15:15 2008 -0700
uvesafb: don't treat valid modes returned byfb_find_mode() as errors
Don't treat valid modes returned by fb_find_mode() (best-fit modes, default
modes or the first valid mode) as errors.
Currently, when fb_find_mode() finds a valid mode belonging to one of the
above-mentioned classes, uvesafb will ignore it and will try to set a 640x480
video mode. The expected behaviour (introduced by this patch) would be to use
the valid mode returned by fb_find_mode() instead.
Signed-off-by: Michal Januszewski <spock at gentoo.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e0745ae7210c14e611a1fab2af820a4c2e447de5
Author: Jean Delvare <khali at linux-fr.org>
Date: Mon Apr 28 02:15:14 2008 -0700
radeonfb: speed up the I2C buses
There is no reason to drive the radeon I2C buses at such a low speed, so bump
it from 12.5 kbps to 50 kbps. The Intel (i810) and Matrox framebuffer drivers
already run their I2C bus at this speed.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bc3bf466e4a0a53d5c78561594c9cb4225bbb481
Author: Jean Delvare <khali at linux-fr.org>
Date: Mon Apr 28 02:15:13 2008 -0700
radeonfb: drop redundant RTRACE macro
RTRACE() does exactly the same thing as the standard pr_debug() call, so just
use the latter.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b0313f89672eddf0188dac96bb8f83135510a45c
Author: Jean Delvare <khali at linux-fr.org>
Date: Mon Apr 28 02:15:12 2008 -0700
radeonfb: fix debug option
Fix CONFIG_FB_RADEON_DEBUG. DEBUG must be defined before including any kernel
header, otherwise dev_dbg() resolves to a no-op. Also, when debugging is
disabled, don't set DEBUG at all instead of setting it to 0, to comply with
what the kernel headers expect.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e7a18c9c86d14247b514157aae60326d45695476
Author: Andreas Herrmann <aherrman at arcor.de>
Date: Mon Apr 28 02:15:11 2008 -0700
radeonfb: use PCI device id in hex for name string
Additionally provide PCI device id in character format if possible. (The
printable characters were commonly used to identify the cards.)
Signed-off-by: Andreas Herrmann <aherrman at arcor.de>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit af2afd247f0fae25d66f210fb800fe6a2958366e
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Mon Apr 28 02:15:10 2008 -0700
drivers/video/aty/aty128fb.c: fix incorrect usage of strncat in aty128_init()
Fix incorrect length for strncat by replacing it with strlcat
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9e3f0ca812ab8fa3f4e65ade41bf6fb936f14e15
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Mon Apr 28 02:15:10 2008 -0700
fbdev: add removed option "mode" to keep compatibility
Add removed option "mode" to keep compatibility with existing setups. The
option is back for pm2fb, tridentfb and vt8623fb drivers.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a81405439c4e9f710f75c41503cef5a5dbd39e4d
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Mon Apr 28 02:15:09 2008 -0700
s3fb: add option mode_option
Add the option "mode_option". It also moves mtrr variable to devinitdata
section.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1abf91729faf2fd9b16b5987a68fb99fe5dcc75a
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Mon Apr 28 02:15:08 2008 -0700
arkfb: add option mode_option
Add the option "mode_option". This is one step toward changing all fb
drivers to have common "mode_option" parameter.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cc6c549c7a9808cc7a8a5afbfa54dbbd2262509d
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Mon Apr 28 02:15:08 2008 -0700
vt8623fb: change option mode to mode_option
Change the option "mode" into "mode_option".
This is one step toward changing all fb drivers to have common "mode_option"
parameter.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cf6d880c358110f986e38114470f41908bc89a12
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Mon Apr 28 02:15:07 2008 -0700
update modedb.txt documentation about mode_option parameter change
Add names of drivers converted to "mode_option" parameter.
This is one step toward changing all fb drivers to have common "mode_option"
parameter.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4e65c613109f0600681f61f746a2dba8547190a6
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Mon Apr 28 02:15:07 2008 -0700
pm3fb: change option mode to mode_option
Add the option "mode_option".
This is one step toward changing all fb drivers to have common "mode_option"
parameter.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 07f41e45f8c1caf366b382b6b9654ebd0a4efc90
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Mon Apr 28 02:15:06 2008 -0700
tridentfb: change option mode to mode_option
Change the option "mode_option" into "mode". It also adds __init attribute to
tridentfb_setup function.
This is one step toward changing all fb drivers to have common "mode_option"
parameter.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: Alain Kalker <miki at dds.nl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5eb81e808de6f49af1dd74db68876a79da1314a5
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Mon Apr 28 02:15:05 2008 -0700
pm2fb: change option mode to mode_option
Change the option "mode_option" into "mode".
This is one step toward changing all fb drivers to have common "mode_option"
parameter.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: Alain Kalker <miki at dds.nl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 21b4d1db84a70175251d86078123cc27e46ff69d
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Mon Apr 28 02:15:04 2008 -0700
video/aty/atyfb_base.c: free when fb can't be registered
Free buffer when the framebuffer can't be registered
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 57a7a6db0eed2862072497116232f57a6843cadd
Author: Peter Samuelson <peter at p12n.org>
Date: Mon Apr 28 02:15:03 2008 -0700
fbmem: fix con2fbmap limit check
Fix limit check in FBIOPUT_CON2FBMAP ioctl.
Signed-off-by: Peter Samuelson <peter at p12n.org>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b6f448e99ce7955b9707ed36a46cab2c6ddf7ddc
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:03 2008 -0700
PM/gxfb: add hook to PM console layer that allows disabling of suspend VT switch
Prior to suspend, we allocate and switch to a new VT; after suspend, we switch
back to the original VT. This can be slow, and is completely unnecessary if
the framebuffer we're using can restore video properly.
This adds a hook that allows drivers to select whether or not to do this vt
switch, and changes the gxfb driver to call this hook. It also adds a module
param to gxfb to allow controlling of the vt switch (defaulting to no switch).
(Note: I'm not convinced that console_sem is the best way to protect this, but
we should probably have some form of locking..)
[akpm at linux-foundation.org: build fix]
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Pavel Machek <pavel at ucw.cz>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 46fb6f110dfc3fc99f44cf701f66ea3e790b6a81
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:02 2008 -0700
gxfb: add power management functionality
This adds the ability to suspend/resume the gxfb driver, which includes:
- The addition of a Graphics Processor register table in gxfb.h, and
associated GP handling.
- Register and palette saving code; registers are stored in gxfb_par.
A few MSR values are saved as well.
- gx_powerup and gx_powerdown functions which restore/save registers and
enable/disable graphic engines.
- gxfb_suspend/gxfb_resume
Originally based on a patch by Jordan Crouse.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d1b4cc3ec5f8ddbac57ada58cbab36f5a0be38eb
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:01 2008 -0700
gxfb: stop sharing code with gx1fb
We want to stop sharing stuff with gx1fb; it makes little sense. There were
fields in geodefb_par that weren't being used, there was little point to the
DC/VP ops callbacks, etc. This implements the following:
- Create gxfb_par (based on geodefb_par), place it in gxfb.h
- Drop display_gx.h and video_gx.h. The last few patches moved most
stuff into gxfb.h anyways, so there was very little left.
- Drop the geode_{dc,vid}_ops stuff. Un-static functions, add
declarations to gxfb.h.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9f1277bd1497858a05a80222a6e98f9c43343491
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:15:00 2008 -0700
gxfb: move MSR bit fields into gxfb.h
This continues the gxfb header cleanups. MSRs are defined in geode.h; the
specific bits we care about are defined in gxfb.h.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d255114f22e19b50cf45fcc70963e6a9f287ad40
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:14:59 2008 -0700
gxfb: clean up register definitions
This does the following in preparation for register saving:
- moves the register definitions from video_gx.h and display_gx.h into
gxfb.h.
- renames GX_* registers to match their section (ie, VP_).
- renames register bitfields to match the data sheet (ie,
DC_DCFG_TGEN -> DC_DISPLAY_CFG_TGEN).
- for DC registers, rather than defining to specific addresses, use
an enum to number them sequentially and just multiply by 4(bytes) to
access them (in read_dc/write_dc).
- for VP and FP registers, use an enum and multiple by 8 (bytes). They're
64bit registers.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ab06aaf6a6d5de896e4c52e158be2881036cbee9
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:14:58 2008 -0700
gxfb: create DC/VP/FP-specific handlers rather than using readl/writel
This creates read_dc/write_dc, read_vp/write_vp, and read_fp/write_fp for
reading and updating those registers. It creates gxfb.h to house these.
We also drop a no-op readl() from gx_set_mode. Other than that, there should
be no functionality change.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fa20c8a6e520d9ccd68c8101155ffdbc19c977c3
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:14:57 2008 -0700
gxfb: replace FBSIZE config option with a module parameter
Use a command line option (vram) rather than hardcoding the vram size. LxFB
already does this; it's useful for machines that can't query the BIOS for fb
size. This patch originated from David Woodhouse, was modified by Jordan
Crouse, and was then modified further by me.
This also adds some gxfb documentation in Documentation/fb.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0a5e79098799a4bead070a9bd7f1a2213ba5eef5
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:14:57 2008 -0700
gxfb: use PCI_DEVICE() for gxfb's pci device table
Drop the class/class_mask stuff; it's unnecessary as long as the vendor and
device IDs match.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e2b118090969f153f134647acbcbbf01a9005e64
Author: Jordan Crouse <jordan.crouse at amd.com>
Date: Mon Apr 28 02:14:56 2008 -0700
gxfb: don't enable the CRT DACs when we are in flatpanel mode
When the FP strap is enabled, don't turn on the CRT DACs - that will save
about 35 mA of power.
Updated/cleaned up by Andres Salomon.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f0a0c1f20f837221c0d990a54ae5426acf039036
Author: Jordan Crouse <jordan.crouse at amd.com>
Date: Mon Apr 28 02:14:55 2008 -0700
gxfb: set the right registers to tweak the sync polarity
While running in flatpanel mode it is important to change the FP sync bits (VG
register 0x408) rather then the CRT sync bits (VG register 0x008). This patch
keeps the CRT sync bits at default when a flatpanel exists.
Note that this also fixes inverted logic; we want CRT_VSYNC_POL to be set (ie,
vsync is normally high) when FB_SYNC_VERT_HIGH_ACT is unset.
Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andres Salomon <dilinger at debian.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e9338364e6989ca2707638c7c70ae22975b0bb6c
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:14:54 2008 -0700
x86: GEODE: add Virtual Systems Architecture detection
This is generic VSA2 detection. It's used by OLPC to determine whether or not
the BIOS contains VSA2, but since other BIOSes are coming out that don't use
the VSA (ie, tinybios), it might end up being useful for others.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Acked-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
Cc: Jordan Crouse <jordan.crouse at amd.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 32bf87e3697cf2f730b8fbf47cad903ceef718a2
Author: Andres Salomon <dilinger at queued.net>
Date: Mon Apr 28 02:14:53 2008 -0700
x86: geode: MSR cleanup
This cleans up a few MSR-using drivers in the following manner:
- Ensures MSRs are all defined in asm/geode.h, rather than in misc
places
- Makes the naming consistent; cs553[56] ones begin with MSR_,
GX-specific ones start with MSR_GX_, and LX-specific ones start
with MSR_LX_. Also, make the names match the data sheet.
- Use MSR names rather than numbers in source code
- Document the fact that the LX's MSR_PADSEL has the wrong value
in the data sheet. That's, uh, good to note.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Acked-by: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 22af89aa0c0b4012a7431114a340efd3665a7617
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:14:53 2008 -0700
fbcon: replace mono_col macro with static inline
Use __u32 for max_len to match the declaration of length in the struct
fb_bitfield.
Suppresses sparse shadowed variable warnings from the nested max()
macros:
drivers/video/console/fbcon.h:130:8: warning: symbol '_x' shadows an earlier one
drivers/video/console/fbcon.h:130:8: originally declared here
drivers/video/console/fbcon.h:130:8: warning: symbol '_x' shadows an earlier one
drivers/video/console/fbcon.h:130:8: originally declared here
drivers/video/console/fbcon.h:130:8: warning: symbol '_y' shadows an earlier one
drivers/video/console/fbcon.h:130:8: originally declared here
[akpm at linux-foundation.org: fix constness]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2ae09f0da1cd0c8c646edea2e68356e76789461c
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Mon Apr 28 02:14:51 2008 -0700
pm2fb: correct error values returned from probe function
Fix error values returned in some code branches in the pm2fb_probe() function.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 416e74ea7813597b586eafc24f67779eeb86e12f
Author: Julia Lawall <julia at diku.dk>
Date: Mon Apr 28 02:14:51 2008 -0700
fbdev: use DIV_ROUND_UP or roundup
The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /
(d)) but is perhaps more readable.
An extract of the semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@haskernel@
@@
#include <linux/kernel.h>
@depends on haskernel@
expression n,d;
@@
(
- (n + d - 1) / d
+ DIV_ROUND_UP(n,d)
|
- (n + (d - 1)) / d
+ DIV_ROUND_UP(n,d)
)
@depends on haskernel@
expression n,d;
@@
- DIV_ROUND_UP((n),d)
+ DIV_ROUND_UP(n,d)
@depends on haskernel@
expression n,d;
@@
- DIV_ROUND_UP(n,(d))
+ DIV_ROUND_UP(n,d)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7f29b87a7779505288a31df16ba84a85fc1ae93c
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Mon Apr 28 02:14:50 2008 -0700
powerpc: offb: add support for foreign endianness
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Paul Mackerras <paulus at samba.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e4c690e061b909127ab0f12e929f82f3f39ec953
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Mon Apr 28 02:14:49 2008 -0700
fb: add support for foreign endianness
Add support for the framebuffers with non-native endianness. This is done via
FBINFO_FOREIGN_ENDIAN flag that will be used by the drivers. Depending on the
host endianness this flag will be overwritten by FBINFO_BE_MATH internal flag,
or cleared.
Tested to work on MPC8360E-RDK (BE) + Fujitsu MINT framebuffer (LE).
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Paul Mackerras <paulus at samba.org>
Cc: <Valdis.Kletnieks at vt.edu>
Cc: Clemens Koller <clemens.koller at anagramm.de>
Cc: Krzysztof Helt <krzysztof.h1 at poczta.fm>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6b745b6fd02213f4b2fef2f2635985929fc5b8cc
Author: Michal Januszewski <spock at gentoo.org>
Date: Mon Apr 28 02:14:48 2008 -0700
fbdev: make the best-fit section of fb_find_mode return the closest matching mode
Currently, if a perfect match in terms of resolution is not found,
fb_find_mode() only looks for a best-fit mode among modes with a higher
resolution than the one requested. Thus, if the user requests a resolution
higher than the largest supported one, they are dropped to the default mode
(usually a low resolution one).
Change this behaviour so that all valid video modes are considered when
looking for a best-fit mode, while still preferring modes with a higher
resolution.
Signed-off-by: Michal Januszewski <spock at gentoo.org>
Cc: Krzysztof Helt <krzysztof.h1 at poczta.fm>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 169b6a7a6e91e1ea32136681b475cbaf2074bf35
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Mon Apr 28 02:14:47 2008 -0700
gpiochip_reserve()
Add a new function gpiochip_reserve() to reserve ranges of gpios that platform
code has pre-allocated. That is, this marks gpio numbers which will be
claimed by drivers that haven't yet been loaded, and thus are not available
for dynamic gpio number allocation.
[akpm at linux-foundation.org: remove unneeded __must_check]
[david-b at pacbell.net: don't export gpiochip_reserve (section fix)]
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8d0aab2f16c4fa170f32e7a74a52cd0122bbafef
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Mon Apr 28 02:14:46 2008 -0700
gpiolib: dynamic gpio number allocation
If gpio_chip->base is negative during registration, gpiolib performs dynamic
base allocation. This is useful for devices that aren't always present, such
as GPIOs on hotplugged devices rather than mainboards. (This behavior was
previously specified but not implemented.)
To avoid using any numbers that may have been explicitly assigned but not yet
registered, this dynamic allocation assigns GPIO numbers from the biggest
number on down, instead of from the smallest on up.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e6de1808f8ebfeb7e49f3c5a30cb8f2032beb287
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Mon Apr 28 02:14:46 2008 -0700
gpio: define gpio_is_valid()
Introduce a gpio_is_valid() predicate; use it in gpiolib.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
[ use inline function; follow the gpio_* naming convention;
work without gpiolib; all programming interfaces need docs ]
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d72cbed0c486e3db8b56380635f8e845073ce63a
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Mon Apr 28 02:14:45 2008 -0700
gpiolib: i2c/spi drivers: handle rmmod better
Use the newly introduced owner field in struct gpio_chip to protect the
current (small) set of non-SOC GPIO drivers from being unloaded while any of
their GPIOs are in use.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
[ add mcp23s08 and pcf857x ]
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 438d8908b379b6322fc3b28d45c9ebdddf58bc20
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Mon Apr 28 02:14:44 2008 -0700
gpiolib: better rmmod infrastructure
As long as one or more GPIOs on a gpio chip are used its driver should not be
unloaded. The existing mechanism (gpiochip_remove failure) doesn't address
that, since rmmod can no longer be made to fail by having the cleanup code
report errors. Module usecounts are the solution.
Assuming standard "initialize struct to zero" policies, this change won't
affect SOC platform drivers. However, drivers for external chips (on I2C and
SPI busses) should be updated if they can be built as modules.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
[ gpio_ensure_requested() needs to update module usecounts too ]
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 73fcdc9e15c27bb92595c611c8938a36645ea20d
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Mon Apr 28 02:14:43 2008 -0700
i2o: remove static inline forward declarations
Nothing in between of them and the later declaration with body
needs them.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 37772ac0fcc6728df47e6b0609766b7b77a8064b
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Apr 28 02:14:42 2008 -0700
isdn: rename CONFIG_AVMB1_COMPAT to not look like a Kconfig variable
Since CONFIG_AVMB1_COMPAT is not a Kconfig variable, move it out of the
Kconfig namespace.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Acked-by: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c24e9b3fa3fdfca3834eba0bb217c8c197a43b7e
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Mon Apr 28 02:14:41 2008 -0700
capifs: fix memory leak on remount
capifs_remount may reach 'return' statement without freeing of memory
allocated by kstrdup call
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Cc: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 30d55e71a81b1f5a8136f191dc9f4c21f18e77e6
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Apr 28 02:14:41 2008 -0700
hisax: depend on CONFIG_PNP, not __ISAPNP__
The PNP driver interfaces depend on CONFIG_PNP, so test that rather than
__ISAPNP__.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Cc: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f3429545d03a553c6a3e9fcf60ddea31819848ad
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Apr 28 02:14:40 2008 -0700
isdn: fix obvious cut-and-paste error in st5481_usb.c
Fix a rather obvious cut-and-paste error, where earlier code for the
controller URB got somehow mixed in with code for the interrupt URB.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Cc: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 156f1ed640170d70c9fc8e5f6f797ea1f2a1653b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:14:40 2008 -0700
isdn: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dd58c0dd30ac761837b1d0d8cc434c7ec7b2df68
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:14:39 2008 -0700
eicon: fix sparse integer as NULL pointer warnings
drivers/isdn/hardware/eicon/message.c:745:47: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/message.c:761:45: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/message.c:9122:16: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/message.c:9147:16: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/message.c:9173:14: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/divasmain.c:396:23: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Karsten Keil <kkeil at suse.de>
Cc: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8e44b29da5300f4698c41b5fd2d1ce52c28e2148
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:14:38 2008 -0700
avm: fix sparse warning using integer as NULL pointer
drivers/isdn/hardware/avm/b1isa.c:206:37: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1isa.c:208:33: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1.c:664:42: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1.c:666:44: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1.c:668:42: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1.c:791:37: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1.c:793:33: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1pci.c:385:37: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1pci.c:387:33: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1dma.c:886:42: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1dma.c:888:44: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1dma.c:890:42: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1dma.c:973:37: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1dma.c:975:33: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1pcmcia.c:204:37: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/b1pcmcia.c:206:33: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/t1isa.c:554:37: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/t1isa.c:556:33: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/t1pci.c:236:37: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/t1pci.c:238:33: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/c4.c:1091:42: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/c4.c:1093:44: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/c4.c:1095:42: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/c4.c:1170:21: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/c4.c:1294:37: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/avm/c4.c:1296:33: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Karsten Keil <kkeil at suse.de>
Cc: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2f9e9b6db31d96fe4e8b519b8aab1ba172dd3ddf
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:14:37 2008 -0700
capi: fix sparse warnings using integer as NULL pointer
drivers/isdn/capi/kcapi.c:829:30: warning: Using plain integer as NULL pointer
drivers/isdn/capi/kcapi.c:838:27: warning: Using plain integer as NULL pointer
drivers/isdn/capi/kcapi.c:954:17: warning: Using plain integer as NULL pointer
drivers/isdn/capi/kcapi.c:1007:37: warning: Using plain integer as NULL pointer
drivers/isdn/capi/kcapi.c:1009:33: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capiutil.c:453:24: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capilib.c:47:30: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:353:29: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:369:15: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:486:48: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:515:46: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:541:47: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:692:47: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:699:49: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:704:14: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:943:53: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:948:32: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:969:42: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:989:48: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:1026:69: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:1028:19: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:1061:20: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:1529:37: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capi.c:1531:33: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:338:15: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:758:32: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:880:40: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:407:15: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:429:49: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:407:15: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:444:49: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:429:49: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:429:49: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:429:49: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:429:49: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:429:49: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:1664:61: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:1969:37: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:2294:37: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:2297:33: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:2338:37: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capidrv.c:2341:33: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capifs.c:192:37: warning: Using plain integer as NULL pointer
drivers/isdn/capi/capifs.c:194:33: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Karsten Keil <kkeil at suse.de>
Cc: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 50f8c370e77befe9121720bd7bdada2ac0d13915
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 28 02:14:35 2008 -0700
quota: convert stub functions from macros into inlines
Fixes things like this:
fs/super.c: In function `deactivate_super':
fs/super.c:182: warning: statement with no effect
fs/super.c: In function `do_remount_sb':
fs/super.c:644: warning: statement with no effect
Cc: Jan Kara <jack at ucw.cz>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1b445a9c21f593be9d3c4ab912359d2c51c371dd
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:14:35 2008 -0700
quota: reiserfs: make reiserfs handle quotaon on remount
Update reiserfs to handle quotaon on remount RW.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6f28e08794749f3431e89302728e612343d9d9e4
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:14:34 2008 -0700
quota: ext4: make ext4 handle quotaon on remount
Update ext4 to handle quotaon on remount RW.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2fd83a4f3cd5a725168e3a269746dfce2adfa56a
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:14:34 2008 -0700
quota: ext3: make ext3 handle quotaon on remount
Update ext3 handle quotaon on remount RW.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0ff5af8340aa6be44220d7237ef4a654314cf795
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:14:33 2008 -0700
quota: quota core changes for quotaon on remount
Currently, we just turn quotas off on remount of filesystem to read-only
state. The patch below adds necessary framework so that we can turn quotas
off on remount RO but we are able to automatically reenable them again when
filesystem is remounted to RW state. All we need to do is to keep references
to inodes of quota files when remounting RO and using these references to
reenable quotas when remounting RW.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 03f6e92bdd467aed9d7571a571868563ae6ad288
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:14:32 2008 -0700
quota: various style cleanups
Cleanups in quota code:
Change __inline__ to inline.
Change some macros to inline functions.
Remove vfs_quota_off_mount() macro.
DQUOT_OFF() should be (0) is CONFIG_QUOTA is disabled.
Move declaration of mark_dquot_dirty and dirty_dquot from quota.h to dquot.c
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8794b5b246cf6f67baf57bd9db386e79ca5cac33
Author: Jan Kara <jack at suse.cz>
Date: Mon Apr 28 02:14:32 2008 -0700
quota: remove superfluous DQUOT_OFF() in fs/namespace.c
We don't need to turn quotas off before remounting root ro, because
do_remount_sb() already handles this.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 338bf9afda91ec005a1e9a0de4af0271cc167d56
Author: Andrew Perepechko <andrew.perepechko at sun.com>
Date: Mon Apr 28 02:14:31 2008 -0700
quota: do not allow setting of quota limits to too high values
We should check whether quota limits set via Q_SETQUOTA are not exceeding
limits which quota format is able to handle.
Signed-off-by: Andrew Perepechko <andrew.perepechko at sun.com>
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3b0cb4caefeca6fe6b05c6c5a76e9c633b44c58f
Author: Masami Hiramatsu <mhiramat at redhat.com>
Date: Mon Apr 28 02:14:30 2008 -0700
kprobes: update document about batch registration
Add the description of batch registration interfaces to
Documentation/kprobes.txt.
Signed-off-by: Masami Hiramatsu <mhiramat at redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth at in.ibm.com>
Cc: Jim Keniston <jkenisto at us.ibm.com>
Cc: Prasanna S Panchamukhi <prasanna at in.ibm.com>
Cc: Shaohua Li <shaohua.li at intel.com>
Cc: David Miller <davem at davemloft.net>
Cc: "Frank Ch. Eigler" <fche at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 26b31c1908e02a316edfba08080373342e662c14
Author: Masami Hiramatsu <mhiramat at redhat.com>
Date: Mon Apr 28 02:14:29 2008 -0700
kprobes: add (un)register_jprobes for batch registration
Introduce unregister_/register_jprobes() for jprobe batch registration.
Signed-off-by: Masami Hiramatsu <mhiramat at redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth at in.ibm.com>
Cc: Jim Keniston <jkenisto at us.ibm.com>
Cc: Prasanna S Panchamukhi <prasanna at in.ibm.com>
Cc: Shaohua Li <shaohua.li at intel.com>
Cc: David Miller <davem at davemloft.net>
Cc: "Frank Ch. Eigler" <fche at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4a296e07c3a410c09b9155da4c2fa84a07964f38
Author: Masami Hiramatsu <mhiramat at redhat.com>
Date: Mon Apr 28 02:14:29 2008 -0700
kprobes: add (un)register_kretprobes for batch registration
Introduce unregister_/register_kretprobes() for kretprobe batch registration.
Signed-off-by: Masami Hiramatsu <mhiramat at redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth at in.ibm.com>
Cc: Jim Keniston <jkenisto at us.ibm.com>
Cc: Prasanna S Panchamukhi <prasanna at in.ibm.com>
Cc: Shaohua Li <shaohua.li at intel.com>
Cc: David Miller <davem at davemloft.net>
Cc: "Frank Ch. Eigler" <fche at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9861668f747895608cea425f8457989d8dd2edf2
Author: Masami Hiramatsu <mhiramat at redhat.com>
Date: Mon Apr 28 02:14:28 2008 -0700
kprobes: add (un)register_kprobes for batch registration
Introduce unregister_/register_kprobes() for kprobe batch registration. This
can reduce waiting time for synchronized_sched() when a lot of probes have to
be unregistered at once.
Signed-off-by: Masami Hiramatsu <mhiramat at redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth at in.ibm.com>
Cc: Jim Keniston <jkenisto at us.ibm.com>
Cc: Prasanna S Panchamukhi <prasanna at in.ibm.com>
Cc: Shaohua Li <shaohua.li at intel.com>
Cc: David Miller <davem at davemloft.net>
Cc: "Frank Ch. Eigler" <fche at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 99602572812442d47403d85f376ad51298dd82a6
Author: Masami Hiramatsu <mhiramat at redhat.com>
Date: Mon Apr 28 02:14:27 2008 -0700
list.h: add list_is_singular()
Add list_is_singular() to check a list has just one entry.
list_is_singular() is useful to check whether a list_head which have been
temporarily allocated for listing objects can be released or not.
Signed-off-by: Masami Hiramatsu <mhiramat at redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3d8d996e0ca5b4093203d3f050b0f70b5c949ae8
Author: Srinivasa Ds <srinivasa at in.ibm.com>
Date: Mon Apr 28 02:14:26 2008 -0700
kprobes: prevent probing of preempt_schedule()
Prohibit users from probing preempt_schedule(). One way of prohibiting the
user from probing functions is by marking such functions with __kprobes. But
this method doesn't work for those functions, which are already marked to
different section like preempt_schedule() (belongs to __sched section). So we
use blacklist approach to refuse user from probing these functions.
In blacklist approach we populate the blacklisted function's starting address
and its size in kprobe_blacklist structure. Then we verify the user specified
address against start and end of the blacklisted function. So any attempt to
register probe on blacklisted functions will be rejected.
[akpm at linux-foundation.org: build fix]
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Srinivasa DS <srinivasa at in.ibm.com>
Signed-off-by: Ananth N Mavinakayanahalli <ananth at in.ibm.com>
Signed-off-by: Jim Keniston <jkenisto at us.ibm.com>
Cc: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0341a4d0fdd2a0a3d9e2bb3a9afef9f8292c8502
Author: Karl Dahlke <eklhad at comcast.net>
Date: Mon Apr 28 02:14:25 2008 -0700
VT notifier extension for accessibility
Some accessibility modules need to be able to catch the output on the
console before the VT interpretation, and possibly swallow it.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f7440b0ecdeb3a04d07c546d02d29700d2a574b7
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Apr 28 02:14:24 2008 -0700
mfd: use shorter set_current_state()
Since this routine declares a separate "tsk" pointer for no other reason than
to call set_task_state(), get rid of it and just invoke set_current_state().
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Cc: Russell King <rmk+kernel at arm.linux.org.uk>
Cc: Dmitry Torokhov <dtor at mail.ru>
Cc: Nicolas Pitre <nico at cam.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 61711f8fd8180e458cfb6846bcf4fc636a95f3db
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Mon Apr 28 02:14:22 2008 -0700
sm501: add uart support
This patch extends the sm501 mfd with 8250 uart support. We're currently
doing this in the board specific r2d-1 code already, but it would be nice to
do move things into the mfd since it's more chip specific than board specific.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Cc: Ben Dooks <ben-linux at fluff.org>
Cc: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5d9f3f6b7c4c9fe1706006f24f964e7c0fa49fb7
Author: Andrea Paterniani <a.paterniani at swapp-eng.it>
Date: Mon Apr 28 02:14:21 2008 -0700
spi: spi_imx updates
Updates to the i.MX SPI controller driver:
1) Some comments changed and/or added.
2) End of transfers is now managed on TXFIFO empty interrupt after the
last write to TXFIFO. This speeds interrupt execution by removing
the wait for TXFIFO to become empty. On TXFIFO empty interrupt the
handler needs only to poll for the end of the ongoing transaction
(SPI_CONTROL_XCH) to close the transfer.
(2.1) Write only transfers are closed flushing RXFIFO.
(2.2) Read transfers are closed reading trailing bytes from RXFIFO.
(2.3) Read transfers where RXFIFO overrun occurred are closed by
flushing RXFIFO and aborting the message.
3) Fifos are now flushed via SPI disable after the end of ongoing
transaction.
Signed-off-by: Andrea Paterniani <a.paterniani at swapp-eng.it>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 06719814780da741e7acf587367a86c3965c03a2
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Mon Apr 28 02:14:19 2008 -0700
atmel_spi: support zero length transfer
A spi transfer with zero length is not invalid. For example, such
transfer (len == 0 && delay_usecs != 0) can be used to achieve delay
before first CLK edge after chipselect assertion.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b687d2a8f8d46921ac5e80bf77967688afce68e2
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:14:19 2008 -0700
spi: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 31a16294261a897ab7f59a5c26e4935a851fd410
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Mon Apr 28 02:14:18 2008 -0700
documentation: move spidev_fdx example to its own source file
Move sample source code to its own source file so that it can be used
easier and build-tested/check/maintained by anyone.
(Makefile changes are in a separate patch for all of Documentation/.)
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cf43369d55a30a0d8f9ef4700c798c72dbd3afb7
Author: David Brownell <david-b at pacbell.net>
Date: Mon Apr 28 02:14:17 2008 -0700
spi: pxa2xx_spi "sparse" fixes
Various cleanups to pxa2xx_spi suggested by "sparse": make sure that
register addresess are "void __iomem *", and make a few functions properly
static.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Ned Forrester <nforrester at whoi.edu>
Cc: Stephen Street <stephen at streetfiresound.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 79d8c7a8c888a7c2ab9dd4249495b24575b3f9a6
Author: Alessandro Guido <alessandro.guido at gmail.com>
Date: Mon Apr 28 02:14:16 2008 -0700
spi: use menuconfig for CONFIG_SPI
Signed-off-by: Alessandro Guido <alessandro.guido at gmail.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 608dfddd845da5ab6accef70154c8910529699f7
Author: Mike Travis <travis at sgi.com>
Date: Mon Apr 28 02:14:15 2008 -0700
oprofile: change cpu_buffer from array to per_cpu variable
Change cpu_buffer from array to per_cpu variable in oprofile functions.
[akpm at linux-foundation.org: coding-style fixes]
Cc: Philippe Elie <phil.el at wanadoo.fr>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7ae9392c0a3bc01562361bb21e23dfb2e5c81c5a
Author: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Date: Mon Apr 28 02:14:14 2008 -0700
x86: configurable DMI scanning code
Turn CONFIG_DMI into a selectable option if EMBEDDED is defined, in
order to be able to remove the DMI table scanning code if it's not
needed, and then reduce the kernel code size.
With CONFIG_DMI (i.e before) :
text data bss dec hex filename
1076076 128656 98304 1303036 13e1fc vmlinux
Without CONFIG_DMI (i.e after) :
text data bss dec hex filename
1068092 126308 98304 1292704 13b9a0 vmlinux
Result:
text data bss dec hex filename
-7984 -2348 0 -10332 -285c vmlinux
The new option appears in "Processor type and features", only when
CONFIG_EMBEDDED is defined.
This patch is part of the Linux Tiny project, and is based on previous work
done by Matt Mackall <mpm at selenic.com>.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Acked-by: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: "H. Anvin" <hpa at zytor.com>
Signed-off-by: Matt Mackall <mpm at selenic.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d83fd8a26769c75d51a6b05d8dcb3e36302dd8ba
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 28 02:14:13 2008 -0700
drivers/acpi/thermal.c: fix build with CONFIG_DMI=n
drivers/acpi/thermal.c: In function 'acpi_thermal_init':
drivers/acpi/thermal.c:1794: error: 'thermal_dmi_table' undeclared (first use in this function)
drivers/acpi/thermal.c:1794: error: (Each undeclared identifier is reported only once
drivers/acpi/thermal.c:1794: error: for each function it appears in.)
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6e10efefaae45989f2f143bacfef75af55068378
Author: Michael Trimarchi <trimarchimichael at yahoo.it>
Date: Mon Apr 28 02:14:11 2008 -0700
atmel_serial: remove duplicated macro definition
After commit 39d4c922b596633da86878b1a5cc881785b8e5fa (atmel_serial: fix
uart/console concurrent access) the UART_GET_TCR macro got redefined. This
patch removes the duplicated definition.
Signed-off-by: michael trimarchi <trimarchimichael at evidence.eu.com>
Acked-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d1ec61e6686c3c137aae33a11518b8e629e9c179
Author: Julia Lawall <julia at diku.dk>
Date: Mon Apr 28 02:14:10 2008 -0700
serial: use time_before, time_before_eq, etc
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ change_compare_np @
expression E;
@@
(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)
@ include depends on change_compare_np @
@@
#include <linux/jiffies.h>
@ no_include depends on !include && change_compare_np @
@@
#include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 01c194d9278efc15d4785ff205643e9c0bdcef53
Author: Alex Williamson <alex.williamson at hp.com>
Date: Mon Apr 28 02:14:09 2008 -0700
serial 8250: tighten test for using backup timer
Thomas Koeller had reported an issue where a device that had been making use
of the UART_BUG_TXEN code in the 8250 driver was mistakenly being caught by
the backup timer test, causing the device to work improperly.
To fix this, tighten the test requirements to enable the backup timer
workaround.
The backup timer is really meant to catch UARTs that don't re-assert the THRE
interrupt. The expectation is that they do initially assert THRE. This patch
clarifies the test.
Signed-off-by: Alex Williamson <alex.williamson at hp.com>
Cc: Thomas Koeller <thomas at koeller.dyndns.org>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fc3f341b5a1a3f26ec8ed74a38234db7d0d1bae1
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Mon Apr 28 02:14:08 2008 -0700
serial: add VR41xx SIU setup for serial console
Add VR41xx SIU setup for serial console.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Cc: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit baac58955d6933571f29126a1a95299b421faef7
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Mon Apr 28 02:14:08 2008 -0700
serial: add vr41xx_siu_early_setup() for serial console
Add vr41xx_siu_early_setup() for serial console.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Cc: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eb424fd21c0931e998156225f2a0910167c3e16c
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Mon Apr 28 02:14:07 2008 -0700
uart_get_baud_rate: stop mangling termios
Russell King noticed this one: We have to avoid replacing B0 when we pick a
baud rate for a "hung up" port. Ugly but the proper fix is in the tty layer
and means changing the tty<->serial interfaces so we will defer that for now.
[akpm at linux-foundation.org: fix uninitialised var]
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e991a2bd4fa0b2f475b67dfe8f33e8ecbdcbb40b
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Mon Apr 28 02:14:06 2008 -0700
Fix tty speed handling on 8250
We try and write the correct speed back but the serial midlayer already
mangles the speed on us and that means if we request B0 we report back B9600
when we should not. For now we'll hack around this in the drivers and serial
code, pending a better long term solution.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ce9f9f73af0338a680d66288cbf0efe4b900e78b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:14:05 2008 -0700
char: make functions static in synclinkmp.c
All were forward declared with static.
Fixes sparse warnings:
drivers/char/synclinkmp.c:1476:5: warning: symbol 'read_proc' was not declared. Should it be static?
drivers/char/synclinkmp.c:2027:5: warning: symbol 'bh_action' was not declared. Should it be static?
drivers/char/synclinkmp.c:2058:6: warning: symbol 'bh_handler' was not declared. Should it be static?
drivers/char/synclinkmp.c:2103:6: warning: symbol 'bh_receive' was not declared. Should it be static?
drivers/char/synclinkmp.c:2112:6: warning: symbol 'bh_transmit' was not declared. Should it be static?
drivers/char/synclinkmp.c:2124:6: warning: symbol 'bh_status' was not declared. Should it be static?
drivers/char/synclinkmp.c:2136:6: warning: symbol 'isr_timer' was not declared. Should it be static?
drivers/char/synclinkmp.c:2162:6: warning: symbol 'isr_rxint' was not declared. Should it be static?
drivers/char/synclinkmp.c:2221:6: warning: symbol 'isr_rxrdy' was not declared. Should it be static?
drivers/char/synclinkmp.c:2351:6: warning: symbol 'isr_txint' was not declared. Should it be static?
drivers/char/synclinkmp.c:2379:6: warning: symbol 'isr_txrdy' was not declared. Should it be static?
drivers/char/synclinkmp.c:2410:6: warning: symbol 'isr_rxdmaok' was not declared. Should it be static?
drivers/char/synclinkmp.c:2427:6: warning: symbol 'isr_rxdmaerror' was not declared. Should it be static?
drivers/char/synclinkmp.c:2445:6: warning: symbol 'isr_txdmaok' was not declared. Should it be static?
drivers/char/synclinkmp.c:2463:6: warning: symbol 'isr_txdmaerror' was not declared. Should it be static?
drivers/char/synclinkmp.c:2480:6: warning: symbol 'isr_io_pin' was not declared. Should it be static?
drivers/char/synclinkmp.c:3420:5: warning: symbol 'alloc_dma_bufs' was not declared. Should it be static?
drivers/char/synclinkmp.c:3494:5: warning: symbol 'alloc_buf_list' was not declared. Should it be static?
drivers/char/synclinkmp.c:3553:5: warning: symbol 'alloc_frame_bufs' was not declared. Should it be static?
drivers/char/synclinkmp.c:3570:6: warning: symbol 'free_dma_bufs' was not declared. Should it be static?
drivers/char/synclinkmp.c:3580:5: warning: symbol 'alloc_tmp_rx_buf' was not declared. Should it be static?
drivers/char/synclinkmp.c:3588:6: warning: symbol 'free_tmp_rx_buf' was not declared. Should it be static?
drivers/char/synclinkmp.c:3594:5: warning: symbol 'claim_resources' was not declared. Should it be static?
drivers/char/synclinkmp.c:3681:6: warning: symbol 'release_resources' was not declared. Should it be static?
drivers/char/synclinkmp.c:3737:6: warning: symbol 'add_device' was not declared. Should it be static?
drivers/char/synclinkmp.c:3860:6: warning: symbol 'device_init' was not declared. Should it be static?
drivers/char/synclinkmp.c:4054:6: warning: symbol 'enable_loopback' was not declared. Should it be static?
drivers/char/synclinkmp.c:4101:6: warning: symbol 'set_rate' was not declared. Should it be static?
drivers/char/synclinkmp.c:4147:6: warning: symbol 'rx_stop' was not declared. Should it be static?
drivers/char/synclinkmp.c:4168:6: warning: symbol 'rx_start' was not declared. Should it be static?
drivers/char/synclinkmp.c:4225:6: warning: symbol 'tx_start' was not declared. Should it be static?
drivers/char/synclinkmp.c:4295:6: warning: symbol 'tx_stop' was not declared. Should it be static?
drivers/char/synclinkmp.c:4322:6: warning: symbol 'tx_load_fifo' was not declared. Should it be static?
drivers/char/synclinkmp.c:4371:6: warning: symbol 'reset_port' was not declared. Should it be static?
drivers/char/synclinkmp.c:4395:6: warning: symbol 'reset_adapter' was not declared. Should it be static?
drivers/char/synclinkmp.c:4407:6: warning: symbol 'async_mode' was not declared. Should it be static?
drivers/char/synclinkmp.c:4546:6: warning: symbol 'hdlc_mode' was not declared. Should it be static?
drivers/char/synclinkmp.c:4748:6: warning: symbol 'tx_set_idle' was not declared. Should it be static?
drivers/char/synclinkmp.c:4768:6: warning: symbol 'get_signals' was not declared. Should it be static?
drivers/char/synclinkmp.c:4797:6: warning: symbol 'set_signals' was not declared. Should it be static?
drivers/char/synclinkmp.c:4826:6: warning: symbol 'rx_reset_buffers' was not declared. Should it be static?
drivers/char/synclinkmp.c:4837:6: warning: symbol 'rx_free_frame_buffers' was not declared. Should it be static?
drivers/char/synclinkmp.c:4865:5: warning: symbol 'rx_get_frame' was not declared. Should it be static?
drivers/char/synclinkmp.c:5040:6: warning: symbol 'tx_load_dma_buffer' was not declared. Should it be static?
drivers/char/synclinkmp.c:5080:5: warning: symbol 'register_test' was not declared. Should it be static?
drivers/char/synclinkmp.c:5119:5: warning: symbol 'irq_test' was not declared. Should it be static?
drivers/char/synclinkmp.c:5211:5: warning: symbol 'init_adapter' was not declared. Should it be static?
drivers/char/synclinkmp.c:5270:5: warning: symbol 'loopback_test' was not declared. Should it be static?
drivers/char/synclinkmp.c:5335:5: warning: symbol 'adapter_test' was not declared. Should it be static?
drivers/char/synclinkmp.c:5397:5: warning: symbol 'memory_test' was not declared. Should it be static?
drivers/char/synclinkmp.c:5449:6: warning: symbol 'load_pci_memory' was not declared. Should it be static?
drivers/char/synclinkmp.c:5468:6: warning: symbol 'trace_block' was not declared. Should it be static?
drivers/char/synclinkmp.c:5503:6: warning: symbol 'tx_timeout' was not declared. Should it be static?
drivers/char/synclinkmp.c:5530:6: warning: symbol 'status_timeout' was not declared. Should it be static?
drivers/char/synclinkmp.c:5581:15: warning: symbol 'read_reg' was not declared. Should it be static?
drivers/char/synclinkmp.c:5586:6: warning: symbol 'write_reg' was not declared. Should it be static?
drivers/char/synclinkmp.c:5592:5: warning: symbol 'read_reg16' was not declared. Should it be static?
drivers/char/synclinkmp.c:5598:6: warning: symbol 'write_reg16' was not declared. Should it be static?
drivers/char/synclinkmp.c:5604:15: warning: symbol 'read_status_reg' was not declared. Should it be static?
drivers/char/synclinkmp.c:5610:6: warning: symbol 'write_control_reg' was not declared. Should it be static?
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Paul Fulghum <paulkf at microgate.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0fab6de09c71a976e5d765e1ff548b14be385153
Author: Joe Perches <joe at perches.com>
Date: Mon Apr 28 02:14:02 2008 -0700
synclink drivers bool conversion
Remove more TRUE/FALSE defines and uses
Remove == TRUE tests
Convert BOOLEAN to bool
Convert int to bool where appropriate
Signed-off-by: Joe Perches <joe at perches.com>
Acked-by: Paul Fulghum <paulkf at microgate.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7a63ce5a1f2fde5ae737f059e2714e441447120c
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Mon Apr 28 02:14:02 2008 -0700
serial: silence section mismatch warnings in 8250_pci
Fix following warnings:
WARNING: drivers/serial/built-in.o(.data+0x5b8): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:pci_ite887x_exit()
WARNING: drivers/serial/built-in.o(.data+0x5e0): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:pci_plx9050_exit()
WARNING: drivers/serial/built-in.o(.data+0x608): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:pci_plx9050_exit()
WARNING: drivers/serial/built-in.o(.data+0x658): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:pci_plx9050_exit()
WARNING: drivers/serial/built-in.o(.data+0x680): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:pci_plx9050_exit()
WARNING: drivers/serial/built-in.o(.data+0x6a8): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:pci_plx9050_exit()
WARNING: drivers/serial/built-in.o(.data+0x6d0): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:sbs_exit()
WARNING: drivers/serial/built-in.o(.data+0x6f8): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:sbs_exit()
WARNING: drivers/serial/built-in.o(.data+0x720): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:sbs_exit()
WARNING: drivers/serial/built-in.o(.data+0x748): Section mismatch in reference from the variable pci_serial_quirks to the function .devexit.text:sbs_exit()
pci_serial_quirks contains a number of function pointers where the referenced
function is annotated __devexit. This is OK so we annotate pci_serial_quirks
with __refdata to ignore the __devexit references
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eee3754f5e45bd27e001ea41823bdbcdd0d192d4
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:14:01 2008 -0700
ncpfs: fix sparse warning in ncpsign_kernel.c
We're casting anyway, might as well cast to the correct sign.
Specific to i386 (ifdef __i386__)
fs/ncpfs/ncpsign_kernel.c:58:23: warning: incorrect type in initializer (different signedness)
fs/ncpfs/ncpsign_kernel.c:58:23: expected unsigned int *data2
fs/ncpfs/ncpsign_kernel.c:58:23: got int *<noident>
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Petr Vandrovec <VANDROVE at vc.cvut.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 305787e44ebc21d87ab4d4949da5b97d4252aa9b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:14:00 2008 -0700
ncpfs: fix sparse warnings in ioctl.c
In both cases, these inode variables arebeing used to test the
server's root inode against NULL. Change them to s_inode.
fs/ncpfs/ioctl.c:391:18: warning: symbol 'inode' shadows an earlier one
fs/ncpfs/ioctl.c:264:28: originally declared here
fs/ncpfs/ioctl.c:441:17: warning: symbol 'inode' shadows an earlier one
fs/ncpfs/ioctl.c:264:28: originally declared here
In this case, we are about to return anyway, just reuse result.
fs/ncpfs/ioctl.c:521:8: warning: symbol 'result' shadows an earlier one
fs/ncpfs/ioctl.c:268:6: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Petr Vandrovec <VANDROVE at vc.cvut.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cdf8803768db6f652d498628fe1421a23c025253
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:13:59 2008 -0700
ncpfs: add prototypes to ncp_fs.h
Removes some externs from C files, noticed from the sparse warnings:
fs/ncpfs/dir.c:90:26: warning: symbol 'ncp_root_dentry_operations' was not declared. Should it be static?
fs/ncpfs/symlink.c:107:5: warning: symbol 'ncp_symlink' was not declared. Should it be static?
fs/ncpfs/symlink.c:101:39: warning: symbol 'ncp_symlink_aops' was not declared. Should it be static?
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Petr Vandrovec <VANDROVE at vc.cvut.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5dc62b1b6408396d5f6c13ed585adc87b2e296f9
Author: WANG Cong <wangcong at zeuux.org>
Date: Mon Apr 28 02:13:58 2008 -0700
uml: clean up arch/um/drivers/ubd_kern.c
Make some global functions and variables static.
And remove some useless declarations for local functions, since we just need
to move their definitions ahead.
[jdike at addtoit.com: checkpatch cleanups]
Signed-off-by: WANG Cong <wangcong at zeuux.org>
Signed-off-by: Jeff Dike <jdike at addtoit.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4415d8a5aaec2008833e1c474b38627c0bc738ca
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Mon Apr 28 02:13:57 2008 -0700
arch/um/os-Linux/sys-i386/task_size.c: improve a bit
Improve this code a bit: check sigaction's return value and remove a useless
fflush().
Acked-by: Jeff Dike <jdike at addtoit.com>
Signed-off-by: WANG Cong <wangcong at zeuux.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 074a0db8e17ae271736148809c5f9d47dec2d993
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Mon Apr 28 02:13:57 2008 -0700
uml: make several things static
Make several things static, because they no longer need to be global.
Acked-by: Jeff Dike <jdike at addtoit.com>
Signed-off-by: WANG Cong <wangcong at zeuux.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1605ec044300d0fd5d27fd0b6879ee14b104aebd
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Mon Apr 28 02:13:56 2008 -0700
uml: make three functions static
Make the following three functions static, since they don't need to be global.
arch/um/drivers/mcast_kern.c::mcast_setup()
arch/um/drivers/mconsole_user.c::mconsole_reply_v0()
arch/um/drivers/port_user.c::port_pre_exec()
Acked-by: Jeff Dike <jdike at addtoit.com>
Signed-off-by: WANG Cong <wangcong at zeuux.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 02d324b15dfa31b3b1025fb5abda08a8ee23ce84
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Mon Apr 28 02:13:56 2008 -0700
uml: remove a useless function
arch/um/drivers/chan_kern.c::chan_out_fd() is not used by anyone. Remove it.
Acked-by: Jeff Dike <jdike at addtoit.com>
Signed-off-by: WANG Cong <wangcong at zeuux.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3af7cb7bbcf0872b749a32bb48a7bc11f33bcd8c
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Mon Apr 28 02:13:55 2008 -0700
uml: make a function static
arch/um/drivers/chan_kern.c::open_chan() can become static.
Acked-by: Jeff Dike <jdike at addtoit.com>
Signed-off-by: WANG Cong <wangcong at zeuux.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 626c59f5edb284027bfe25cc15e7de2f532090b5
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Mon Apr 28 02:13:53 2008 -0700
arch/um/os-Linux/start_up.c: various improvements.
- lets ptrace_child become void
- adds checking for the return value of change_sig
- moves errors info into stderr instead of stdout.
Cc: Jeff Dike <jdike at addtoit.com>
Signed-off-by: WANG Cong <wangcong at zeuux.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3595726ac349ca9682703535e9a999c4f08c2d80
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:13:53 2008 -0700
uml: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jeff Dike <jdike at addtoit.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3af9c5bed1b8f284f3d7d479c77adf60ad059e91
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Mon Apr 28 02:13:52 2008 -0700
arch/um/kernel/um_arch.c: some small improvements
Make some small improvements for arch/um/kernel/um_arch.c.
Signed-off-by: WANG Cong <xiyou.wangcong at gmail.com>
Acked-by: Jeff Dike <jdike at addtoit.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 16a26ef5ad31b59c521bd9becccaee84c0157326
Author: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Date: Mon Apr 28 02:13:51 2008 -0700
cris: add constfy to pgd_offset()
add constfy to pgd_offset() for avoid following warnings.
CC mm/pagewalk.o
mm/pagewalk.c: In function 'walk_page_range':
mm/pagewalk.c:111: warning: passing argument 1 of 'pgd_offset' discards qualifiers from p\
ointer target type
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Matt Mackall <mpm at selenic.com>
Cc: "Vegard Nossum" <vegard.nossum at gmail.com>
Cc: Mikael Starvik <starvik at axis.com>
Cc: Jesper Nilsson <jesper.nilsson at axis.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5fd284fd976232dbd0d0dc94e07c91e50e2898b2
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Mon Apr 28 02:13:51 2008 -0700
cris: remove redundant display of free swap space in show_mem()
show_mem() has no need to print the amount of free swap space manually because
show_free_areas() does this already and is called by the former.
The two outputs only differ in text formatting:
printk("Free swap = %lukB\n", ...);
printk("Free swap: %6ldkB\n", ...);
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Cc: Mikael Starvik <mikael.starvik at axis.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 032c17e8afa150412810ffc19913ecd5eb531d57
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Mon Apr 28 02:13:50 2008 -0700
crisv10: prepare for BKL push down
Just the modem bits this time
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Mikael Starvik <mikael.starvik at axis.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f85e7cdc3fd0db65ef1442476b82ced0f01c5c19
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:13:49 2008 -0700
m68k: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6feef6e5f23d5a3d8a614ab8ea392dfa54c7365c
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Mon Apr 28 02:13:48 2008 -0700
m68k: remove redundant display of free swap space in show_mem()
show_mem() has no need to print the amount of free swap space manually because
show_free_areas() does this already and is called by the former.
The two outputs only differ in text formatting:
printk("Free swap = %lukB\n", ...);
printk("Free swap: %6ldkB\n", ...);
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ed6b9b97f42c091630335bfb71a2931e6f86388b
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 28 02:13:48 2008 -0700
alpha: teach the compiler that BUG doesn't return
Fix things like this:
security/selinux/netnode.c: In function 'sel_netnode_find':
security/selinux/netnode.c:126: warning: 'idx' may be used uninitialized in this function
security/selinux/netnode.c: In function 'sel_netnode_sid':
security/selinux/netnode.c:225: warning: 'ret' may be used uninitialized in this function
security/selinux/netnode.c:168: warning: 'idx' may be used uninitialized in this function
due to code correctly not expecting BUG() to return.
For some reason this reduces the object code size for that particular file.
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Cc: Richard Henderson <rth at twiddle.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 037f436f525dac36c9f5fd5c5054518a63debb3e
Author: S.Caglar Onur <caglar at pardus.org.tr>
Date: Mon Apr 28 02:13:47 2008 -0700
arch/alpha/kernel/traps.c: use time_* macros
The functions time_before, time_before_eq, time_after, and time_after_eq are
more robust for comparing jiffies against other values.
So implement usage of the time_after() macro, defined in linux/jiffies.h,
which deals with wrapping correctly
[akpm at linux-foundation.org: fix warning]
Signed-off-by: S.Caglar Onur <caglar at pardus.org.tr>
Cc: Richard Henderson <rth at twiddle.net>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 95d193a90335b4e39dd1f750f1fc1672339ff487
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:13:46 2008 -0700
alpha: replace __inline with inline
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Richard Henderson <rth at twiddle.net>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bbb8d343affd21850849fa4d41bf91c7527a3d04
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:13:46 2008 -0700
alpha: remove remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
The change in pci-iommu,c should be safe as arena has not been assigned
when we get to this point.
Some were within #if 0 blocks, have changed them and left the blocks
as they appear to be debugging infrastructure.
A #define FN __FUNCTION__ was removed and occurances of FN were replaced
with __func__ as well.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Cc: Richard Henderson <rth at twiddle.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b901d40c970e6db319fe1f8d84db2b9684b6c9bf
Author: Jim Meyering <jim at meyering.net>
Date: Mon Apr 28 02:13:44 2008 -0700
alpha: handle kcalloc failure
arch/alpha/kernel/module.c (module_frob_arch_sections): Handle kcalloc failure.
Signed-off-by: Jim Meyering <meyering at redhat.com>
Cc: Richard Henderson <rth at twiddle.net>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1236cc3cf8c69bd316c940b2e94f91b3795f97fe
Author: Serge E. Hallyn <serue at us.ibm.com>
Date: Mon Apr 28 02:13:43 2008 -0700
smack: use cap_task_prctl
With the introduction of per-process securebits, the capabilities-related
prctl callbacks were moved into cap_task_prctl(). Have smack use
cap_task_prctl() so that PR_SET_KEEPCAPS is defined.
Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
Acked-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 30aa4faf62b2dd9b239ae06ca7a85f1d36d7ef25
Author: Casey Schaufler <casey at schaufler-ca.com>
Date: Mon Apr 28 02:13:43 2008 -0700
smack: make smk_cipso_doi() and smk_unlbl_ambient()
The functions smk_cipso_doi and smk_unlbl_ambient are not used outside
smackfs.c and should hence be static.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 55d00ccfb336b4f85a476a24e18c17b2eaff919e
Author: Serge E. Hallyn <serue at us.ibm.com>
Date: Mon Apr 28 02:13:42 2008 -0700
root_plug: use cap_task_prctl
With the introduction of per-process securebits, the capabilities-related
prctl callbacks were moved into cap_task_prctl(). Have root_plug use
cap_task_prctl() so that PR_SET_KEEPCAPS is defined.
Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c60264c494a119cd3a716a22edc0137b11de6d1e
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:13:41 2008 -0700
smack: fix integer as NULL pointer warning in smack_lsm.c
security/smack/smack_lsm.c:1257:16: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3898b1b4ebff8dcfbcf1807e0661585e06c9a91c
Author: Andrew G. Morgan <morgan at kernel.org>
Date: Mon Apr 28 02:13:40 2008 -0700
capabilities: implement per-process securebits
Filesystem capability support makes it possible to do away with (set)uid-0
based privilege and use capabilities instead. That is, with filesystem
support for capabilities but without this present patch, it is (conceptually)
possible to manage a system with capabilities alone and never need to obtain
privilege via (set)uid-0.
Of course, conceptually isn't quite the same as currently possible since few
user applications, certainly not enough to run a viable system, are currently
prepared to leverage capabilities to exercise privilege. Further, many
applications exist that may never get upgraded in this way, and the kernel
will continue to want to support their setuid-0 base privilege needs.
Where pure-capability applications evolve and replace setuid-0 binaries, it is
desirable that there be a mechanisms by which they can contain their
privilege. In addition to leveraging the per-process bounding and inheritable
sets, this should include suppressing the privilege of the uid-0 superuser
from the process' tree of children.
The feature added by this patch can be leveraged to suppress the privilege
associated with (set)uid-0. This suppression requires CAP_SETPCAP to
initiate, and only immediately affects the 'current' process (it is inherited
through fork()/exec()). This reimplementation differs significantly from the
historical support for securebits which was system-wide, unwieldy and which
has ultimately withered to a dead relic in the source of the modern kernel.
With this patch applied a process, that is capable(CAP_SETPCAP), can now drop
all legacy privilege (through uid=0) for itself and all subsequently
fork()'d/exec()'d children with:
prctl(PR_SET_SECUREBITS, 0x2f);
This patch represents a no-op unless CONFIG_SECURITY_FILE_CAPABILITIES is
enabled at configure time.
[akpm at linux-foundation.org: fix uninitialised var warning]
[serue at us.ibm.com: capabilities: use cap_task_prctl when !CONFIG_SECURITY]
Signed-off-by: Andrew G. Morgan <morgan at kernel.org>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Reviewed-by: James Morris <jmorris at namei.org>
Cc: Stephen Smalley <sds at tycho.nsa.gov>
Cc: Paul Moore <paul.moore at hp.com>
Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4016a1390d07f15b267eecb20e76a48fd5c524ef
Author: Michael Hennerich <Michael.Hennerich at analog.com>
Date: Mon Apr 28 02:13:38 2008 -0700
mm/nommu.c: return 0 from kobjsize with invalid objects
Don't perform kobjsize operations on objects the kernel doesn't manage.
On Blackfin, drivers can get dma coherent memory by calling a function
dma_alloc_coherent(). We do this in nommu by configuring a chunk of uncached
memory at the top of memory.
Since we don't want the kernel to use the uncached memory, we lie to the
kernel, and tell it that it's max memory is between 0, and the start of the
uncached dma coherent section.
this all works well, until this memory gets exposed into userspace (with a
frame buffer), when you look at the process's maps, it shows the framebuf:
root:/proc> cat maps
[snip]
03f0ef00-03f34700 rw-p 00000000 1f:00 192 /dev/fb0
root:/proc>
This is outside the "normal" range for the kernel. When the kernel tries to
find the size of this object (when you run ps), it dies in nommu.c in
kobjsize.
BUG_ON(page->index >= MAX_ORDER);
since the page we are referring to is outside what the kernel thinks is it's
max valid memory.
root:~> while [ 1 ]; ps > /dev/null; done
kernel BUG at mm/nommu.c:119!
Kernel panic - not syncing: BUG!
We fixed this by adding a check to reject out of range object pointers as it
already does that for NULL pointers.
Signed-off-by: Michael Hennerich <Michael.Hennerich at analog.com>
Signed-off-by: Robin Getz <rgetz at blackfin.uclinux.org>
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 468fd62ed9090ccbe872489df5d0d099510df4b5
Author: Dimitri Sivanich <sivanich at sgi.com>
Date: Mon Apr 28 02:13:37 2008 -0700
vmstats: add cond_resched() to refresh_cpu_vm_stats()
We've found that it can take quite a bit of time (100's of usec) to get
through the zone loop in refresh_cpu_vm_stats().
Adding a cond_resched() to allow other threads to run in the non-preemptive
case.
Signed-off-by: Dimitri Sivanich <sivanich at sgi.com>
Acked-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8cece85ec744bdc7ea0fc2d33f65b3f031c28468
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Date: Mon Apr 28 02:13:36 2008 -0700
mm: fix broken gfp_zone with __GFP_THISNODE
This hack, "base = MAX_NR_ZONES", at __GFP_THISNODE was used for old
zonliests.
Now, new zonelist[] have a list for __GFP_THISNODE and this hack is incorrect.
Should be removed.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2309f9e6fe3f1de661eab9613f7903ab4420c753
Author: Pavel Machek <pavel at ucw.cz>
Date: Mon Apr 28 02:13:35 2008 -0700
mm/page_alloc.c: remove hand-coded get_order()
Remove hand-coded get_order() from page_alloc.c.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 97d87c9710bc6c5f2585fb9dc58f5bedbe996f10
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Mon Apr 28 02:13:35 2008 -0700
oom_kill: remove unused parameter in badness()
In commit 4c4a22148909e4c003562ea7ffe0a06e26919e3c, we moved the
memcontroller-related code from badness() to select_bad_process(), so the
parameter 'mem' in badness() is unused now.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Acked-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0c0a4a517a31e05efb38304668198a873bfec6ca
Author: Yasunori Goto <y-goto at jp.fujitsu.com>
Date: Mon Apr 28 02:13:34 2008 -0700
memory hotplug: free memmaps allocated by bootmem
This patch is to free memmaps which is allocated by bootmem.
Freeing usemap is not necessary. The pages of usemap may be necessary for
other sections.
If removing section is last section on the node, its section is the final user
of usemap page. (usemaps are allocated on its section by previous patch.) But
it shouldn't be freed too, because the section must be logical offline state
which all pages are isolated against page allocater. If it is freed, page
alloctor may use it which will be removed physically soon. It will be
disaster. So, this patch keeps it as it is.
Signed-off-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 86f6dae1377523689bd8468fed2f2dd180fc0560
Author: Yasunori Goto <y-goto at jp.fujitsu.com>
Date: Mon Apr 28 02:13:33 2008 -0700
memory hotplug: allocate usemap on the section with pgdat
Usemaps are allocated on the section which has pgdat by this.
Because usemap size is very small, many other sections usemaps are allocated
on only one page. If a section has usemap, it can't be removed until removing
other sections. This dependency is not desirable for memory removing.
Pgdat has similar feature. When a section has pgdat area, it must be the last
section for removing on the node. So, if section A has pgdat and section B
has usemap for section A, Both sections can't be removed due to dependency
each other.
To solve this issue, this patch collects usemap on same section with pgdat.
If other sections doesn't have any dependency, this section will be able to be
removed finally.
Signed-off-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e70260aabea3af2a84b951e75166dcebe689b88e
Author: Yasunori Goto <y-goto at jp.fujitsu.com>
Date: Mon Apr 28 02:13:32 2008 -0700
memory hotplug: make alloc_bootmem_section()
alloc_bootmem_section() can allocate specified section's area. This is used
for usemap to keep same section with pgdat by later patch.
Signed-off-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9d99217a02a06a7cc83f065b73e976970970c58c
Author: Yasunori Goto <y-goto at jp.fujitsu.com>
Date: Mon Apr 28 02:13:32 2008 -0700
memory hotplug: align memmap to page size
To free memmap easier, this patch aligns it to page size. Bootmem allocater
may mix some objects in one pages. It's not good for freeing memmap of memory
hot-remove.
Signed-off-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 04753278769f3b6c3b79a080edb52f21d83bf6e2
Author: Yasunori Goto <y-goto at jp.fujitsu.com>
Date: Mon Apr 28 02:13:31 2008 -0700
memory hotplug: register section/node id to free
This patch set is to free pages which is allocated by bootmem for
memory-hotremove. Some structures of memory management are allocated by
bootmem. ex) memmap, etc.
To remove memory physically, some of them must be freed according to
circumstance. This patch set makes basis to free those pages, and free
memmaps.
Basic my idea is using remain members of struct page to remember information
of users of bootmem (section number or node id). When the section is
removing, kernel can confirm it. By this information, some issues can be
solved.
1) When the memmap of removing section is allocated on other
section by bootmem, it should/can be free.
2) When the memmap of removing section is allocated on the
same section, it shouldn't be freed. Because the section has to be
logical memory offlined already and all pages must be isolated against
page allocater. If it is freed, page allocator may use it which will
be removed physically soon.
3) When removing section has other section's memmap,
kernel will be able to show easily which section should be removed
before it for user. (Not implemented yet)
4) When the above case 2), the page isolation will be able to check and skip
memmap's page when logical memory offline (offline_pages()).
Current page isolation code fails in this case because this page is
just reserved page and it can't distinguish this pages can be
removed or not. But, it will be able to do by this patch.
(Not implemented yet.)
5) The node information like pgdat has similar issues. But, this
will be able to be solved too by this.
(Not implemented yet, but, remembering node id in the pages.)
Fortunately, current bootmem allocator just keeps PageReserved flags,
and doesn't use any other members of page struct. The users of
bootmem doesn't use them too.
This patch:
This is to register information which is node or section's id. Kernel can
distinguish which node/section uses the pages allcated by bootmem. This is
basis for hot-remove sections or nodes.
Signed-off-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7f2e9525ba55b1c42ad6c4a5a59d7eb7bdd9be72
Author: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Date: Mon Apr 28 02:13:29 2008 -0700
hugetlbfs: common code update for s390
Huge ptes have a special type on s390 and cannot be handled with the standard
pte functions in certain cases, e.g. because of a different location of the
invalid bit. This patch adds some new architecture- specific functions to
hugetlb common code, as a prerequisite for the s390 large page support.
This won't affect other architectures in functionality, but I need to add some
new dummy inline functions to the headers.
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Cc: Paul Mundt <lethal at linux-sh.org>
Cc: "Luck, Tony" <tony.luck at intel.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: "David S. Miller" <davem at davemloft.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8fe627ec5b7c47b1654dff50536d9709863295a3
Author: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Date: Mon Apr 28 02:13:28 2008 -0700
hugetlbfs: add missing TLB flush to hugetlb_cow()
A cow break on a hugetlbfs page with page_count > 1 will set a new pte with
set_huge_pte_at(), w/o any tlb flush operation. The old pte will remain in
the tlb and subsequent write access to the page will result in a page fault
loop, for as long as it may take until the tlb is flushed from somewhere else.
This patch introduces an architecture-specific huge_ptep_clear_flush()
function, which is called before the the set_huge_pte_at() in hugetlb_cow().
ATTENTION: This is just a nop on all architectures for now, the s390
implementation will come with our large page patch later. Other architectures
should define their own huge_ptep_clear_flush() if needed.
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Cc: Paul Mundt <lethal at linux-sh.org>
Cc: "Luck, Tony" <tony.luck at intel.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: "David S. Miller" <davem at davemloft.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6d779079bfd1196e077bb1d0a906c37ae770b102
Author: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Date: Mon Apr 28 02:13:27 2008 -0700
hugetlbfs: architecture header cleanup
This patch moves all architecture functions for hugetlb to architecture header
files (include/asm-foo/hugetlb.h) and converts all macros to inline functions.
It also removes (!) ARCH_HAS_HUGEPAGE_ONLY_RANGE,
ARCH_HAS_HUGETLB_FREE_PGD_RANGE, ARCH_HAS_PREPARE_HUGEPAGE_RANGE,
ARCH_HAS_SETCLEAR_HUGE_PTE and ARCH_HAS_HUGETLB_PREFAULT_HOOK.
Getting rid of the ARCH_HAS_xxx #ifdef and macro fugliness should increase
readability and maintainability, at the price of some code duplication. An
asm-generic common part would have reduced the loc, but we would end up with
new ARCH_HAS_xxx defines eventually.
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Cc: Paul Mundt <lethal at linux-sh.org>
Cc: "Luck, Tony" <tony.luck at intel.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: "David S. Miller" <davem at davemloft.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 71fe804b6d56d6a7aed680e096901434cef6a2c3
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:26 2008 -0700
mempolicy: use struct mempolicy pointer in shmem_sb_info
This patch replaces the mempolicy mode, mode_flags, and nodemask in the
shmem_sb_info struct with a struct mempolicy pointer, initialized to NULL.
This removes dependency on the details of mempolicy from shmem.c and hugetlbfs
inode.c and simplifies the interfaces.
mpol_parse_str() in mempolicy.c is changed to return, via a pointer to a
pointer arg, a struct mempolicy pointer on success. For MPOL_DEFAULT, the
returned pointer is NULL. Further, mpol_parse_str() now takes a 'no_context'
argument that causes the input nodemask to be stored in the w.user_nodemask of
the created mempolicy for use when the mempolicy is installed in a tmpfs inode
shared policy tree. At that time, any cpuset contextualization is applied to
the original input nodemask. This preserves the previous behavior where the
input nodemask was stored in the superblock. We can think of the returned
mempolicy as "context free".
Because mpol_parse_str() is now calling mpol_new(), we can remove from
mpol_to_str() the semantic checks that mpol_new() already performs.
Add 'no_context' parameter to mpol_to_str() to specify that it should format
the nodemask in w.user_nodemask for 'bind' and 'interleave' policies.
Change mpol_shared_policy_init() to take a pointer to a "context free" struct
mempolicy and to create a new, "contextualized" mempolicy using the mode,
mode_flags and user_nodemask from the input mempolicy.
Note: we know that the mempolicy passed to mpol_to_str() or
mpol_shared_policy_init() from a tmpfs superblock is "context free". This
is currently the only instance thereof. However, if we found more uses for
this concept, and introduced any ambiguity as to whether a mempolicy was
context free or not, we could add another internal mode flag to identify
context free mempolicies. Then, we could remove the 'no_context' argument
from mpol_to_str().
Added shmem_get_sbmpol() to return a reference counted superblock mempolicy,
if one exists, to pass to mpol_shared_policy_init(). We must add the
reference under the sb stat_lock to prevent races with replacement of the mpol
by remount. This reference is removed in mpol_shared_policy_init().
[akpm at linux-foundation.org: build fix]
[akpm at linux-foundation.org: another build fix]
[akpm at linux-foundation.org: yet another build fix]
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3f226aa1cbc006f9d90f22084f519ad2a1286cd8
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:24 2008 -0700
mempolicy: support mpol=local tmpfs mount option
For tmpfs/shmem shared policies, MPOL_DEFAULT is not necessarily equivalent to
"local allocation". Because shared policies are at the same "scope" level
[see Documentation/vm/numa_memory_policy.txt], as vma policies MPOL_DEFAULT
means "fall back to current task policy".
This patch extends the memory policy string parsing function to display
"local" for MPOL_PREFERRED + MPOL_F_LOCAL. This allows one to specify local
allocation as the default policy for shared memory areas via the tmpfs mpol
mount option, regardless of the current task's policy.
Also, "local" is now displayed for this policy. This patch allows us to
accept the same input format as the display.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 095f1fc4ebf36c64fddf9b6db29b1ab5517378e6
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:23 2008 -0700
mempolicy: rework shmem mpol parsing and display
mm/shmem.c currently contains functions to parse and display memory policy
strings for the tmpfs 'mpol' mount option. Move this to mm/mempolicy.c with
the rest of the mempolicy support. With subsequent patches, we'll be able to
remove knowledge of the details [mode, flags, policy, ...] completely from
shmem.c
1) replace shmem_parse_mpol() in mm/shmem.c with mpol_parse_str() in
mm/mempolicy.c. Rework to use the policy_types[] array [used by
mpol_to_str()] to look up mode by name.
2) use mpol_to_str() to format policy for shmem_show_mpol(). mpol_to_str()
expects a pointer to a struct mempolicy, so temporarily construct one.
This will be replaced with a reference to a struct mempolicy in the tmpfs
superblock in a subsequent patch.
NOTE 1: I changed mpol_to_str() to use a colon ':' rather than an equal
sign '=' as the nodemask delimiter to match mpol_parse_str() and the
tmpfs/shmem mpol mount option formatting that now uses mpol_to_str(). This
is a user visible change to numa_maps, but then the addition of the mode
flags already changed the display. It makes sense to me to have the mounts
and numa_maps display the policy in the same format. However, if anyone
objects strongly, I can pass the desired nodemask delimeter as an arg to
mpol_to_str().
Note 2: Like show_numa_map(), I don't check the return code from
mpol_to_str(). I do use a longer buffer than the one provided by
show_numa_map(), which seems to have sufficed so far.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2291990ab36b4b2d8a81b1f92e7a046e51632a60
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:22 2008 -0700
mempolicy: clean-up mpol-to-str() mempolicy formatting
mpol-to-str() formats memory policies into printable strings. Currently this
is only used to display "numa_maps". A subsequent patch will use
mpol_to_str() for formatting tmpfs [shmem] mpol mount options, allowing us to
remove essentially duplicate code in mm/shmem.c. This patch cleans up
mpol_to_str() generally and in preparation for that patch.
1) show_numa_maps() is not checking the return code from mpol_to_str().
There's not a lot we can do in this context if mpol_to_str() did return the
error [insufficient space in buffer]. Proposed "solution": just check,
under DEBUG_VM, that callers are providing sufficient buffer space for the
policy, flags, and a few nodes. This way, we'll get some display.
show_numa_maps() is providing a 50-byte buffer, so it won't trip this
check. 50-bytes should be sufficient unless one has a large number of
nodes in a very sparse nodemask.
2) The display of the new mode flags ["static" & "relative"] was set up to
display multiple flags, separated by a "bar" '|'. However, this support is
incomplete--e.g., need_bar was never incremented; and currently, these two
flags are mutually exclusive. So remove the "bar" support, for now, and
only display one flag.
3) Use snprint() to format flags, so as not to overflow the buffer. Not
that it's ever happed, AFAIK.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fc36b8d3d819047eb4d23ca079fb4d3af20ff076
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:21 2008 -0700
mempolicy: use MPOL_F_LOCAL to Indicate Preferred Local Policy
Now that we're using "preferred local" policy for system default, we need to
make this as fast as possible. Because of the variable size of the mempolicy
structure [based on size of nodemasks], the preferred_node may be in a
different cacheline from the mode. This can result in accessing an extra
cacheline in the normal case of system default policy. Suspect this is the
cause of an observed 2-3% slowdown in page fault testing relative to kernel
without this patch series.
To alleviate this, use an internal mode flag, MPOL_F_LOCAL in the mempolicy
flags member which is guaranteed [?] to be in the same cacheline as the mode
itself.
Verified that reworked mempolicy now performs slightly better on 25-rc8-mm1
for both anon and shmem segments with system default and vma [preferred local]
policy.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 53f2556b6792ed99fde965f5e061749edd455623
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:20 2008 -0700
mempolicy: mPOL_PREFERRED cleanups for "local allocation"
Here are a couple of "cleanups" for MPOL_PREFERRED behavior when
v.preferred_node < 0 -- i.e., "local allocation":
1) [do_]get_mempolicy() calls the now renamed get_policy_nodemask()
to fetch the nodemask associated with a policy. Currently,
get_policy_nodemask() returns the set of nodes with memory, when
the policy 'mode' is 'PREFERRED, and the preferred_node is < 0.
Change to return an empty nodemask, as this is what was specified
to achieve "local allocation".
2) When a task is moved into a [new] cpuset, mpol_rebind_policy() is
called to adjust any task and vma policy nodes to be valid in the
new cpuset. However, when the policy is MPOL_PREFERRED, and the
preferred_node is <0, no rebind is necessary. The "local allocation"
indication is valid in any cpuset. Existing code will "do the right
thing" because node_remap() will just return the argument node when
it is outside of the valid range of node ids. However, I think it is
clearer and cleaner to skip the remap explicitly in this case.
3) mpol_to_str() produces a printable, "human readable" string from a
struct mempolicy. For MPOL_PREFERRED with preferred_node <0, show
"local", as this indicates local allocation, as the task migrates
among nodes. Note that this matches the usage of "local allocation"
in libnuma() and numactl. Without this change, I believe that node_set()
[via set_bit()] will set bit 31, resulting in a misleading display.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bea904d54d6faa92400f10c8ea3d3828b8e1eb93
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:18 2008 -0700
mempolicy: use MPOL_PREFERRED for system-wide default policy
Currently, when one specifies MPOL_DEFAULT via a NUMA memory policy API
[set_mempolicy(), mbind() and internal versions], the kernel simply installs a
NULL struct mempolicy pointer in the appropriate context: task policy, vma
policy, or shared policy. This causes any use of that policy to "fall back"
to the next most specific policy scope.
The only use of MPOL_DEFAULT to mean "local allocation" is in the system
default policy. This requires extra checks/cases for MPOL_DEFAULT in many
mempolicy.c functions.
There is another, "preferred" way to specify local allocation via the APIs.
That is using the MPOL_PREFERRED policy mode with an empty nodemask.
Internally, the empty nodemask gets converted to a preferred_node id of '-1'.
All internal usage of MPOL_PREFERRED will convert the '-1' to the id of the
node local to the cpu where the allocation occurs.
System default policy, except during boot, is hard-coded to "local
allocation". By using the MPOL_PREFERRED mode with a negative value of
preferred node for system default policy, MPOL_DEFAULT will never occur in the
'policy' member of a struct mempolicy. Thus, we can remove all checks for
MPOL_DEFAULT when converting policy to a node id/zonelist in the allocation
paths.
In slab_node() return local node id when policy pointer is NULL. No need to
set a pol value to take the switch default. Replace switch default with
BUG()--i.e., shouldn't happen.
With this patch MPOL_DEFAULT is only used in the APIs, including internal
calls to do_set_mempolicy() and in the display of policy in
/proc/<pid>/numa_maps. It always means "fall back" to the the next most
specific policy scope. This simplifies the description of memory policies
quite a bit, with no visible change in behavior.
get_mempolicy() continues to return MPOL_DEFAULT and an empty nodemask when
the requested policy [task or vma/shared] is NULL. These are the values one
would supply via set_mempolicy() or mbind() to achieve that condition--default
behavior.
This patch updates Documentation to reflect this change.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 52cd3b074050dd664380b5e8cfc85d4a6ed8ad48
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:16 2008 -0700
mempolicy: rework mempolicy Reference Counting [yet again]
After further discussion with Christoph Lameter, it has become clear that my
earlier attempts to clean up the mempolicy reference counting were a bit of
overkill in some areas, resulting in superflous ref/unref in what are usually
fast paths. In other areas, further inspection reveals that I botched the
unref for interleave policies.
A separate patch, suitable for upstream/stable trees, fixes up the known
errors in the previous attempt to fix reference counting.
This patch reworks the memory policy referencing counting and, one hopes,
simplifies the code. Maybe I'll get it right this time.
See the update to the numa_memory_policy.txt document for a discussion of
memory policy reference counting that motivates this patch.
Summary:
Lookup of mempolicy, based on (vma, address) need only add a reference for
shared policy, and we need only unref the policy when finished for shared
policies. So, this patch backs out all of the unneeded extra reference
counting added by my previous attempt. It then unrefs only shared policies
when we're finished with them, using the mpol_cond_put() [conditional put]
helper function introduced by this patch.
Note that shmem_swapin() calls read_swap_cache_async() with a dummy vma
containing just the policy. read_swap_cache_async() can call alloc_page_vma()
multiple times, so we can't let alloc_page_vma() unref the shared policy in
this case. To avoid this, we make a copy of any non-null shared policy and
remove the MPOL_F_SHARED flag from the copy. This copy occurs before reading
a page [or multiple pages] from swap, so the overhead should not be an issue
here.
I introduced a new static inline function "mpol_cond_copy()" to copy the
shared policy to an on-stack policy and remove the flags that would require a
conditional free. The current implementation of mpol_cond_copy() assumes that
the struct mempolicy contains no pointers to dynamically allocated structures
that must be duplicated or reference counted during copy.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a6020ed759404372e8be2b276e85e51735472cc9
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:14 2008 -0700
mempolicy: document {set|get}_policy() vm_ops APIs
Document mempolicy return value reference semantics assumed by the rest of the
mempolicy code for the set_ and get_policy vm_ops in <linux/mm.h>--where the
prototypes are defined--to inform any future mempolicy vm_op writers what the
rest of the subsystem expects of them.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aab0b1029f0843756b68e0ed3ca983685bf43ed6
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:13 2008 -0700
mempolicy: mark shared policies for unref
As part of yet another rework of mempolicy reference counting, we want to be
able to identify shared policies efficiently, because they have an extra ref
taken on lookup that needs to be removed when we're finished using the policy.
Note: the extra ref is required because the policies are
shared between tasks/processes and can be changed/freed
by one task while another task is using them--e.g., for
page allocation.
Building on David Rientjes mempolicy "mode flags" enhancement, this patch
indicates a "shared" policy by setting a new MPOL_F_SHARED flag in the flags
member of the struct mempolicy added by David. MPOL_F_SHARED, and any future
"internal mode flags" are reserved from bit zero up, as they will never be
passed in the upper bits of the mode argument of a mempolicy API.
I set the MPOL_F_SHARED flag when the policy is installed in the shared policy
rb-tree. Don't need/want to clear the flag when removing from the tree as the
mempolicy is freed [unref'd] internally to the sp_delete() function. However,
a task could hold another reference on this mempolicy from a prior lookup. We
need the MPOL_F_SHARED flag to stay put so that any tasks holding a ref will
unref, eventually freeing, the mempolicy.
A later patch in this series will introduce a function to conditionally unref
[mpol_free] a policy. The MPOL_F_SHARED flag is one reason [currently the
only reason] to unref/free a policy via the conditional free.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 45c4745af381851b0406d8e4db99e62e265691c2
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:12 2008 -0700
mempolicy: rename struct mempolicy 'policy' member to 'mode'
The terms 'policy' and 'mode' are both used in various places to describe the
semantics of the value stored in the 'policy' member of struct mempolicy.
Furthermore, the term 'policy' is used to refer to that member, to the entire
struct mempolicy and to the more abstract concept of the tuple consisting of a
"mode" and an optional node or set of nodes. Recently, we have added "mode
flags" that are passed in the upper bits of the 'mode' [or sometimes,
'policy'] member of the numa APIs.
I'd like to resolve this confusion, which perhaps only exists in my mind, by
renaming the 'policy' member to 'mode' throughout, and fixing up the
Documentation. Man pages will be updated separately.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ae4d8c16aa22775f5731677abb8a82f03cec877e
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:11 2008 -0700
mempolicy: fixup Fallback for Default Shmem Policy
get_vma_policy() is not handling fallback to task policy correctly when the
get_policy() vm_op returns NULL. The NULL overwrites the 'pol' variable that
was holding the fallback task mempolicy. So, it was falling back directly to
system default policy.
Fix get_vma_policy() to use only non-NULL policy returned from the vma
get_policy op.
shm_get_policy() was falling back to current task's mempolicy if the "backing
file system" [tmpfs vs hugetlbfs] does not support the get_policy vm_op and
the vma policy is null. This is incorrect for show_numa_maps() which is
likely querying the numa_maps of some task other than current. Remove this
fallback.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f4e53d910b7dde2685b177f1e7c3e3e0b4a42f7b
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:10 2008 -0700
mempolicy: write lock mmap_sem while changing task mempolicy
A read of /proc/<pid>/numa_maps holds the target task's mmap_sem for read
while examining each vma's mempolicy. A vma's mempolicy can fall back to the
task's policy. However, the task could be changing it's task policy and free
the one that the show_numa_maps() is examining.
To prevent this, grab the mmap_sem for write when updating task mempolicy.
Pointed out to me by Christoph Lameter and extracted and reworked from
Christoph's alternative mempol reference counting patch.
This is analogous to the way that do_mbind() and do_get_mempolicy() prevent
races between task's sharing an mm_struct [a.k.a. threads] setting and
querying a mempolicy for a particular address.
Note: this is necessary, but not sufficient, to allow us to stop taking an
extra reference on "other task's mempolicy" in get_vma_policy. Subsequent
patches will complete this update, allowing us to simplify the tests for
whether we need to unref a mempolicy at various points in the code.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 846a16bf0fc80dc95a414ffce465e3cbf9680247
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:09 2008 -0700
mempolicy: rename mpol_copy to mpol_dup
This patch renames mpol_copy() to mpol_dup() because, well, that's what it
does. Like, e.g., strdup() for strings, mpol_dup() takes a pointer to an
existing mempolicy, allocates a new one and copies the contents.
In a later patch, I want to use the name mpol_copy() to copy the contents from
one mempolicy to another like, e.g., strcpy() does for strings.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f0be3d32b05d3fea2fcdbbb81a39dac2a7163169
Author: Lee Schermerhorn <lee.schermerhorn at hp.com>
Date: Mon Apr 28 02:13:08 2008 -0700
mempolicy: rename mpol_free to mpol_put
This is a change that was requested some time ago by Mel Gorman. Makes sense
to me, so here it is.
Note: I retain the name "mpol_free_shared_policy()" because it actually does
free the shared_policy, which is NOT a reference counted object. However, ...
The mempolicy object[s] referenced by the shared_policy are reference counted,
so mpol_put() is used to release the reference held by the shared_policy. The
mempolicy might not be freed at this time, because some task attached to the
shared object associated with the shared policy may be in the process of
allocating a page based on the mempolicy. In that case, the task performing
the allocation will hold a reference on the mempolicy, obtained via
mpol_shared_policy_lookup(). The mempolicy will be freed when all tasks
holding such a reference have called mpol_put() for the mempolicy.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3b1163006332302117b1b2acf226d4014ff46525
Author: Adam Litke <agl at us.ibm.com>
Date: Mon Apr 28 02:13:06 2008 -0700
Subject: [PATCH] hugetlb: vmstat events for huge page allocations
Allocating huge pages directly from the buddy allocator is not guaranteed to
succeed. Success depends on several factors (such as the amount of physical
memory available and the level of fragmentation). With the addition of
dynamic hugetlb pool resizing, allocations can occur much more frequently.
For these reasons it is desirable to keep track of huge page allocation
successes and failures.
Add two new vmstat entries to track huge page allocations that succeed and
fail. The presence of the two entries is contingent upon CONFIG_HUGETLB_PAGE
being enabled.
[akpm at linux-foundation.org: reduced ifdeffery]
Signed-off-by: Adam Litke <agl at us.ibm.com>
Signed-off-by: Eric Munson <ebmunson at us.ibm.com>
Tested-by: Mel Gorman <mel at csn.ul.ie>
Reviewed-by: Andy Whitcroft <apw at shadowen.org>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 122c7a59055c77434118d7dd4dff4b625d4a2c15
Author: Ken'ichi Ohmichi <oomichi at mxs.nes.nec.co.jp>
Date: Mon Apr 28 02:13:04 2008 -0700
vmcoreinfo: add page flags values
Add some values of page flags to the vmcoreinfo data.
The vmcoreinfo data has the minimum debugging information only for dump
filtering. makedumpfile (dump filtering command) gets it to distinguish
unnecessary pages, and makedumpfile creates a small dumpfile.
An old makedumpfile (v1.2.4 or before) had assumed some values of page flags
internally, and this implementation could not follow the change of these
values. For example, Christoph Lameter is changing these values by the
follwing patch: http://lkml.org/lkml/2008/2/29/463
So a new makedumpfile (v1.2.5) came to need these values and I created this
patch to let the kernel output them.
Signed-off-by: Ken'ichi Ohmichi <oomichi at mxs.nes.nec.co.jp>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Acked-by: Vivek Goyal <vgoyal at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a08cb629f546d1cecebe955392197f226e58dbe1
Author: Nick Piggin <npiggin at suse.de>
Date: Mon Apr 28 02:13:03 2008 -0700
s390: implement pte special bit
Convert XIP to support non-struct page backed memory, using VM_MIXEDMAP for
the user mappings.
This requires the get_xip_page API to be changed to an address based one.
Improve the API layering a little bit too, while we're here.
This is required in order to support XIP filesystems on memory that isn't
backed with struct page (but memory with struct page is still supported too).
Signed-off-by: Nick Piggin <npiggin at suse.de>
Acked-by: Carsten Otte <cotte at de.ibm.com>
Cc: Jared Hulbert <jaredeh at gmail.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 70688e4dd1647f0ceb502bbd5964fa344c5eb411
Author: Nick Piggin <npiggin at suse.de>
Date: Mon Apr 28 02:13:02 2008 -0700
xip: support non-struct page backed memory
Convert XIP to support non-struct page backed memory, using VM_MIXEDMAP for
the user mappings.
This requires the get_xip_page API to be changed to an address based one.
Improve the API layering a little bit too, while we're here.
This is required in order to support XIP filesystems on memory that isn't
backed with struct page (but memory with struct page is still supported too).
Signed-off-by: Nick Piggin <npiggin at suse.de>
Acked-by: Carsten Otte <cotte at de.ibm.com>
Cc: Jared Hulbert <jaredeh at gmail.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 30afcb4bd2762fa4b87b17ada9500aa46dc10b1b
Author: Jared Hulbert <jaredeh at gmail.com>
Date: Mon Apr 28 02:13:02 2008 -0700
return pfn from direct_access, for XIP
Alter the block device ->direct_access() API to work with the new
get_xip_mem() API (that requires both kaddr and pfn are returned).
Some architectures will not do the right thing in their virt_to_page() for use
by XIP (to translate from the kernel virtual address returned by
direct_access(), to a user mappable pfn in XIP's page fault handler.
However, we can't switch it to just return the pfn and not the kaddr, because
we have no good way to get a kva from a pfn, and XIP requires the kva for its
read(2) and write(2) handlers. So we have to return both.
Signed-off-by: Jared Hulbert <jaredeh at gmail.com>
Signed-off-by: Nick Piggin <npiggin at suse.de>
Cc: Carsten Otte <cotte at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: linux-mm at kvack.org
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 423bad600443c590f34ed7ce357591f76f48f137
Author: Nick Piggin <npiggin at suse.de>
Date: Mon Apr 28 02:13:01 2008 -0700
mm: add vm_insert_mixed
vm_insert_mixed will insert either a raw pfn or a refcounted struct page into
the page tables, depending on whether vm_normal_page() will return the page or
not. With the introduction of the new pte bit, this is now a too tricky for
drivers to be doing themselves.
filemap_xip uses this in a subsequent patch.
Signed-off-by: Nick Piggin <npiggin at suse.de>
Cc: Jared Hulbert <jaredeh at gmail.com>
Cc: Carsten Otte <cotte at de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7e675137a8e1a4d45822746456dd389b65745bf6
Author: Nick Piggin <npiggin at suse.de>
Date: Mon Apr 28 02:13:00 2008 -0700
mm: introduce pte_special pte bit
s390 for one, cannot implement VM_MIXEDMAP with pfn_valid, due to their memory
model (which is more dynamic than most). Instead, they had proposed to
implement it with an additional path through vm_normal_page(), using a bit in
the pte to determine whether or not the page should be refcounted:
vm_normal_page()
{
...
if (unlikely(vma->vm_flags & (VM_PFNMAP|VM_MIXEDMAP))) {
if (vma->vm_flags & VM_MIXEDMAP) {
#ifdef s390
if (!mixedmap_refcount_pte(pte))
return NULL;
#else
if (!pfn_valid(pfn))
return NULL;
#endif
goto out;
}
...
}
This is fine, however if we are allowed to use a bit in the pte to determine
refcountedness, we can use that to _completely_ replace all the vma based
schemes. So instead of adding more cases to the already complex vma-based
scheme, we can have a clearly seperate and simple pte-based scheme (and get
slightly better code generation in the process):
vm_normal_page()
{
#ifdef s390
if (!mixedmap_refcount_pte(pte))
return NULL;
return pte_page(pte);
#else
...
#endif
}
And finally, we may rather make this concept usable by any architecture rather
than making it s390 only, so implement a new type of pte state for this.
Unfortunately the old vma based code must stay, because some architectures may
not be able to spare pte bits. This makes vm_normal_page a little bit more
ugly than we would like, but the 2 cases are clearly seperate.
So introduce a pte_special pte state, and use it in mm/memory.c. It is
currently a noop for all architectures, so this doesn't actually result in any
compiled code changes to mm/memory.o.
BTW:
I haven't put vm_normal_page() into arch code as-per an earlier suggestion.
The reason is that, regardless of where vm_normal_page is actually
implemented, the *abstraction* is still exactly the same. Also, while it
depends on whether the architecture has pte_special or not, that is the
only two possible cases, and it really isn't an arch specific function --
the role of the arch code should be to provide primitive functions and
accessors with which to build the core code; pte_special does that. We do
not want architectures to know or care about vm_normal_page itself, and
we definitely don't want them being able to invent something new there
out of sight of mm/ code. If we made vm_normal_page an arch function, then
we have to make vm_insert_mixed (next patch) an arch function too. So I
don't think moving it to arch code fundamentally improves any abstractions,
while it does practically make the code more difficult to follow, for both
mm and arch developers, and easier to misuse.
[akpm at linux-foundation.org: build fix]
Signed-off-by: Nick Piggin <npiggin at suse.de>
Acked-by: Carsten Otte <cotte at de.ibm.com>
Cc: Jared Hulbert <jaredeh at gmail.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b379d790197cdf8a95fb67507d75a24ac0a1678d
Author: Jared Hulbert <jaredeh at gmail.com>
Date: Mon Apr 28 02:12:58 2008 -0700
mm: introduce VM_MIXEDMAP
This series introduces some important infrastructure work. The overall result
is that:
1. We now support XIP backed filesystems using memory that have no
struct page allocated to them. And patches 6 and 7 actually implement
this for s390.
This is pretty important in a number of cases. As far as I understand,
in the case of virtualisation (eg. s390), each guest may mount a
readonly copy of the same filesystem (eg. the distro). Currently,
guests need to allocate struct pages for this image. So if you have
100 guests, you already need to allocate more memory for the struct
pages than the size of the image. I think. (Carsten?)
For other (eg. embedded) systems, you may have a very large non-
volatile filesystem. If you have to have struct pages for this, then
your RAM consumption will go up proportionally to fs size. Even
though it is just a small proportion, the RAM can be much more costly
eg in terms of power, so every KB less that Linux uses makes it more
attractive to a lot of these guys.
2. VM_MIXEDMAP allows us to support mappings where you actually do want
to refcount _some_ pages in the mapping, but not others, and support
COW on arbitrary (non-linear) mappings. Jared needs this for his NVRAM
filesystem in progress. Future iterations of this filesystem will
most likely want to migrate pages between pagecache and XIP backing,
which is where the requirement for mixed (some refcounted, some not)
comes from.
3. pte_special also has a peripheral usage that I need for my lockless
get_user_pages patch. That was shown to speed up "oltp" on db2 by
10% on a 2 socket system, which is kind of significant because they
scrounge for months to try to find 0.1% improvement on these
workloads. I'm hoping we might finally be faster than AIX on
pSeries with this :). My reference to lockless get_user_pages is not
meant to justify this patchset (which doesn't include lockless gup),
but just to show that pte_special is not some s390 specific thing that
should be hidden in arch code or xip code: I definitely want to use it
on at least x86 and powerpc as well.
This patch:
Introduce a new type of mapping, VM_MIXEDMAP. This is unlike VM_PFNMAP in
that it can support COW mappings of arbitrary ranges including ranges without
struct page *and* ranges with a struct page that we actually want to refcount
(PFNMAP can only support COW in those cases where the un-COW-ed translations
are mapped linearly in the virtual address, and can only support non
refcounted ranges).
VM_MIXEDMAP achieves this by refcounting all pfn_valid pages, and not
refcounting !pfn_valid pages (which is not an option for VM_PFNMAP, because it
needs to avoid refcounting pfn_valid pages eg. for /dev/mem mappings).
Signed-off-by: Jared Hulbert <jaredeh at gmail.com>
Signed-off-by: Nick Piggin <npiggin at suse.de>
Acked-by: Carsten Otte <cotte at de.ibm.com>
Cc: Jared Hulbert <jaredeh at gmail.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 214e471ff99064726b2d8af3aa0e24a73c775531
Author: Peter Zijlstra <peterz at infradead.org>
Date: Mon Apr 28 02:12:55 2008 -0700
smaps: account swap entries
Show the amount of swap for each vma. This can be used to see where all the
swap goes.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Acked-by: Matt Mackall <mpm at selenic.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e20b8cca760ed2a6abcfe37ef56f2306790db648
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:55 2008 -0700
PAGEFLAGS_EXTENDED and separate page flags for Head and Tail
Having separate page flags for the head and the tail of a compound page allows
the compiler to use bitops instead of operations on a word to check for a tail
page. That is f.e. important for virt_to_head_page() which is used in
various critical code paths (kfree for example):
Code for PageTail(page)
Before:
mov (%rdi),%rdx page->flags
mov %rdx,%rax 3 bytes
and $0x12000,%eax 5 bytes
cmp $0x12000,%rax 6 bytes
je 897 <kfree+0xa7>
After:
mov (%rdi),%rax
test $0x40,%ah (3 bytes)
jne 887 <kfree+0x97>
So we go from 14 bytes to 3 bytes and from 3 instructions to one. From the
use of 2 registers we go to none.
We can only use page flags for this if we have page flags available. This
patch introduces CONFIG_PAGEFLAGS_EXTENDED that is set if pageflags are not
scarce due to SPARSEMEM using page flags for its sectionid on 32 bit NUMA
platforms.
Additional page flag definitions can be added to the CONFIG_PAGEFLAGS_EXTENDED
section in page-flags.h if the functionality depends on PAGEFLAGS_EXTENDED or
if more page flag overlapping tricks are used for the !PAGEFLAGS_EXTENDED
fallback (the upcoming virtual compound patch may hook in here and Rik's/Lee's
additional page flags to solve the reclaim issues could also be added there
[hint... hint... where are these patchsets?]).
Avoiding the overlaying of Pg_reclaim also clears the way for possible use of
compound pages for the pagecache or on the LRU.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 97965478a66fbdf0f4ad5e4ecc4828f0cb548a45
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:54 2008 -0700
mm: Get rid of __ZONE_COUNT
It was used to compensate because MAX_NR_ZONES was not available to the
#ifdefs. Export MAX_NR_ZONES via the new mechanism and get rid of
__ZONE_COUNT.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ec7cade8c1a3d1ace69b35cc843b181818578dce
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:53 2008 -0700
page flags: add PAGEFLAGS_FALSE for flags that are always false
Turns out that there are a number of times that a flag is simply always
returning 0. Define a macro for that.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 602c4d112f9abf43af4b882b4a6f5505ed5c51b7
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:52 2008 -0700
page flags: handle PG_uncached like all other flags
Remove the special setup for PG_uncached and simply make it part of the enum.
The page flag will only be allocated when the kernel build includes the
uncached allocator.
Acked-by: Dean Nelson <dcn at sgi.com>
Cc: Jes Sorensen <jes at trained-monkey.org>
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0a128b2b1a5e8ebce0260e3345812ee70daccc7f
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:52 2008 -0700
pageflags: eliminate PG_xxx aliases
Remove aliases of PG_xxx. We can easily drop those now and alias by
specifying the PG_xxx flag in the macro that generates the functions.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Rik van Riel <riel at redhat.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d60cd46bbdc5a79d9a177e40009f960e44f0e334
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:51 2008 -0700
pageflags: use proper page flag functions in Xen
Xen uses bitops to manipulate page flags. Make it use proper page flag
functions.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Rik van Riel <riel at redhat.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6a1e7f777f613bf0df99c7772fa2123d01ce2f7d
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:50 2008 -0700
pageflags: convert to the use of new macros
Replace explicit definitions of page flags through the use of macros.
Significantly reduces the size of the definitions and removes a lot of
opportunity for errors. Additonal page flags can typically be generated with
a single line.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Rik van Riel <riel at redhat.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f94a62e910840b3552c7adb7c57e0f8b3b345f6e
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:49 2008 -0700
pageflags: introduce macros to generate page flag functions
Introduce a set of macros that generate functions to handle page flags.
A page flag function group typically starts with either
SETPAGEFLAG(<part of function name>,<part of PG_ flagname>)
to create a set of page flag operations that are atomic. Or
__SETPAGEFLAG(<part of function name>,<part of PG_ flagname)
to create a set of page flag operations that are not atomic.
Then additional operations can be added using the following macros
TESTSCFLAG Create additional atomic test-and-set and
test-and-clear functions
TESTSETFLAG Create additional test and set function
TESTCLEARFLAG Create additional test and clear function
SETPAGEFLAG Create additional atomic set function
CLEARPAGEFLAG Create additional atomic clear function
__TESTPAGEFLAG Create additional non atomic set function
__SETPAGEFLAG Create additional non atomic clear function
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Rik van Riel <riel at redhat.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9223b4190fa1297a59f292f3419fc0285321d0ea
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:48 2008 -0700
pageflags: get rid of FLAGS_RESERVED
NR_PAGEFLAGS specifies the number of page flags we are using. From that we
can calculate the number of bits leftover that can be used for zone, node (and
maybe the sections id). There is no need anymore for FLAGS_RESERVED if we use
NR_PAGEFLAGS.
Use the new methods to make NR_PAGEFLAGS available via the preprocessor.
NR_PAGEFLAGS is used to calculate field boundaries in the page flags fields.
These field widths have to be available to the preprocessor.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: David Miller <davem at davemloft.net>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Rik van Riel <riel at redhat.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e26831814998cee8e6d9f0a9854cb46c516f5547
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:47 2008 -0700
pageflags: use an enum for the flags
Use an enum to ease the maintenance of page flags. This is going to change
the numbering from 0 to 18.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Rik van Riel <riel at redhat.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bf2ae2b37c06cc9fb6fc03d99617f1161939980f
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:45 2008 -0700
pageflags: standardize comment inclusion in asm-offsets.h and fix MIPS
Add the ability to pass comments into asm-offsets.h by generating asm
output like
-># comment line
Mips needs this feature to preserve the comments that are in
asm-mips/asm-offsets.h right now.
Then remove the special handling for mips from Kbuild and convert mips to use
the new string to include the comments.
Cc: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 726b80127239aeea9c8d8aad5b4e2c80313e3ce8
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 28 02:12:44 2008 -0700
page_mapping(): add ifdef around reference to swapper_space
This fixes the superh build when the pageflags patches are applied.
But it shouldn't unless it's a gcc bug.
Cc: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1cdf25d704f7951d02a04064c97db547d6021872
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:44 2008 -0700
kbuild: create a way to create preprocessor constants from C expressions
The use of enums create constants that are not available to the preprocessor
when building the kernel (f.e. MAX_NR_ZONES).
Arch code already has a way to export constants calculated to the preprocessor
through the asm-offsets.c file. Generate something similar for the core
kernel through kbuild.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Rik van Riel <riel at redhat.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 308c05e35e3517d19bb67a7e97772235c9e15cd7
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:43 2008 -0700
sparsemem: vmemmap does not need section bits
A set of patches that attempts to improve page flag handling. First of all a
method is introduced to generate the page flag functions using macros. Then
the number of page flags used by sparsemem is reduced. All page flag
operations will no longer be macros. All flags will use inline function.
Then we add a way to export enum constants to the preprocessor which allows us
to get rid of __ZONE_COUNT and use the NR_PAGEFLAGS for the dynamic
calculation of actually available page flags for fields.
This patch:
Sparsemem vmemmap does not need any section bits. This patch has the effect
of reducing the number of bits used in page->flags by at least 6.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Rik van Riel <riel at redhat.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2301696932b55e2ea2085cefc84f7b94fa2dd54b
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:42 2008 -0700
vmallocinfo: add caller information
Add caller information so that /proc/vmallocinfo shows where the allocation
request for a slice of vmalloc memory originated.
Results in output like this:
0xffffc20000000000-0xffffc20000801000 8392704 alloc_large_system_hash+0x127/0x246 pages=2048 vmalloc vpages
0xffffc20000801000-0xffffc20000806000 20480 alloc_large_system_hash+0x127/0x246 pages=4 vmalloc
0xffffc20000806000-0xffffc20000c07000 4198400 alloc_large_system_hash+0x127/0x246 pages=1024 vmalloc vpages
0xffffc20000c07000-0xffffc20000c0a000 12288 alloc_large_system_hash+0x127/0x246 pages=2 vmalloc
0xffffc20000c0a000-0xffffc20000c0c000 8192 acpi_os_map_memory+0x13/0x1c phys=cff68000 ioremap
0xffffc20000c0c000-0xffffc20000c0f000 12288 acpi_os_map_memory+0x13/0x1c phys=cff64000 ioremap
0xffffc20000c10000-0xffffc20000c15000 20480 acpi_os_map_memory+0x13/0x1c phys=cff65000 ioremap
0xffffc20000c16000-0xffffc20000c18000 8192 acpi_os_map_memory+0x13/0x1c phys=cff69000 ioremap
0xffffc20000c18000-0xffffc20000c1a000 8192 acpi_os_map_memory+0x13/0x1c phys=fed1f000 ioremap
0xffffc20000c1a000-0xffffc20000c1c000 8192 acpi_os_map_memory+0x13/0x1c phys=cff68000 ioremap
0xffffc20000c1c000-0xffffc20000c1e000 8192 acpi_os_map_memory+0x13/0x1c phys=cff68000 ioremap
0xffffc20000c1e000-0xffffc20000c20000 8192 acpi_os_map_memory+0x13/0x1c phys=cff68000 ioremap
0xffffc20000c20000-0xffffc20000c22000 8192 acpi_os_map_memory+0x13/0x1c phys=cff68000 ioremap
0xffffc20000c22000-0xffffc20000c24000 8192 acpi_os_map_memory+0x13/0x1c phys=cff68000 ioremap
0xffffc20000c24000-0xffffc20000c26000 8192 acpi_os_map_memory+0x13/0x1c phys=e0081000 ioremap
0xffffc20000c26000-0xffffc20000c28000 8192 acpi_os_map_memory+0x13/0x1c phys=e0080000 ioremap
0xffffc20000c28000-0xffffc20000c2d000 20480 alloc_large_system_hash+0x127/0x246 pages=4 vmalloc
0xffffc20000c2d000-0xffffc20000c31000 16384 tcp_init+0xd5/0x31c pages=3 vmalloc
0xffffc20000c31000-0xffffc20000c34000 12288 alloc_large_system_hash+0x127/0x246 pages=2 vmalloc
0xffffc20000c34000-0xffffc20000c36000 8192 init_vdso_vars+0xde/0x1f1
0xffffc20000c36000-0xffffc20000c38000 8192 pci_iomap+0x8a/0xb4 phys=d8e00000 ioremap
0xffffc20000c38000-0xffffc20000c3a000 8192 usb_hcd_pci_probe+0x139/0x295 [usbcore] phys=d8e00000 ioremap
0xffffc20000c3a000-0xffffc20000c3e000 16384 sys_swapon+0x509/0xa15 pages=3 vmalloc
0xffffc20000c40000-0xffffc20000c61000 135168 e1000_probe+0x1c4/0xa32 phys=d8a20000 ioremap
0xffffc20000c61000-0xffffc20000c6a000 36864 _xfs_buf_map_pages+0x8e/0xc0 vmap
0xffffc20000c6a000-0xffffc20000c73000 36864 _xfs_buf_map_pages+0x8e/0xc0 vmap
0xffffc20000c73000-0xffffc20000c7c000 36864 _xfs_buf_map_pages+0x8e/0xc0 vmap
0xffffc20000c7c000-0xffffc20000c7f000 12288 e1000e_setup_tx_resources+0x29/0xbe pages=2 vmalloc
0xffffc20000c80000-0xffffc20001481000 8392704 pci_mmcfg_arch_init+0x90/0x118 phys=e0000000 ioremap
0xffffc20001481000-0xffffc20001682000 2101248 alloc_large_system_hash+0x127/0x246 pages=512 vmalloc
0xffffc20001682000-0xffffc20001e83000 8392704 alloc_large_system_hash+0x127/0x246 pages=2048 vmalloc vpages
0xffffc20001e83000-0xffffc20002204000 3674112 alloc_large_system_hash+0x127/0x246 pages=896 vmalloc vpages
0xffffc20002204000-0xffffc2000220d000 36864 _xfs_buf_map_pages+0x8e/0xc0 vmap
0xffffc2000220d000-0xffffc20002216000 36864 _xfs_buf_map_pages+0x8e/0xc0 vmap
0xffffc20002216000-0xffffc2000221f000 36864 _xfs_buf_map_pages+0x8e/0xc0 vmap
0xffffc2000221f000-0xffffc20002228000 36864 _xfs_buf_map_pages+0x8e/0xc0 vmap
0xffffc20002228000-0xffffc20002231000 36864 _xfs_buf_map_pages+0x8e/0xc0 vmap
0xffffc20002231000-0xffffc20002234000 12288 e1000e_setup_rx_resources+0x35/0x122 pages=2 vmalloc
0xffffc20002240000-0xffffc20002261000 135168 e1000_probe+0x1c4/0xa32 phys=d8a60000 ioremap
0xffffc20002261000-0xffffc2000270c000 4894720 sys_swapon+0x509/0xa15 pages=1194 vmalloc vpages
0xffffffffa0000000-0xffffffffa0022000 139264 module_alloc+0x4f/0x55 pages=33 vmalloc
0xffffffffa0022000-0xffffffffa0029000 28672 module_alloc+0x4f/0x55 pages=6 vmalloc
0xffffffffa002b000-0xffffffffa0034000 36864 module_alloc+0x4f/0x55 pages=8 vmalloc
0xffffffffa0034000-0xffffffffa003d000 36864 module_alloc+0x4f/0x55 pages=8 vmalloc
0xffffffffa003d000-0xffffffffa0049000 49152 module_alloc+0x4f/0x55 pages=11 vmalloc
0xffffffffa0049000-0xffffffffa0050000 28672 module_alloc+0x4f/0x55 pages=6 vmalloc
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a10aa579878fc6f9cd17455067380bbdf1d53c91
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:40 2008 -0700
vmalloc: show vmalloced areas via /proc/vmallocinfo
Implement a new proc file that allows the display of the currently allocated
vmalloc memory.
It allows to see the users of vmalloc. That is important if vmalloc space is
scarce (i386 for example).
And it's going to be important for the compound page fallback to vmalloc.
Many of the current users can be switched to use compound pages with fallback.
This means that the number of users of vmalloc is reduced and page tables no
longer necessary to access the memory. /proc/vmallocinfo allows to review how
that reduction occurs.
If memory becomes fragmented and larger order allocations are no longer
possible then /proc/vmallocinfo allows to see which compound page allocations
fell back to virtual compound pages. That is important for new users of
virtual compound pages. Such as order 1 stack allocation etc that may
fallback to virtual compound pages in the future.
/proc/vmallocinfo permissions are made readable-only-by-root to avoid possible
information leakage.
[akpm at linux-foundation.org: coding-style fixes]
[akpm at linux-foundation.org: CONFIG_MMU=n build fix]
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Arjan van de Ven <arjan at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b45445684198a946b587732265692e6495993abf
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 28 02:12:39 2008 -0700
mm: make early_pfn_to_nid() a C function
Fix this (sparc64)
mm/sparse-vmemmap.c: In function `vmemmap_verify':
mm/sparse-vmemmap.c:64: warning: unused variable `pfn'
by switching to a C function which touches its arg.
(reason 3,555 why macros are bad)
Also, the `nid' arg was misnamed.
Reviewed-by: Christoph Lameter <clameter at sgi.com>
Acked-by: Andy Whitcroft <apw at shadowen.org>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Andi Kleen <ak at suse.de>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ac6aadb24b7d4f0e54246732e221c102073412bf
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Mon Apr 28 02:12:38 2008 -0700
mm: rotate_reclaimable_page() cleanup
Clean up messy conditional calling of test_clear_page_writeback() from both
rotate_reclaimable_page() and end_page_writeback().
The only user of rotate_reclaimable_page() is end_page_writeback() so this is
OK.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f05111f50105ac479a008cf85749cf9c956453ea
Author: S.Caglar Onur <caglar at pardus.org.tr>
Date: Mon Apr 28 02:12:38 2008 -0700
mm/page_alloc.c: fix indentation
zlc_setup(): handle jiffies wraparound
(10ed273f5016c582413dfbc468dd084957d847e1) changes tab with spaces
Signed-off-by: S.Caglar Onur <caglar at pardus.org.tr>
Cc: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Cc: Paul Jackson <pj at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7edf85aa3c00df1e86e82f649c41efa0dd8a7218
Author: Andi Kleen <ak at suse.de>
Date: Mon Apr 28 02:12:37 2008 -0700
mm: save some bytes in mm_struct by filling holes on 64bit
Save some bytes in mm_struct by filling holes
Putting int values together for better packing on 64bit shrinks sizeof(struct
mm_struct) from 776 bytes to 764 bytes.
Signed-off-by: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b5ee5befa75e33e55d34584ad10286c5005cb1de
Author: Andi Kleen <ak at suse.de>
Date: Mon Apr 28 02:12:37 2008 -0700
dmapool: enable debugging for CONFIG_SLUB_DEBUG_ON too
Previously it was only enabled for CONFIG_DEBUG_SLAB.
Not hooked into the slub runtime debug configuration, so you currently only
get it with CONFIG_SLUB_DEBUG_ON, not plain CONFIG_SLUB_DEBUG
Acked-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a43361cf3cb6fb6431fdbfb0f3ef26a334826160
Author: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Date: Mon Apr 28 02:12:36 2008 -0700
mempolicy: fix parsing of tmpfs mpol mount option
Parsing of new mode flags in the tmpfs mpol mount option is slightly broken:
Setting a valid flag works OK:
#mount -o remount,mpol=bind=static:1-2 /dev/shm
#mount
...
tmpfs on /dev/shm type tmpfs (rw,mpol=bind=static:1-2)
...
However, we can't remove them or change them, once we've
set a valid flag:
#mount -o remount,mpol=bind:1-2 /dev/shm
#mount
...
tmpfs on /dev/shm type tmpfs (rw,mpol=bind:1-2)
...
It SAYS it removed it, but that's just a copy of the input
string. If we now try to set it to a different flag, we
get:
#mount -o remount,mpol=bind=relative:1-2 /dev/shm
mount: /dev/shm not mounted already, or bad option
And on the console, we see:
tmpfs: Bad value 'bind' for mount option 'mpol'
^ lost remainder of string
Furthermore, bogus flags are accepted with out error.
Granted, they are a no-op:
#mount -o remount,mpol=interleave=foo:0-3 /dev/shm
#mount
...
tmpfs on /dev/shm type tmpfs (rw,mpol=interleave=foo:0-3)
Again, that's just a copy of the input string shown by the mount command.
This patch fixes the behavior by pre-zeroing the flags so that only one of the
mutually exclusive flags can be set at one time. It also reports an error
when an unrecognized flag is specified.
The check for both flags being set is removed because it can't happen with
this implementation. If we ever want to support multiple non-exclusive flags,
this area will need rework and we will need to check that any mutually
exclusive flags aren't specified.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Andi Kleen <ak at suse.de>
Cc: Eric Whitney <eric.whitney at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3e1f064562fcff7bf3856bc1d00dfa84d4f121cc
Author: David Rientjes <rientjes at google.com>
Date: Mon Apr 28 02:12:34 2008 -0700
mempolicy: disallow static or relative flags for local preferred mode
MPOL_F_STATIC_NODES and MPOL_F_RELATIVE_NODES don't mean anything for
MPOL_PREFERRED policies that were created with an empty nodemask (for purely
local allocations). They'll never be invalidated because the allowed mems of
a task changes or need to be rebound relative to a cpuset's placement.
Also fixes a bug identified by Lee Schermerhorn that disallowed empty
nodemasks to be passed to MPOL_PREFERRED to specify local allocations. [A
different, somewhat incomplete, patch already existed in 25-rc5-mm1.]
Cc: Paul Jackson <pj at sgi.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Cc: Andi Kleen <ak at suse.de>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Signed-off-by: David Rientjes <rientjes at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3842b46de626d1a3c44ad280d67ab0a4dc047d13
Author: David Rientjes <rientjes at google.com>
Date: Mon Apr 28 02:12:34 2008 -0700
mempolicy: small header file cleanup
Removes forward definition of vm_area_struct in linux/mempolicy.h. We already
get it from the linux/slab.h -> linux/gfp.h include.
Removes the unused mpol_set_vma_default() macro from linux/mempolicy.h.
Removes the extern definition of default_policy since it is only referenced,
as it should be, in mm/mempolicy.c.
Cc: Paul Jackson <pj at sgi.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: David Rientjes <rientjes at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 37012946da940521fb997a758a219d2f1ab56e51
Author: David Rientjes <rientjes at google.com>
Date: Mon Apr 28 02:12:33 2008 -0700
mempolicy: create mempolicy_operations structure
Create a mempolicy_operations structure that currently points to two
functions[*] for the various modes:
int (*create)(struct mempolicy *, const nodemask_t *);
void (*rebind)(struct mempolicy *, const nodemask_t *);
This splits the implementation for the various modes out of two large
functions, mpol_new() and mpol_rebind_policy(). Eventually it may be
beneficial to add additional functions to accomodate the existing switch()
statements in mm/mempolicy.c.
[*] The ->create() function for MPOL_DEFAULT is currently NULL since no
struct mempolicy is dynamically allocated.
[Lee.Schermerhorn at hp.com: fix regression in the package mempolicy regression tests]
Signed-off-by: David Rientjes <rientjes at google.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: Eric Whitney <eric.whitney at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1d0d2680a01c4f9e292ec6d4714884da939053a1
Author: David Rientjes <rientjes at google.com>
Date: Mon Apr 28 02:12:32 2008 -0700
mempolicy: move rebind functions
Move the mpol_rebind_{policy,task,mm}() functions after mpol_new() to avoid
having to declare function prototypes.
Cc: Paul Jackson <pj at sgi.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: David Rientjes <rientjes at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 65d66fc02ed9433b957588071b60425b12628e25
Author: David Rientjes <rientjes at google.com>
Date: Mon Apr 28 02:12:31 2008 -0700
mempolicy: update NUMA memory policy documentation
Updates Documentation/vm/numa_memory_policy.txt and
Documentation/filesystems/tmpfs.txt to describe optional mempolicy mode flags.
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Cc: Andi Kleen <ak at suse.de>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: David Rientjes <rientjes at google.com>
Signed-off-by: Paul Jackson <pj at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4c50bc0116cf3cc35e7152d6a8424b4db65f52d6
Author: David Rientjes <rientjes at google.com>
Date: Mon Apr 28 02:12:30 2008 -0700
mempolicy: add MPOL_F_RELATIVE_NODES flag
Adds another optional mode flag, MPOL_F_RELATIVE_NODES, that specifies
nodemasks passed via set_mempolicy() or mbind() should be considered relative
to the current task's mems_allowed.
When the mempolicy is created, the passed nodemask is folded and mapped onto
the current task's mems_allowed. For example, consider a task using
set_mempolicy() to pass MPOL_INTERLEAVE | MPOL_F_RELATIVE_NODES with a
nodemask of 1-3. If current's mems_allowed is 4-7, the effected nodemask is
5-7 (the second, third, and fourth node of mems_allowed).
If the same task is attached to a cpuset, the mempolicy nodemask is rebound
each time the mems are changed. Some possible rebinds and results are:
mems result
1-3 1-3
1-7 2-4
1,5-6 1,5-6
1,5-7 5-7
Likewise, the zonelist built for MPOL_BIND acts on the set of zones assigned
to the resultant nodemask from the relative remap.
In the MPOL_PREFERRED case, the preferred node is remapped from the currently
effected nodemask to the relative nodemask.
This mempolicy mode flag was conceived of by Paul Jackson <pj at sgi.com>.
Cc: Paul Jackson <pj at sgi.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: David Rientjes <rientjes at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7ea931c9fc80c4d0a4306c30ec92eb0f1d922a0b
Author: Paul Jackson <pj at sgi.com>
Date: Mon Apr 28 02:12:29 2008 -0700
mempolicy: add bitmap_onto() and bitmap_fold() operations
The following adds two more bitmap operators, bitmap_onto() and bitmap_fold(),
with the usual cpumask and nodemask wrappers.
The bitmap_onto() operator computes one bitmap relative to another. If the
n-th bit in the origin mask is set, then the m-th bit of the destination mask
will be set, where m is the position of the n-th set bit in the relative mask.
The bitmap_fold() operator folds a bitmap into a second that has bit m set iff
the input bitmap has some bit n set, where m == n mod sz, for the specified sz
value.
There are two substantive changes between this patch and its
predecessor bitmap_relative:
1) Renamed bitmap_relative() to be bitmap_onto().
2) Added bitmap_fold().
The essential motivation for bitmap_onto() is to provide a mechanism for
converting a cpuset-relative CPU or Node mask to an absolute mask. Cpuset
relative masks are written as if the current task were in a cpuset whose CPUs
or Nodes were just the consecutive ones numbered 0..N-1, for some N. The
bitmap_onto() operator is provided in anticipation of adding support for the
first such cpuset relative mask, by the mbind() and set_mempolicy() system
calls, using a planned flag of MPOL_F_RELATIVE_NODES. These bitmap operators
(and their nodemask wrappers, in particular) will be used in code that
converts the user specified cpuset relative memory policy to a specific system
node numbered policy, given the current mems_allowed of the tasks cpuset.
Such cpuset relative mempolicies will address two deficiencies
of the existing interface between cpusets and mempolicies:
1) A task cannot at present reliably establish a cpuset
relative mempolicy because there is an essential race
condition, in that the tasks cpuset may be changed in
between the time the task can query its cpuset placement,
and the time the task can issue the applicable mbind or
set_memplicy system call.
2) A task cannot at present establish what cpuset relative
mempolicy it would like to have, if it is in a smaller
cpuset than it might have mempolicy preferences for,
because the existing interface only allows specifying
mempolicies for nodes currently allowed by the cpuset.
Cpuset relative mempolicies are useful for tasks that don't distinguish
particularly between one CPU or Node and another, but only between how many of
each are allowed, and the proper placement of threads and memory pages on the
various CPUs and Nodes available.
The motivation for the added bitmap_fold() can be seen in the following
example.
Let's say an application has specified some mempolicies that presume 16 memory
nodes, including say a mempolicy that specified MPOL_F_RELATIVE_NODES (cpuset
relative) nodes 12-15. Then lets say that application is crammed into a
cpuset that only has 8 memory nodes, 0-7. If one just uses bitmap_onto(),
this mempolicy, mapped to that cpuset, would ignore the requested relative
nodes above 7, leaving it empty of nodes. That's not good; better to fold the
higher nodes down, so that some nodes are included in the resulting mapped
mempolicy. In this case, the mempolicy nodes 12-15 are taken modulo 8 (the
weight of the mems_allowed of the confining cpuset), resulting in a mempolicy
specifying nodes 4-7.
Signed-off-by: Paul Jackson <pj at sgi.com>
Signed-off-by: David Rientjes <rientjes at google.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Andi Kleen <ak at suse.de>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: <kosaki.motohiro at jp.fujitsu.com>
Cc: <ray-lk at madrabbit.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f5b087b52f1710eb0bf15a2d2b030c51a6a1ca9e
Author: David Rientjes <rientjes at google.com>
Date: Mon Apr 28 02:12:27 2008 -0700
mempolicy: add MPOL_F_STATIC_NODES flag
Add an optional mempolicy mode flag, MPOL_F_STATIC_NODES, that suppresses the
node remap when the policy is rebound.
Adds another member to struct mempolicy, nodemask_t user_nodemask, as part of
a union with cpuset_mems_allowed:
struct mempolicy {
...
union {
nodemask_t cpuset_mems_allowed;
nodemask_t user_nodemask;
} w;
}
that stores the the nodemask that the user passed when he or she created the
mempolicy via set_mempolicy() or mbind(). When using MPOL_F_STATIC_NODES,
which is passed with any mempolicy mode, the user's passed nodemask
intersected with the VMA or task's allowed nodes is always used when
determining the preferred node, setting the MPOL_BIND zonelist, or creating
the interleave nodemask. This happens whenever the policy is rebound,
including when a task's cpuset assignment changes or the cpuset's mems are
changed.
This creates an interesting side-effect in that it allows the mempolicy
"intent" to lie dormant and uneffected until it has access to the node(s) that
it desires. For example, if you currently ask for an interleaved policy over
a set of nodes that you do not have access to, the mempolicy is not created
and the task continues to use the previous policy. With this change, however,
it is possible to create the same mempolicy; it is only effected when access
to nodes in the nodemask is acquired.
It is also possible to mount tmpfs with the static nodemask behavior when
specifying a node or nodemask. To do this, simply add "=static" immediately
following the mempolicy mode at mount time:
mount -o remount mpol=interleave=static:1-3
Also removes mpol_check_policy() and folds its logic into mpol_new() since it
is now obsoleted. The unused vma_mpol_equal() is also removed.
Cc: Paul Jackson <pj at sgi.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: David Rientjes <rientjes at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 028fec414d803117eb4b2ed12acb4dd5da65b32d
Author: David Rientjes <rientjes at google.com>
Date: Mon Apr 28 02:12:25 2008 -0700
mempolicy: support optional mode flags
With the evolution of mempolicies, it is necessary to support mempolicy mode
flags that specify how the policy shall behave in certain circumstances. The
most immediate need for mode flag support is to suppress remapping the
nodemask of a policy at the time of rebind.
Both the mempolicy mode and flags are passed by the user in the 'int policy'
formal of either the set_mempolicy() or mbind() syscall. A new constant,
MPOL_MODE_FLAGS, represents the union of legal optional flags that may be
passed as part of this int. Mempolicies that include illegal flags as part of
their policy are rejected as invalid.
An additional member to struct mempolicy is added to support the mode flags:
struct mempolicy {
...
unsigned short policy;
unsigned short flags;
}
The splitting of the 'int' actual passed by the user is done in
sys_set_mempolicy() and sys_mbind() for their respective syscalls. This is
done by intersecting the actual with MPOL_MODE_FLAGS, rejecting the syscall of
there are additional flags, and storing it in the new 'flags' member of struct
mempolicy. The intersection of the actual with ~MPOL_MODE_FLAGS is stored in
the 'policy' member of the struct and all current users of pol->policy remain
unchanged.
The union of the policy mode and optional mode flags is passed back to the
user in get_mempolicy().
This combination of mode and flags within the same actual does not break
userspace code that relies on get_mempolicy(&policy, ...) and either
switch (policy) {
case MPOL_BIND:
...
case MPOL_INTERLEAVE:
...
};
statements or
if (policy == MPOL_INTERLEAVE) {
...
}
statements. Such applications would need to use optional mode flags when
calling set_mempolicy() or mbind() for these previously implemented statements
to stop working. If an application does start using optional mode flags, it
will need to mask the optional flags off the policy in switch and conditional
statements that only test mode.
An additional member is also added to struct shmem_sb_info to store the
optional mode flags.
[hugh at veritas.com: shmem mpol: fix build warning]
Cc: Paul Jackson <pj at sgi.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: David Rientjes <rientjes at google.com>
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a3b51e0142d1be156ac697eaadadd6cfbb7ba32b
Author: David Rientjes <rientjes at google.com>
Date: Mon Apr 28 02:12:23 2008 -0700
mempolicy: convert MPOL constants to enum
The mempolicy mode constants, MPOL_DEFAULT, MPOL_PREFERRED, MPOL_BIND, and
MPOL_INTERLEAVE, are better declared as part of an enum since they are
sequentially numbered and cannot be combined.
The policy member of struct mempolicy is also converted from type short to
type unsigned short. A negative policy does not have any legitimate meaning,
so it is possible to change its type in preparation for adding optional mode
flags later.
The equivalent member of struct shmem_sb_info is also changed from int to
unsigned short.
For compatibility, the policy formal to get_mempolicy() remains as a pointer
to an int:
int get_mempolicy(int *policy, unsigned long *nmask,
unsigned long maxnode, unsigned long addr,
unsigned long flags);
although the only possible values is the range of type unsigned short.
Cc: Paul Jackson <pj at sgi.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn at hp.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: David Rientjes <rientjes at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1b27d05b6e21249d2338be26dfcbe8f8d8ff8a5b
Author: Pekka Enberg <penberg at cs.helsinki.fi>
Date: Mon Apr 28 02:12:22 2008 -0700
mm: move cache_line_size() to <linux/cache.h>
Not all architectures define cache_line_size() so as suggested by Andrew move
the private implementations in mm/slab.c and mm/slob.c to <linux/cache.h>.
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Ingo Molnar <mingo at redhat.com>
Cc: H. Peter Anvin <hpa at zytor.com>
Reviewed-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 19fc3f0acde32636529969570055c7e2a744787c
Author: Adam Litke <agl at us.ibm.com>
Date: Mon Apr 28 02:12:20 2008 -0700
hugetlb: decrease hugetlb_lock cycling in gather_surplus_huge_pages
To reduce hugetlb_lock acquisitions and releases when freeing excess surplus
pages, scan the page list in two parts. First, transfer the needed pages to
the hugetlb pool. Then drop the lock and free the remaining pages back to the
buddy allocator.
In the common case there are zero excess pages and no lock operations are
required.
Thanks Mel Gorman for this improvement.
Signed-off-by: Adam Litke <agl at us.ibm.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Dave Hansen <haveblue at us.ibm.com>
Cc: William Lee Irwin III <wli at holomorphy.com>
Cc: Andy Whitcroft <apw at shadowen.org>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: David Gibson <david at gibson.dropbear.id.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 797df5749032c2286bc7ff3a52de41fde0cdf0a5
Author: Chris Dearman <chris at mips.com>
Date: Mon Apr 28 02:12:19 2008 -0700
mm: try both endianess when checking for endianess
When checking for the swap header try byteswapping the endianess dependent
fields to allow the swap partition to be shared between big & little endian
systems.
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
Acked-by: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 19770b32609b6bf97a3dece2529089494cbfc549
Author: Mel Gorman <mel at csn.ul.ie>
Date: Mon Apr 28 02:12:18 2008 -0700
mm: filter based on a nodemask as well as a gfp_mask
The MPOL_BIND policy creates a zonelist that is used for allocations
controlled by that mempolicy. As the per-node zonelist is already being
filtered based on a zone id, this patch adds a version of __alloc_pages() that
takes a nodemask for further filtering. This eliminates the need for
MPOL_BIND to create a custom zonelist.
A positive benefit of this is that allocations using MPOL_BIND now use the
local node's distance-ordered zonelist instead of a custom node-id-ordered
zonelist. I.e., pages will be allocated from the closest allowed node with
available memory.
[Lee.Schermerhorn at hp.com: Mempolicy: update stale documentation and comments]
[Lee.Schermerhorn at hp.com: Mempolicy: make dequeue_huge_page_vma() obey MPOL_BIND nodemask]
[Lee.Schermerhorn at hp.com: Mempolicy: make dequeue_huge_page_vma() obey MPOL_BIND nodemask rework]
Signed-off-by: Mel Gorman <mel at csn.ul.ie>
Acked-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dd1a239f6f2d4d3eedd318583ec319aa145b324c
Author: Mel Gorman <mel at csn.ul.ie>
Date: Mon Apr 28 02:12:17 2008 -0700
mm: have zonelist contains structs with both a zone pointer and zone_idx
Filtering zonelists requires very frequent use of zone_idx(). This is costly
as it involves a lookup of another structure and a substraction operation. As
the zone_idx is often required, it should be quickly accessible. The node idx
could also be stored here if it was found that accessing zone->node is
significant which may be the case on workloads where nodemasks are heavily
used.
This patch introduces a struct zoneref to store a zone pointer and a zone
index. The zonelist then consists of an array of these struct zonerefs which
are looked up as necessary. Helpers are given for accessing the zone index as
well as the node index.
[kamezawa.hiroyu at jp.fujitsu.com: Suggested struct zoneref instead of embedding information in pointers]
[hugh at veritas.com: mm-have-zonelist: fix memcg ooms]
[hugh at veritas.com: just return do_try_to_free_pages]
[hugh at veritas.com: do_try_to_free_pages gfp_mask redundant]
Signed-off-by: Mel Gorman <mel at csn.ul.ie>
Acked-by: Christoph Lameter <clameter at sgi.com>
Acked-by: David Rientjes <rientjes at google.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 54a6eb5c4765aa573a030ceeba2c14e3d2ea5706
Author: Mel Gorman <mel at csn.ul.ie>
Date: Mon Apr 28 02:12:16 2008 -0700
mm: use two zonelist that are filtered by GFP mask
Currently a node has two sets of zonelists, one for each zone type in the
system and a second set for GFP_THISNODE allocations. Based on the zones
allowed by a gfp mask, one of these zonelists is selected. All of these
zonelists consume memory and occupy cache lines.
This patch replaces the multiple zonelists per-node with two zonelists. The
first contains all populated zones in the system, ordered by distance, for
fallback allocations when the target/preferred node has no free pages. The
second contains all populated zones in the node suitable for GFP_THISNODE
allocations.
An iterator macro is introduced called for_each_zone_zonelist() that interates
through each zone allowed by the GFP flags in the selected zonelist.
Signed-off-by: Mel Gorman <mel at csn.ul.ie>
Acked-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 18ea7e710d2452fa726814a406779188028cf1bf
Author: Mel Gorman <mel at csn.ul.ie>
Date: Mon Apr 28 02:12:14 2008 -0700
mm: remember what the preferred zone is for zone_statistics
On NUMA, zone_statistics() is used to record events like numa hit, miss and
foreign. It assumes that the first zone in a zonelist is the preferred zone.
When multiple zonelists are replaced by one that is filtered, this is no
longer the case.
This patch records what the preferred zone is rather than assuming the first
zone in the zonelist is it. This simplifies the reading of later patches in
this set.
Signed-off-by: Mel Gorman <mel at csn.ul.ie>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Reviewed-by: Christoph Lameter <clameter at sgi.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0e88460da6ab7bb6a7ef83675412ed5b6315d741
Author: Mel Gorman <mel at csn.ul.ie>
Date: Mon Apr 28 02:12:14 2008 -0700
mm: introduce node_zonelist() for accessing the zonelist for a GFP mask
Introduce a node_zonelist() helper function. It is used to lookup the
appropriate zonelist given a node and a GFP mask. The patch on its own is a
cleanup but it helps clarify parts of the two-zonelist-per-node patchset. If
necessary, it can be merged with the next patch in this set without problems.
Reviewed-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Mel Gorman <mel at csn.ul.ie>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dac1d27bc8d5ca636d3014ecfdf94407031d1970
Author: Mel Gorman <mel at csn.ul.ie>
Date: Mon Apr 28 02:12:12 2008 -0700
mm: use zonelists instead of zones when direct reclaiming pages
The following patches replace multiple zonelists per node with two zonelists
that are filtered based on the GFP flags. The patches as a set fix a bug with
regard to the use of MPOL_BIND and ZONE_MOVABLE. With this patchset, the
MPOL_BIND will apply to the two highest zones when the highest zone is
ZONE_MOVABLE. This should be considered as an alternative fix for the
MPOL_BIND+ZONE_MOVABLE in 2.6.23 to the previously discussed hack that filters
only custom zonelists.
The first patch cleans up an inconsistency where direct reclaim uses
zonelist->zones where other places use zonelist.
The second patch introduces a helper function node_zonelist() for looking up
the appropriate zonelist for a GFP mask which simplifies patches later in the
set.
The third patch defines/remembers the "preferred zone" for numa statistics, as
it is no longer always the first zone in a zonelist.
The forth patch replaces multiple zonelists with two zonelists that are
filtered. The two zonelists are due to the fact that the memoryless patchset
introduces a second set of zonelists for __GFP_THISNODE.
The fifth patch introduces helper macros for retrieving the zone and node
indices of entries in a zonelist.
The final patch introduces filtering of the zonelists based on a nodemask.
Two zonelists exist per node, one for normal allocations and one for
__GFP_THISNODE.
Performance results varied depending on the machine configuration. In real
workloads the gain/loss will depend on how much the userspace portion of the
benchmark benefits from having more cache available due to reduced referencing
of zonelists.
These are the range of performance losses/gains when running against
2.6.24-rc4-mm1. The set and these machines are a mix of i386, x86_64 and
ppc64 both NUMA and non-NUMA.
loss to gain
Total CPU time on Kernbench: -0.86% to 1.13%
Elapsed time on Kernbench: -0.79% to 0.76%
page_test from aim9: -4.37% to 0.79%
brk_test from aim9: -0.71% to 4.07%
fork_test from aim9: -1.84% to 4.60%
exec_test from aim9: -0.71% to 1.08%
This patch:
The allocator deals with zonelists which indicate the order in which zones
should be targeted for an allocation. Similarly, direct reclaim of pages
iterates over an array of zones. For consistency, this patch converts direct
reclaim to use a zonelist. No functionality is changed by this patch. This
simplifies zonelist iterators in the next patch.
Signed-off-by: Mel Gorman <mel at csn.ul.ie>
Acked-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9d02dbc8137759e4c2f91db0b7f9c8a1ec2a9276
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 28 02:12:11 2008 -0700
make swap_pte_to_pagemap_entry() static
Make the needlessly global swap_pte_to_pagemap_entry() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Matt Mackall <mpm at selenic.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3c18ddd160d1fcd46d1131d9ad6c594dd8e9af99
Author: Nick Piggin <npiggin at suse.de>
Date: Mon Apr 28 02:12:10 2008 -0700
mm: remove nopage
Nothing in the tree uses nopage any more. Remove support for it in the
core mm code and documentation (and a few stray references to it in
comments).
Signed-off-by: Nick Piggin <npiggin at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4d3d5b41a72b52555d43efbfc4ccde6ba6e5444f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Mon Apr 28 02:12:10 2008 -0700
mmap_region: cleanup the final vma_merge() related code
It is not easy to actually understand the "if (!file || !vma_merge())"
code, turn it into "if (file && vma_merge())". This makes immediately
obvious that the subsequent "if (file)" is superfluous.
As Hugh Dickins pointed out, we can also factor out the ->i_writecount
corrections, and add a small comment about that.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Miklos Szeredi <miklos at szeredi.hu>
Cc: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0dd1334faf7e075bfdb6f5284eed65210b296fc1
Author: Hisashi Hifumi <hifumi.hisashi at oss.ntt.co.jp>
Date: Mon Apr 28 02:12:08 2008 -0700
fix invalidate_inode_pages2_range() to not clear ret
DIO invalidates page cache through invalidate_inode_pages2_range().
invalidate_inode_pages2_range() sets ret=-EIO when
invalidate_complete_page2() fails, but this ret is cleared if
do_launder_page() succeed on a page of next index.
In this case, dio is carried out even if invalidate_complete_page2() fails
on some pages.
This can cause inconsistency between memory and blocks on HDD because the
page cache still exists.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Hisashi Hifumi <hifumi.hisashi at oss.ntt.co.jp>
Cc: Badari Pulavarty <pbadari at us.ibm.com>
Cc: Ken Chen <kenchen at google.com>
Cc: Zach Brown <zach.brown at oracle.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Trond Myklebust <trond.myklebust at fys.uio.no>
Cc: "J. Bruce Fields" <bfields at fieldses.org>
Cc: Chuck Lever <cel at citi.umich.edu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ddc81ed2c5d47a078a3b02c5c3a4345bc2bc3c9b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:12:07 2008 -0700
remove sparse warning for mmzone.h
include/linux/mmzone.h:640:22: warning: potentially expensive pointer subtraction
Calculate the offset into the node_zones array rather than the index
using casts to (char *) and comparing against the index * sizeof(struct zone).
On X86_32 this saves a sar, but code size increases by one byte per
is_highmem() use due to 32-bit cmps rather than 16 bit cmps.
Before:
207: 2b 80 8c 07 00 00 sub 0x78c(%eax),%eax
20d: c1 f8 0b sar $0xb,%eax
210: 83 f8 02 cmp $0x2,%eax
213: 74 16 je 22b <kmap_atomic_prot+0x144>
215: 83 f8 03 cmp $0x3,%eax
218: 0f 85 8f 00 00 00 jne 2ad <kmap_atomic_prot+0x1c6>
21e: 83 3d 00 00 00 00 02 cmpl $0x2,0x0
225: 0f 85 82 00 00 00 jne 2ad <kmap_atomic_prot+0x1c6>
22b: 64 a1 00 00 00 00 mov %fs:0x0,%eax
After:
207: 2b 80 8c 07 00 00 sub 0x78c(%eax),%eax
20d: 3d 00 10 00 00 cmp $0x1000,%eax
212: 74 18 je 22c <kmap_atomic_prot+0x145>
214: 3d 00 18 00 00 cmp $0x1800,%eax
219: 0f 85 8f 00 00 00 jne 2ae <kmap_atomic_prot+0x1c7>
21f: 83 3d 00 00 00 00 02 cmpl $0x2,0x0
226: 0f 85 82 00 00 00 jne 2ae <kmap_atomic_prot+0x1c7>
22c: 64 a1 00 00 00 00 mov %fs:0x0,%eax
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 488514d1798289f56f80ed018e246179fe500383
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 28 02:12:05 2008 -0700
Remove set_migrateflags()
Migrate flags must be set on slab creation as agreed upon when the antifrag
logic was reviewed. Otherwise some slabs of a slabcache will end up in the
unmovable and others in the reclaimable section depending on which flag was
active when a new slab page was allocated.
This likely slid in somehow when antifrag was merged. Remove it.
The buffer_heads are always allocated with __GFP_RECLAIMABLE because the
SLAB_RECLAIM_ACCOUNT option is set. The set_migrateflags() never had any
effect there.
Radix tree allocations are not directly reclaimable but they are allocated
with __GFP_RECLAIMABLE set on each allocation. We now set
SLAB_RECLAIM_ACCOUNT on radix tree slab creation making sure that radix
tree slabs are consistently placed in the reclaimable section. Radix tree
slabs will also be accounted as such.
There is then no user left of set_migratepages. So remove it.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e92adcba261fd391591bb63c1703185a04a41554
Author: Jeff Moyer <jmoyer at redhat.com>
Date: Mon Apr 28 02:12:04 2008 -0700
aio: io_getevents() should return if io_destroy() is invoked
This patch wakes up a thread waiting in io_getevents if another thread
destroys the context. This was tested using a small program that spawns a
thread to wait in io_getevents while the parent thread destroys the io context
and then waits for the getevents thread to exit. Without this patch, the
program hangs indefinitely. With the patch, the program exits as expected.
Signed-off-by: Jeff Moyer <jmoyer at redhat.com>
Cc: Zach Brown <zach.brown at oracle.com>
Cc: Christopher Smith <x at xman.org>
Cc: Benjamin LaHaise <bcrl at kvack.org>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 180c06efce691f2b721dd0d965079827bdd7ee03
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Apr 28 02:12:03 2008 -0700
hotplug-memory: make online_page() common
All architectures use an effectively identical definition of online_page(), so
just make it common code. x86-64, ia64, powerpc and sh are actually
identical; x86-32 is slightly different.
x86-32's differences arise because it puts its hotplug pages in the highmem
zone. We can handle this in the generic code by inspecting the page to see if
its in highmem, and update the totalhigh_pages count appropriately. This
leaves init_32.c:free_new_highpage with a single caller, so I folded it into
add_one_highpage_init.
I also removed an incorrect comment referring to the NUMA case; any NUMA
details have already been dealt with by the time online_page() is called.
[akpm at linux-foundation.org: fix indenting]
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Acked-by: Dave Hansen <dave at linux.vnet.ibm.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamez.hiroyu at jp.fujitsu.com>
Tested-by: KAMEZAWA Hiroyuki <kamez.hiroyu at jp.fujitsu.com>
Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Christoph Lameter <clameter at sgi.com>
Acked-by: Ingo Molnar <mingo at elte.hu>
Acked-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ea01ea937dcae2caa146dea1918cccf2f16ed3c4
Author: Badari Pulavarty <pbadari at us.ibm.com>
Date: Mon Apr 28 02:12:01 2008 -0700
hotplug memory remove: generic __remove_pages() support
Generic helper function to remove section mappings and sysfs entries for the
section of the memory we are removing. offline_pages() correctly adjusted
zone and marked the pages reserved.
TODO: Yasunori Goto is working on patches to free up allocations from bootmem.
Signed-off-by: Badari Pulavarty <pbadari at us.ibm.com>
Acked-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Paul Mackerras <paulus at samba.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2a4e2b8780c6df42b19c053243dada7fa4d311ee
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 28 02:12:00 2008 -0700
rtc: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dca03a51549bc645685fb8a77efa64df531666c3
Author: Julia Lawall <julia at diku.dk>
Date: Mon Apr 28 02:11:59 2008 -0700
drivers/char/rtc.c: use time_before, time_before_eq, etc
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ change_compare_np @
expression E;
@@
(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)
@ include depends on change_compare_np @
@@
#include <linux/jiffies.h>
@ no_include depends on !include && change_compare_np @
@@
#include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c116bc2ae516e9949d645bc75b1ee294ff15db23
Author: Zhao Yakui <yakui.zhao at intel.com>
Date: Mon Apr 28 02:11:58 2008 -0700
rtc: add the support for alarm time relative to current time in sysfs
In current kernel if we want to set the alarm time, the absolute time the
seconds relative to 1970-01-01 00:00:00) should be written into
/sys/class/rtc/rtc0/wakealarm. It is not convenient.
It is more reasonable to add the support for the alarm time relative to
current RTC time.(the unit is second)
For example:
If the RTC is required to generate alarm after 2 minutes, the following
will be OK.
echo +120 > /sys/class/rtc/rtc0/wakealarm
or echo +0x78 > /sys/class/rtc/rtc0/wakealarm
Signed-off-by: Zhao Yakui <yakui.zhao at intel.com>
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e2bfe3424b368e977002fc58f81536d5d8ea9449
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Apr 28 02:11:57 2008 -0700
rtc: rtc-rs5c372: fix up NULL name in transfer error path
rs5c_get_regs() currently uses rs5c->rtc->name for its debug printk when
i2c_transfer() fails, though it is used several times before the rtc dev
has been registered. The earliest we can get at the symbolic name is via
the i2c client's struct device, which can be handled by moving the first
rs5c_get_regs() until after the client pointer is assigned.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e275ac477161a3df5c27e40c55f7af94cfb396cf
Author: David Brownell <david-b at pacbell.net>
Date: Mon Apr 28 02:11:56 2008 -0700
kerneldoc for <linux/clk.h>
Add <linux/clk.h> to the generated kerneldoc, with some overview
to go along with those per-function descriptions.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Cc: "Randy.Dunlap" <rdunlap at xenotime.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a3ed107e63b7cd4d1ba1567a69a1feec5f0eabc1
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 28 02:11:55 2008 -0700
make ds1511_rtc_{read,set}_time() static
Make the needlessly global ds1511_rtc_{read,set}_time() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c464652813fe128c346ce6e7ec8fb0d2b67de6fb
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Mon Apr 28 02:11:55 2008 -0700
rtc: silence section mismatch warning in rtc-test
Fix following warning:
WARNING: vmlinux.o(.data+0x253e28): Section mismatch in reference from the variable test_drv to the function .devexit.text:test_remove()
Fix by renaming the platfrom_driver variable from *_drv to *_driver
so modpost ignore the reference to an __devexit section.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4edac2b442d6176afb0ae431123993dc00882987
Author: Alessandro Zummo <a.zummo at towertech.it>
Date: Mon Apr 28 02:11:54 2008 -0700
rtc-x1205: new style conversion
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Alessandro Zummo <a.zummo at towertech.it>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e5fc9cc0266e5babcf84c81908ec8843b7e3349f
Author: Alessandro Zummo <a.zummo at towertech.it>
Date: Mon Apr 28 02:11:54 2008 -0700
rtc-pcf8563: new style conversion
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Alessandro Zummo <a.zummo at towertech.it>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9edae7bcdcbac2dbf037b751ce1809eb2758cd8e
Author: Alessandro Zummo <a.zummo at towertech.it>
Date: Mon Apr 28 02:11:53 2008 -0700
rtc-isl1208: new style conversion and minor bug fixes
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Alessandro Zummo <a.zummo at towertech.it>
Cc: Herbert Valerio Riedel <hvr at gnu.org>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c750090085f260503d8beec1c73c4d2e4fe93628
Author: David Brownell <david-b at pacbell.net>
Date: Mon Apr 28 02:11:52 2008 -0700
rtc: avoid legacy drivers with generic framework
Kconfig tweaks to help reduce RTC configuration bugs, by avoiding
legacy RTC drivers when the generic RTC framework is enabled:
- If rtc-cmos is selected, disable the legacy rtc driver;
- When using generic RTC on x86, enable rtc-cmos by default;
- In the old "chardev RTC" section of Kconfig, add a comment
warning people off these (seven) legacy RTC drivers when
the generic framework is in use.
People can still use the legacy drivers if they want (or need) to.
This doesn't fix the broken dependencies for the legacy "CMOS" RTC driver.
Ideally it would be a full list of platforms where it works, not a partial
list of ones where it won't. Or better yet, it would depend on a
"HAVE_CMOS_RTC" flag defined by various platforms ... surely there's a
Kconfig style guideline lurking there.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 77459b059b02c16b2c8cbc39b524941a576ad36e
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Mon Apr 28 02:11:51 2008 -0700
rtc-pcf8583 build fix
Fix bogus #include in rtc-pcf8583, so it compiles on platforms that
don't support PC clone RTCs. (Original issue noted by Adrian Bunk.)
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Adrian Bunk <bunk at kernel.org>
Acked-by: Alessandro Zummo <a.zummo at towertech.it>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1ecf0d0cd28a4bfed3009f752061998e52d14db2
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Mon Apr 28 02:11:50 2008 -0700
dz: test after postfix decrement fails in dz_console_putchar()
When loops reaches 0 the postfix decrement still subtracts, so the subsequent
test fails.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Acked-by: Maciej W. Rozycki <macro at linux-mips.org>
Cc: Johannes Weiner <hannes at saeurebad.de>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 556637cdabcd5918c7d4a1a2679b8f86fc81e891
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Mon Apr 28 02:11:47 2008 -0700
mm: fix possible off-by-one in walk_pte_range()
After the loop in walk_pte_range() pte might point to the first address after
the pmd it walks. The pte_unmap() is then applied to something bad.
Spotted by Roel Kluin and Andreas Schwab.
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Cc: Roel Kluin <12o3l at tiscali.nl>
Cc: Andreas Schwab <schwab at suse.de>
Acked-by: Matt Mackall <mpm at selenic.com>
Acked-by: Mikael Pettersson <mikpe at it.uu.se>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f022bfd58253099102218db5249220a7f4787114
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Mar 21 15:42:28 2008 +0100
x86: PAT fix
Adrian Bunk noticed the following Coverity report:
> Commit e7f260a276f2c9184fe753732d834b1f6fbe9f17
> (x86: PAT use reserve free memtype in mmap of /dev/mem)
> added the following gem to arch/x86/mm/pat.c:
>
> <-- snip -->
>
> ...
> int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
> unsigned long size, pgprot_t *vma_prot)
> {
> u64 offset = ((u64) pfn) << PAGE_SHIFT;
> unsigned long flags = _PAGE_CACHE_UC_MINUS;
> unsigned long ret_flags;
> ...
> ... (nothing that touches ret_flags)
> ...
> if (flags != _PAGE_CACHE_UC_MINUS) {
> retval = reserve_memtype(offset, offset + size, flags, NULL);
> } else {
> retval = reserve_memtype(offset, offset + size, -1, &ret_flags);
> }
>
> if (retval < 0)
> return 0;
>
> flags = ret_flags;
>
> if (pfn <= max_pfn_mapped &&
> ioremap_change_attr((unsigned long)__va(offset), size, flags) < 0) {
> free_memtype(offset, offset + size);
> printk(KERN_INFO
> "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n",
> current->comm, current->pid,
> cattr_name(flags),
> offset, offset + size);
> return 0;
> }
>
> *vma_prot = __pgprot((pgprot_val(*vma_prot) & ~_PAGE_CACHE_MASK) |
> flags);
> return 1;
> }
>
> <-- snip -->
>
> If (flags != _PAGE_CACHE_UC_MINUS) we pass garbage from the stack to
> ioremap_change_attr() and/or __pgprot().
>
> Spotted by the Coverity checker.
the fix simplifies the code as we get rid of the 'ret_flags'
complication.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ceb4e8e44be90d507eadfc023272269b6ca494cf
Author: David S. Miller <davem at davemloft.net>
Date: Mon Apr 28 04:03:06 2008 -0700
sparc64: Kill PIL_RESERVED, unused.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8b67dca9420474623709e00d72a066068a502b20
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Mon Apr 28 04:15:49 2008 -0400
[PATCH] new predicate - AUDIT_FILETYPE
Argument is S_IF... | <index>, where index is normally 0 or 1.
Triggers if chosen element of ctx->names[] is present and the
mode of object in question matches the upper bits of argument.
I.e. for things like "is the argument of that chmod a directory",
etc.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 4a761b8c1d7a3a4ee7ccf92ce255d986f601e067
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Fri Apr 18 13:30:15 2008 -0700
[patch 2/2] Use find_task_by_vpid in audit code
The pid to lookup a task by is passed inside audit code via netlink message.
Thanks to Denis Lunev, netlink packets are now (since 2.6.24) _always_
processed in the context of the sending task. So this is correct to lookup
the task with find_task_by_vpid() here.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Cc: "Eric W. Biederman" <ebiederm at xmission.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 41126226e186d92a45ed664e546abb5204588359
Author: Miloslav Trmac <mitr at redhat.com>
Date: Fri Apr 18 13:30:14 2008 -0700
[patch 1/2] audit: let userspace fully control TTY input auditing
Remove the code that automatically disables TTY input auditing in processes
that open TTYs when they have no other TTY open; this heuristic was
intended to automatically handle daemons, but it has false positives (e.g.
with sshd) that make it impossible to control TTY input auditing from a PAM
module. With this patch, TTY input auditing is controlled from user-space
only.
On the other hand, not even for daemons does it make sense to audit "input"
from PTY masters; this data was produced by a program writing to the PTY
slave, and does not represent data entered by the user.
Signed-off-by: Miloslav Trmac <mitr at redhat.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Cc: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 7719e437fac119e57b17588bab3a8e39ff9d22eb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Sun Apr 27 02:39:56 2008 -0700
[PATCH 2/2] audit: fix sparse shadowed variable warnings
Use msglen as the identifier.
kernel/audit.c:724:10: warning: symbol 'len' shadows an earlier one
kernel/audit.c:575:8: originally declared here
Don't use ino_f to check the inode field at the end of the functions.
kernel/auditfilter.c:429:22: warning: symbol 'f' shadows an earlier one
kernel/auditfilter.c:420:21: originally declared here
kernel/auditfilter.c:542:22: warning: symbol 'f' shadows an earlier one
kernel/auditfilter.c:529:21: originally declared here
i always used as a counter for a for loop and initialized to zero before
use. Eliminate the inner i variables.
kernel/auditsc.c:1295:8: warning: symbol 'i' shadows an earlier one
kernel/auditsc.c:1152:6: originally declared here
kernel/auditsc.c:1320:7: warning: symbol 'i' shadows an earlier one
kernel/auditsc.c:1152:6: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit c782f242f0602edf848355d41e3676753c2280c8
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Sun Apr 27 02:39:17 2008 -0700
[PATCH 1/2] audit: move extern declarations to audit.h
Leave audit_sig_{uid|pid|sid} protected by #ifdef CONFIG_AUDITSYSCALL.
Noticed by sparse:
kernel/audit.c:73:6: warning: symbol 'audit_ever_enabled' was not declared. Should it be static?
kernel/audit.c:100:8: warning: symbol 'audit_sig_uid' was not declared. Should it be static?
kernel/audit.c:101:8: warning: symbol 'audit_sig_pid' was not declared. Should it be static?
kernel/audit.c:102:6: warning: symbol 'audit_sig_sid' was not declared. Should it be static?
kernel/audit.c:117:23: warning: symbol 'audit_ih' was not declared. Should it be static?
kernel/auditfilter.c:78:18: warning: symbol 'audit_filter_list' was not declared. Should it be static?
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 0ef1970d7fcee1b4cb33c5017803e9039bf42db2
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 10:47:32 2008 -0400
Audit: MAINTAINERS update
Change maintainers to include me and al viro
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit a42da93c8641a0b49405ceb2a2063975c823aa49
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 10:36:22 2008 -0400
Audit: increase the maximum length of the key field
Key lengths were arbitrarily limited to 32 characters. If userspace is going
to start using the single kernel key field as multiple virtual key fields
(example key=key1,key2,key3,key4) we should give them enough room to work.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit b556f8ad58c6e9f8f485c8cef7546e3fc82c382a
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 10:12:59 2008 -0400
Audit: standardize string audit interfaces
This patch standardized the string auditing interfaces. No userspace
changes will be visible and this is all just cleanup and consistancy
work. We have the following string audit interfaces to use:
void audit_log_n_hex(struct audit_buffer *ab, const unsigned char *buf, size_t len);
void audit_log_n_string(struct audit_buffer *ab, const char *buf, size_t n);
void audit_log_string(struct audit_buffer *ab, const char *buf);
void audit_log_n_untrustedstring(struct audit_buffer *ab, const char *string, size_t n);
void audit_log_untrustedstring(struct audit_buffer *ab, const char *string);
This may be the first step to possibly fixing some of the issues that
people have with the string output from the kernel audit system. But we
still don't have an agreed upon solution to that problem.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit f09ac9db2aafe36fde9ebd63c8c5d776f6e7bd41
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 10:11:04 2008 -0400
Audit: stop deadlock from signals under load
A deadlock is possible between kauditd and auditd under load if auditd
receives a signal. When auditd receives a signal it sends a netlink
message to the kernel asking for information about the sender of the
signal. In that same context the audit system will attempt to send a
netlink message back to the userspace auditd. If kauditd has already
filled the socket buffer (see netlink_attachskb()) auditd will now put
itself to sleep waiting for room to send the message. Since auditd is
responsible for draining that socket we have a deadlock. The fix, since
the response from the kernel does not need to be synchronous is to send
the signal information back to auditd in a separate thread. And thus
auditd can continue to drain the audit queue normally.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit f3d357b092956959563398b59ef2fdd10aea387d
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 10:02:28 2008 -0400
Audit: save audit_backlog_limit audit messages in case auditd comes back
This patch causes the kernel audit subsystem to store up to
audit_backlog_limit messages for use by auditd if it ever appears
sometime in the future in userspace. This is useful to collect audit
messages during bootup and even when auditd is stopped. This is NOT a
reliable mechanism, it does not ever call audit_panic, nor should it.
audit_log_lost()/audit_panic() are called during the normal delivery
mechanism. The messages are still sent to printk/syslog as usual and if
too many messages appear to be queued they will be silently discarded.
I liked doing it by default, but this patch only uses the queue in
question if it was booted with audit=1 or if the kernel was built
enabling audit by default.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 2532386f480eefbdd67b48be55fb4fb3e5a6081c
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 10:09:25 2008 -0400
Audit: collect sessionid in netlink messages
Previously I added sessionid output to all audit messages where it was
available but we still didn't know the sessionid of the sender of
netlink messages. This patch adds that information to netlink messages
so we can audit who sent netlink messages.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 436c405c7d19455a71f42c9bec5fd5e028f1eb4e
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 10:01:04 2008 -0400
Audit: end printk with newline
A couple of audit printk statements did not have a newline.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 6eda3a75928a3dc1072dfffd228ab818869d83ad
Author: David S. Miller <davem at davemloft.net>
Date: Mon Apr 28 00:47:20 2008 -0700
sparc64: Split entry.S up into seperate files.
entry.S was a hodge-podge of several totally unrelated
sets of assembler routines, ranging from FPU trap handlers
to hypervisor call functions.
Split it up into topic-sized pieces.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c9b7b9793764b171a118d049d4b721a7f5d8ac82
Author: Paul Moore <paul.moore at hp.com>
Date: Fri Apr 25 15:03:39 2008 -0400
SELinux: Fix a RCU free problem with the netport cache
The netport cache doesn't free resources in a manner which is safe or orderly.
This patch fixes this by adding in a missing call to rcu_dereference() in
sel_netport_insert() as well as some general cleanup throughout the file.
Signed-off-by: Paul Moore <paul.moore at hp.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit a639e7ca8e8282b75be2724a28bfc788aa3bb156
Author: Paul Moore <paul.moore at hp.com>
Date: Fri Apr 25 15:03:34 2008 -0400
SELinux: Made netnode cache adds faster
When adding new entries to the network node cache we would walk the entire
hash bucket to make sure we didn't cross a threshold (done to bound the
cache size). This isn't a very quick or elegant solution for something
which is supposed to be quick-ish so add a counter to each hash bucket to
track the size of the bucket and eliminate the need to walk the entire
bucket list on each add.
Signed-off-by: Paul Moore <paul.moore at hp.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 7b41b1733ca1d3278c8eb891e17905d7d54f5bfa
Author: Eric Paris <eparis at redhat.com>
Date: Wed Apr 23 14:10:25 2008 -0400
SELinux: include/security.h whitespace, syntax, and other cleanups
This patch changes include/security.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
location of { around structs and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
no assignments in if statements
include spaces around , in function calls
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 489a5fd7198d2d2368dd5cf697c841ea4d61ddd1
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:17 2008 -0400
SELinux: policydb.h whitespace, syntax, and other cleanups
This patch changes policydb.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
spaces followed by tabs
spaces used instead of tabs
location of * in pointer declarations
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 8bf1f3a6c0f7e4092c0c041175a52734600490ba
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:16 2008 -0400
SELinux: mls_types.h whitespace, syntax, and other cleanups
This patch changes mls_types.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
spaces used instead of tabs
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit d497fc87c0e201194c3af75b787178cf4559f84b
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:15 2008 -0400
SELinux: mls.h whitespace, syntax, and other cleanups
This patch changes mls.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
spaces used instead of tabs
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit faff786ce2f7c14f25d29cf61b0634c8f6c4827f
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:14 2008 -0400
SELinux: hashtab.h whitespace, syntax, and other cleanups
This patch changes hashtab.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
spaces used instead of tabs
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 81fa42df78511e3bdbc0ea545990bda6a5b3e7de
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:13 2008 -0400
SELinux: context.h whitespace, syntax, and other cleanups
This patch changes context.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
include spaces around , in function calls
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit ccb3cbeb4f285a02103ded5298850a21e7028ba4
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:12 2008 -0400
SELinux: ss/conditional.h whitespace, syntax, and other cleanups
This patch changes ss/conditional.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
location of * in pointer declarations
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit b19d8eae99dae42bb747954fdbb2cd456922eb5f
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:11 2008 -0400
SELinux: selinux/include/security.h whitespace, syntax, and other cleanups
This patch changes selinux/include/security.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
location of { around structs and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
no assignments in if statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit a936b79bdf97285e0274eca7b656fc6350ca57ea
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:10 2008 -0400
SELinux: objsec.h whitespace, syntax, and other cleanups
This patch changes objsec.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
location of { around structs and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
no assignments in if statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit cc03766aaf0b670581ec2bd5cba2b9051d14df8d
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:09 2008 -0400
SELinux: netlabel.h whitespace, syntax, and other cleanups
This patch changes netlabel.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
spaces used instead of tabs
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit e392febedb6e1050a1a81a7bd72456a32c88e710
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 22 17:46:08 2008 -0400
SELinux: avc_ss.h whitespace, syntax, and other cleanups
This patch changes avc_ss.h to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
location of { around structs and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
no assignments in if statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 358c12953b88c5a06a57c33eb27c753b2e7934d1
Author: Jason Riedy <jason at acm.org>
Date: Sun Apr 27 15:38:30 2008 -0700
iwlwifi: Allow building iwl3945 without iwl4965.
If IWL3945 ever depends on IWLCORE, the silent, user-invisible
IWLWIFI option can go away.
Signed-off-by: Jason Riedy <jason at acm.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit bd8fd21dfddf51299d782f598cb776b15b7d64cc
Author: Luca Tettamanti <kronos.it at gmail.com>
Date: Sun Apr 27 15:34:55 2008 -0700
wireless: Fix compile error with wifi & leds
Fix build error caused by commit
e82404ad612ebabc65d15c3d59b971cb35c3ff36 ("iwlwifi: Select
LEDS_CLASS.") from David Miller:
Since MAC80211_LEDS is selected by wireless drivers it must select its
own dependencies otherwise a build error may occur (kbuild will select
the symbol regardless of "depends" constraints).
Signed-off-By: Luca Tettamanti <kronos.it at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9ae27e0adbf471c7a6b80102e38e1d5a346b3b38
Author: Evgeniy Polyakov <johnpol at 2ka.mipt.ru>
Date: Sun Apr 27 15:27:30 2008 -0700
tcp: Fix slab corruption with ipv6 and tcp6fuzz
From: Evgeniy Polyakov <johnpol at 2ka.mipt.ru>
This fixes a regression added by ec3c0982a2dd1e671bad8e9d26c28dcba0039d87
("[TCP]: TCP_DEFER_ACCEPT updates - process as established")
tcp_v6_do_rcv()->tcp_rcv_established(), the latter goes to step5, where
eventually skb can be freed via tcp_data_queue() (drop: label), then if
check for tcp_defer_accept_check() returns true and thus
tcp_rcv_established() returns -1, which forces tcp_v6_do_rcv() to jump
to reset: label, which in turn will pass through discard: label and free
the same skb again.
Tested by Eric Sesterhenn.
Signed-off-by: David S. Miller <davem at davemloft.net>
Acked-By: Patrick McManus <mcmanus at ducksong.com>
commit 194f1a68b93e959ede6ec363db4714e630bdbb6a
Author: Robert Reif <reif at earthlink.net>
Date: Sun Apr 27 15:18:57 2008 -0700
sparc: video drivers: add facility level
Add KERN_ facility level to sparc video drivers.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f36861d550e6f1a1a7a851b88938f52bdaed7682
Author: Robert Reif <reif at earthlink.net>
Date: Sun Apr 27 15:18:12 2008 -0700
sparc: tcx.c make tcx_init and tcx_exit static
Make tcx_init and tcx_exit static.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a2fb0ce7aeae9c38146df9c2d9b763e5981a0683
Author: Robert Reif <reif at earthlink.net>
Date: Sun Apr 27 15:17:49 2008 -0700
sparc: ffb.c make ffb_init and ffb_exit static
Make ffb_init and ffb_exit static.
Remove unnecessary function prototype.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 544330009bc5b879129593236aab29e458ec9fe4
Author: Robert Reif <reif at earthlink.net>
Date: Sun Apr 27 15:17:23 2008 -0700
sparc: cg14.c make cg14_init and cg15_exit static
Make cg14_init and cg14_exit static.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 2556bf1212c768f567401257582681aa117af4a9
Author: Robert Reif <reif at earthlink.net>
Date: Sun Apr 27 15:16:59 2008 -0700
sparc: bw2.c fix bw2_exit
Fix void function bw2_exit returning value.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit fd7354108aa5497d7177b95a6b157eaf8597d621
Author: David S. Miller <davem at davemloft.net>
Date: Sun Apr 27 14:54:02 2008 -0700
sparc64: Fix accidental syscall restart on child return from clone/fork/vfork.
This fixes a regression added by
238468b2ac76020c192a7402c92df5097916bf4a ("[SPARC64]: Use trap type
stored in pt_regs to handle syscall restart.")
Because we now encode the "returning from syscall" status in the
pt_regs area, we have to be mindful to zap it out in the child
of a fork.
During a parallel kernel build I saw an accidental -EINTR return
from vfork() in 'make' because of this bug.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 90888816ba1bf1c4eff1e7e4220c1afc802f0fd3
Author: David S. Miller <davem at davemloft.net>
Date: Sun Apr 27 14:52:51 2008 -0700
sparc64: Clean up handling of pt_regs trap type encoding.
If we use this from more than one place, it's better to
have helpers instead of twiddling magic constants all
over.
Add pt_regs_trap_type(), pt_regs_clear_trap_type(), and
pt_regs_is_syscall().
Use them in do_signal().
Signed-off-by: David S. Miller <davem at davemloft.net>
commit dae50295488f35d2d617b08a5fae43154c947eec
Author: David L Stevens <dlstevens at us.ibm.com>
Date: Sun Apr 27 01:06:07 2008 -0700
ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
Add support on 64-bit kernels for seting 32-bit compatible MCAST*
socket options.
Signed-off-by: David L Stevens <dlstevens at us.ibm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 01a2202c95989a4df48e9a5b5e013cb80c6b2d66
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date: Sun Apr 27 00:59:59 2008 -0700
[IPSEC]: Use digest_null directly for auth
Previously digest_null had no setkey function which meant that
we used hmac(digest_null) for IPsec since IPsec always calls
setkey. Now that digest_null has a setkey we no longer need to
do that.
In fact when only confidentiality is specified for ESP we already
use digest_null directly. However, when the null algorithm is
explicitly specified by the user we still opt for hmac(digest_null).
This patch removes this discrepancy. I have not added a new compat
name for it because by chance it wasn't actualy possible for the user
to specify the name hmac(digest_null) due to a key length check in
xfrm_user (which I found out when testing that compat name :)
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0b80ae4201e5128e16e5161825f5cd377a5d1fee
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Sat Apr 26 22:59:02 2008 -0700
sunrpc: fix missing kernel-doc
Fix missing sunrpc kernel-doc:
Warning(linux-2.6.25-git7//net/sunrpc/xprt.c:451): No description found for parameter 'action'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3f91bd420a955803421f2db17b2e04aacfbb2bb8
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Sat Apr 26 22:57:25 2008 -0700
can: Fix copy_from_user() results interpretation
Both copy_to_ and _from_user return the number of bytes, that failed to
reach their destination, not the 0/-EXXX values.
Based on patch from Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Acked-by: Oliver Hartkopp <oliver.hartkopp at volkswagen.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5c5d6dabb7aac9d0ea7aa76b909bbd28efa99065
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 26 22:50:57 2008 -0700
Revert "ipv6: Fix typo in net/ipv6/Kconfig"
This reverts commit 5b3f129c5592ca35b3fe8916767c58b98710478c.
As requested by Maciej W. Rozycki.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit becf3da20eca82e06607b9813cc3b592b359bae5
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Sat Apr 26 22:42:14 2008 -0700
tipc: endianness annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ec6b486fa9f6d20bfbaebba1db88bfe9d390ab1a
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Sat Apr 26 22:28:58 2008 -0700
ipv6: result of csum_fold() is already 16bit, no need to cast
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5e2c433d9f84dd9b0e01ef8607380d53a7f64d69
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Sat Apr 26 22:24:10 2008 -0700
[XFRM] AUDIT: Fix flowlabel text format ambibuity.
Flowlabel text format was not correct and thus ambiguous.
For example, 0x00123 or 0x01203 are formatted as 0x123.
This is not what audit tools want.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 86cf02f8eaea1b09e102e0f432fc137dc5cf4407
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Apr 27 11:59:30 2008 -0700
x86 PAT: tone down debugging messages some more
Ingo already fixed one of these at my request (in "x86 PAT: tone down
debugging messages", commit 1ebcc654f010d4a63f3ebf8ddd2cab5a709b1824),
but there was another one he missed.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 064922a805ec7aadfafdd27aa6b4908d737c3c1d
Merge: 42cadc86008aae0fd9ff31642dc01ed50723cf32 ecc1241e80a0bdc854b1602a44be3ad106753d4f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Apr 27 11:25:00 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (40 commits)
[SCSI] jazz_esp, sgiwd93, sni_53c710, sun3x_esp: fix platform driver hotplug/coldplug
[SCSI] aic7xxx: add const
[SCSI] aic7xxx: add static
[SCSI] aic7xxx: Update _shipped files
[SCSI] aic7xxx: teach aicasm to not emit unused debug code/data
[SCSI] qla2xxx: Update version number to 8.02.01-k2.
[SCSI] qla2xxx: Correct regression in relogin code.
[SCSI] qla2xxx: Correct misc. endian and byte-ordering issues.
[SCSI] qla2xxx: make qla2x00_issue_iocb_timeout() static
[SCSI] qla2xxx: qla_os.c, make 2 functions static
[SCSI] qla2xxx: Re-register FDMI information after a LIP.
[SCSI] qla2xxx: Correct SRB usage-after-completion/free issues.
[SCSI] qla2xxx: Correct ISP84XX verify-chip response handling.
[SCSI] qla2xxx: Wakeup DPC thread to process any deferred-work requests.
[SCSI] qla2xxx: Collapse RISC-RAM retrieval code during a firmware-dump.
[SCSI] m68k: new mac_esp scsi driver
[SCSI] zfcp: Add some statistics provided by the FCP adapter to the sysfs
[SCSI] zfcp: Print some messages only during ERP
[SCSI] zfcp: Wait for free SBAL during exchange config
[SCSI] scsi_transport_fc: fc_user_scan correction
...
commit ecc1241e80a0bdc854b1602a44be3ad106753d4f
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri Apr 18 13:57:19 2008 -0700
[SCSI] jazz_esp, sgiwd93, sni_53c710, sun3x_esp: fix platform driver hotplug/coldplug
Since
commit 43cc71eed1250755986da4c0f9898f9a635cb3bf
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Sat Aug 18 04:40:39 2007 +0200
platform: prefix MODALIAS with "platform:"
the platform modalias is prefixed with "platform:". Add MODULE_ALIAS()
to the hotpluggable SCSI platform drivers, to re-enable auto loading.
[dbrownell at users.sourceforge.net: more drivers, registration fixes]
[akpm at linux-foundation.org: fix sgiwd93.c]
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 980b306a297725d4f25c779ca15086de757acadf
Author: Denys Vlasenko <vda.linux at googlemail.com>
Date: Fri Apr 25 04:36:01 2008 +0200
[SCSI] aic7xxx: add const
This patch adds more const keywords where appropriate.
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
Acked-by: Hannes Reinecke <hare at suse.de>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit d1d7b19d433188e94fc87cc7ca66363cd77a0bba
Author: Denys Vlasenko <vda.linux at googlemail.com>
Date: Fri Apr 25 04:34:49 2008 +0200
[SCSI] aic7xxx: add static
This patch adds static (and sometimes const) keywords where appropriate.
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
Acked-by: Hannes Reinecke <hare at suse.de>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit d10c2e4627b0dda286bcd1c77720eb5fe4a04f93
Author: Hannes Reinecke <hare at suse.de>
Date: Fri Apr 25 15:03:05 2008 +0200
[SCSI] aic7xxx: Update _shipped files
Update the precompiled sequencer code to match the latest
aicasm changes.
Signed-off-by: Hannes Reinecke <hare at suse.de>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 3dbd10f3d8b00dad35d3fac95e91c066ae71d9a8
Author: Hannes Reinecke <hare at suse.de>
Date: Fri Apr 25 15:01:41 2008 +0200
[SCSI] aic7xxx: teach aicasm to not emit unused debug code/data
Add a 'count' variable to each symbol which gets increased every time
the symbol is referenced. And then modify the register definition to
include counts for symbols which are referenced from the source code
only and not from the sequencer code.
This will give us an automatic usage count for the symbols with only
minimal hand-crafting.
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit a198c3d0393faa1fa9f0e6e917ce980d3638f8df
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date: Thu Apr 24 15:21:31 2008 -0700
[SCSI] qla2xxx: Update version number to 8.02.01-k2.
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 666301e673e192c87a40e07a8357d6996b57b70f
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date: Thu Apr 24 15:21:30 2008 -0700
[SCSI] qla2xxx: Correct regression in relogin code.
Commit 63a8651f2548c6bb5132c0b4e7dad4f57a9274db ([SCSI] qla2xxx:
Correct infinite-login-retry issue.) introduced a small
regression where a successful relogin would result in an fcport's
loop_id to be incorrectly reset to FC_NO_LOOP_ID. Only clear-out
loopid, if retries have been 'truly' exhausted.
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit c6852c4c5984fff130a859792d4b26d30c85c54b
Author: Seokmann Ju <seokmann.ju at qlogic.com>
Date: Thu Apr 24 15:21:29 2008 -0700
[SCSI] qla2xxx: Correct misc. endian and byte-ordering issues.
There were several places in the driver which could cause byte
ordering problem as provided by Al Viro
<viro at ZenIV.linux.org.uk>.
Signed-off-by: Seokmann Ju <seokmann.ju at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 3b8117b837f5768f46e9a876a58de11606f63483
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu Apr 24 15:21:28 2008 -0700
[SCSI] qla2xxx: make qla2x00_issue_iocb_timeout() static
This patch makes the needlessly global qla2x00_issue_iocb_timeout()
static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 01ef66bbb65aa4db100b267778202d7657e244e4
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu Apr 24 15:21:27 2008 -0700
[SCSI] qla2xxx: qla_os.c, make 2 functions static
This patch makes the following needlessly global functions static:
- qla2x00_alloc_work()
- qla2x00_post_work()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 7e47e5ca184548341a82eeb2238ee3622c43cae1
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date: Thu Apr 24 15:21:26 2008 -0700
[SCSI] qla2xxx: Re-register FDMI information after a LIP.
Original code would (incorrectly) only re-register after a
loop-down condition. Also, FDMI registration should be enabled
by default.
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 0c23b856581673c90aa619b1ab04127a7f90cea2
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date: Thu Apr 24 15:21:25 2008 -0700
[SCSI] qla2xxx: Correct SRB usage-after-completion/free issues.
The driver is incorrectly assuming that the 'sp' reference held
in qla2[x00|4xx]_abort_command() is valid after the mailbox
command is issued to abort the exchange. It is *not*, as the
command may be completed during interrupt context before control
is returned to the mailbox caller.
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit c1ec1f1bf9cb1ba80e79a74d48bcfb5da246d6f6
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date: Thu Apr 24 15:21:24 2008 -0700
[SCSI] qla2xxx: Correct ISP84XX verify-chip response handling.
Earlier code could trigger an infinite-retry if 1st invocation
returned a non-CS_COMPLETE status.
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 550bf57dfb2200721baa43cfd9a8c75c2c166870
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date: Thu Apr 24 15:21:23 2008 -0700
[SCSI] qla2xxx: Wakeup DPC thread to process any deferred-work requests.
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit c5722708c236b51286651b8c07855f764239453b
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date: Thu Apr 24 15:21:22 2008 -0700
[SCSI] qla2xxx: Collapse RISC-RAM retrieval code during a firmware-dump.
Use the more efficient read-DMA'ble-buffer mailbox commands
rather than reading a single word/dword at a time. We also
remove a bulk of the duplicate mailbox command-handling codes in
favor of more generic read-memory() routines (qla2xxx_dump_ram()
and qla24xx_dump_ram()).
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 6fe07aaffbf086a0ce9134ef27ce4a8921ff5947
Author: Finn Thain <fthain at telegraphics.com.au>
Date: Fri Apr 25 10:06:05 2008 -0500
[SCSI] m68k: new mac_esp scsi driver
Replace the mac_esp driver with a new one based on the esp_scsi core.
For esp_scsi: add support for sync transfers for the PIO mode, add a new
esp_driver_ops method to get the maximum dma transfer size (like the old
NCR53C9x driver), and some cleanups.
Signed-off-by: Finn Thain <fthain at telegraphics.com.au>
Acked-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 6d9d63b9480e1c7ea41845646de803c2d3f0eae2
Author: Swen Schillig <swen at vnet.ibm.com>
Date: Thu Apr 24 19:35:54 2008 +0200
[SCSI] zfcp: Add some statistics provided by the FCP adapter to the sysfs
The new FCP adapter statistics provide a variety of information about
the virtual adapter (subchannel). In order to collect this information
the zfcp driver is extended to query this information.
The information provided by the new FCP adapter statistics can be
fetched by reading from the following files in the sysfs filesystem
/sys/class/scsi_host/host<n>/seconds_active
/sys/class/scsi_host/host<n>/requests
/sys/class/scsi_host/host<n>/megabytes
/sys/class/scsi_host/host<n>/utilization
These are the statistics on a virtual adapter (subchannel) level.
The information provided is raw and not modified or interpreted by any
means. No interpretation or modification of the values is done by the
zfcp driver.
Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit ec258fe4b76dba29e1a149cd8f23ee931b47afb2
Author: Swen Schillig <swen at vnet.ibm.com>
Date: Thu Apr 24 19:35:53 2008 +0200
[SCSI] zfcp: Print some messages only during ERP
When statistics are polled from sysfs, the statistics use the same
commands as the adapter initialization. Change the messages printed
here, so they are only printed during initialization and not for each
poll of adapter data.
Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit aee6ef1859fd975b285b6de1857f7dcf39671818
Author: Swen Schillig <swen at vnet.ibm.com>
Date: Thu Apr 24 19:35:52 2008 +0200
[SCSI] zfcp: Wait for free SBAL during exchange config
When sending a exchange config data command, wait for a free SBAL.
This does not matter during adapter initialization, but this is
required for pulling adapter statistics during high I/O load.
Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit bda232531f0c117921690ee3c060953c8f12e5a1
Author: James Smart <James.Smart at Emulex.Com>
Date: Thu Apr 24 12:12:46 2008 -0400
[SCSI] scsi_transport_fc: fc_user_scan correction
Way back when, when the fc_user_scan routine was created, it kept some
of its original logic that walked the rport list and kicked off a scan.
Unfortunately, it didn't keep any of the locking around the rport list,
nor did it consider the synchronous nature of the scan invoked. The result,
there are some scan requests where the rport list changes, thus a subsequent
scan is called on a bogus rport structure and the system NMI's.
Signed-off-by: James Smart <james.smart at emulex.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 87c4d7bc2aaa9b782aac6ab0a74cf16f87398bbc
Author: Jeff Garzik <jeff at garzik.org>
Date: Thu Apr 24 19:45:32 2008 -0400
[SCSI] aha1542: minor irq handler cleanups
- where the 'irq' function argument is known never to be used, rename
it to 'dummy' to make this more obvious
- replace per-irq lookup functions and tables with a direct reference
to data object obtained via 'dev_id' function argument, passed from
request_irq()
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 9f9a73b6fe0c8fd9b54b650e34956eb92df6abfa
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Apr 23 09:56:14 2008 -0700
[SCSI] scsi_transport_spi: include sysfs.h
scsi_transport_spi.c needs to #include <linux/sysfs.h>:
next-20080423/drivers/scsi/scsi_transport_spi.c:1467: error: implicit declaration of function 'sysfs_update_group'
make[3]: *** [drivers/scsi/scsi_transport_spi.o] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 1377d8dd7e1b5526637958aabb5427bbee5a68d7
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Apr 23 12:51:10 2008 +0300
[SCSI] FlashPoint: fix off-by-one errors
This patch fixes off-by-one errors in error checks (the variables are
used as array indexes for arrays with MAX_SCSI_TAR resp. MAX_LUN
elements) spotted by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 2b48aed182c65b3387b076364ab286c445aa4a93
Author: Hannes Reinecke <hare at suse.de>
Date: Wed Apr 23 11:39:49 2008 +0200
[SCSI] aic7xxx: Update type check in aicasm grammar
The function type_check() in aicasm grammar code was
never used properly due to a bug.
This patch fixes it up and ensures it's only called if appropriate.
In addition the unused 16bit instruction are disabled, but left in
the code for reference.
Signed-off-by: Hannes Reinecke <hare at suse.de>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 542bd1377a963070bc4a03ff7d2690ddf3920596
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Mon Apr 21 10:57:20 2008 -0500
[SCSI] fix SLUB WARN_ON
We're getting a WARN_ON from SLUB indicating that we're trying to free
caches with in-use objects. The root cause is a new dependency in the
command/sense free on unchecked_isa_dma. The WARN_ON is caused by
drivers which change this in their setup after the command/sense cache
is allocated.
The fix is to move the allocation of this cache into scsi_add_host()
so things like gdth have an opportunity to modify it between alloc and
add (but *not* after).
The true fix would be to move unchecked_isa_dma into the template and
out of the host, so it because a truly read only variable.
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 42cadc86008aae0fd9ff31642dc01ed50723cf32
Merge: fba5c1af5c4fd6645fe62ea84ccde0981282cf66 66c0b394f08fd89236515c1c84485ea712a157be
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Apr 27 10:13:52 2008 -0700
Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (147 commits)
KVM: kill file->f_count abuse in kvm
KVM: MMU: kvm_pv_mmu_op should not take mmap_sem
KVM: SVM: remove selective CR0 comment
KVM: SVM: remove now obsolete FIXME comment
KVM: SVM: disable CR8 intercept when tpr is not masking interrupts
KVM: SVM: sync V_TPR with LAPIC.TPR if CR8 write intercept is disabled
KVM: export kvm_lapic_set_tpr() to modules
KVM: SVM: sync TPR value to V_TPR field in the VMCB
KVM: ppc: PowerPC 440 KVM implementation
KVM: Add MAINTAINERS entry for PowerPC KVM
KVM: ppc: Add DCR access information to struct kvm_run
ppc: Export tlb_44x_hwater for KVM
KVM: Rename debugfs_dir to kvm_debugfs_dir
KVM: x86 emulator: fix lea to really get the effective address
KVM: x86 emulator: fix smsw and lmsw with a memory operand
KVM: x86 emulator: initialize src.val and dst.val for register operands
KVM: SVM: force a new asid when initializing the vmcb
KVM: fix kvm_vcpu_kick vs __vcpu_run race
KVM: add ioctls to save/store mpstate
KVM: Rename VCPU_MP_STATE_* to KVM_MP_STATE_*
...
commit fba5c1af5c4fd6645fe62ea84ccde0981282cf66
Merge: f222eba0f9d98376d363b51fcc2361fb56929844 077e3bdb9ec34d7cb5751b5be81a4a0f6f0eb5dc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Apr 27 10:13:06 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (49 commits)
ide-tape: remove tape->merge_stage
ide-tape: mv tape->merge_stage_size tape->merge_bh_size
ide-tape: mv idetape_empty_write_pipeline ide_tape_flush_merge_buffer
ide-tape: mv idetape_discard_read_pipeline ide_tape_discard_merge_buffer
ide-tape: make __idetape_discard_read_pipeline() of type void
ide: remove now unused ide_pci_create_host_proc()
ide: remove /proc/ide/ali
ide-tape: improve buffer pages freeing strategy
ide-tape: mv tape->pages_per_stage tape->pages_per_buffer
ide-tape: mv tape->stage_size tape->buffer_size
ide-tape: improve buffer allocation strategy
ide: add struct ide_io_ports (take 3)
ide: make ide_unregister() take 'ide_hwif_t *' as an argument (take 2)
ide: sanitize ide_unregister() usage
mpc8xx-ide: use ide_find_port()
ide: add "noacpi" / "acpigtf" / "acpionboot" parameters
gayle: add "doubler" parameter
ide: add "cdrom=" and "chs=" parameters
ide: add "nodma|noflush|noprobe|nowerr=" parameters
ide: remove obsoleted "hdx=autotune" kernel parameter
...
commit f222eba0f9d98376d363b51fcc2361fb56929844
Merge: cf867ac375cea7c7a834eaddaf373e2662d9e260 7f424a8b08c26dc14ac5c17164014539ac9a5c65
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Apr 27 10:10:54 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-idle-fix
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-idle-fix:
fix idle (arch, acpi and apm) and lockdep
commit cf867ac375cea7c7a834eaddaf373e2662d9e260
Merge: 2d630d1a6827bb7266dcd8bba5f99fac2505ee97 20430214cc0073dc7e817b032e32ae2ae54b4911
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Apr 27 10:10:37 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: xpad - fix build failure
commit 2d630d1a6827bb7266dcd8bba5f99fac2505ee97
Merge: f375d5588ff62caf31b4a68ac9347c153ac56590 ed4d3c1061d6f367a4ef5e1656c25af3314fe2b7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Apr 27 10:10:14 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
mlx4_core: Add helper to move QP to ready-to-send
mlx4_core: Add HW queues allocation helpers
RDMA/nes: Remove volatile qualifier from struct nes_hw_cq.cq_vbase
mlx4_core: CQ resizing should pass a 0 opcode modifier to MODIFY_CQ
mlx4_core: Move kernel doorbell management into core
IB/ehca: Bump version number to 0026
IB/ehca: Make some module parameters bool, update descriptions
IB/ehca: Remove mr_largepage parameter
IB/ehca: Move high-volume debug output to higher debug levels
IB/ehca: Prevent posting of SQ WQEs if QP not in RTS
IPoIB: Handle 4K IB MTU for UD (datagram) mode
RDMA/nes: Fix adapter reset after PXE boot
RDMA/nes: Print IPv4 addresses in a readable format
RDMA/nes: Use print_mac() to format ethernet addresses for printing
commit f375d5588ff62caf31b4a68ac9347c153ac56590
Author: Al Viro <viro at ZenIV.linux.org.uk>
Date: Sun Apr 27 06:19:18 2008 +0100
asm/unaligned.h doesn't work well as the very first include
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7ac86bf61ad570a2ef642a3f7e72274570ace9c4
Author: Al Viro <viro at ZenIV.linux.org.uk>
Date: Sun Apr 27 06:15:42 2008 +0100
e1000e triggers sparc32 gcc bug
... and isn't possible on sparc32 boxen anyway, unless somebody
had done JavaStation with PCIE lately.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Acked-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d7b41a24bfb5d7fa02f7b49be1293d468814e424
Author: Bodo Stroesser <bstroesser at fujitsu-siemens.com>
Date: Sat Apr 26 14:10:16 2008 -0700
hrtimer: timeout too long when using HRTIMER_CB_SOFTIRQ
When using hrtimer with timer->cb_mode == HRTIMER_CB_SOFTIRQ
in some cases the clockevent is not programmed.
This happens, if:
- a timer is rearmed while it's state is HRTIMER_STATE_CALLBACK
- hrtimer_reprogram() returns -ETIME, when it is called after
CALLBACK is finished. This occurs if the new timer->expires
is in the past when CALLBACK is done.
In this case, the timer needs to be removed from the tree and put
onto the pending list again.
The patch is against 2.6.22.5, but AFAICS, it is relevant
for 2.6.25 also (in run_hrtimer_pending()).
Signed-off-by: Bodo Stroesser <bstroesser at fujitsu-siemens.com>
Cc: stable at kernel.org
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 697c269610179051cf19e45566fee3dcebbb1e93
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Wed Nov 21 22:30:37 2007 +0100
sis190: account for Tx errors
Update the collision counter as well.
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
commit c34ebbae01e3d1f6a5cced6a40dc0ed792590d22
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Sun Nov 18 22:04:05 2007 +0100
sis190: remove needless MII reset
It does not help the auto-negotiation process to settle.
Added a debug message to give some hindsight when things
do not work as expected.
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
commit 47e4781544aaf2916170ef5516786fbb19447600
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Sun Apr 27 17:59:52 2008 +0200
sis190: Rx path update
- remove the function pointer to help gcc optimizing the
inline pci_dma functions
- pci_dma_sync_single_for_cpu is not needed for a single
large packet
- convert rtl8169_try_rx_copy to bool
b449655ff52ff8a29c66c5fc3fc03617e61182ee did the same
for the r8169 driver.
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
commit c124f5b54f879e5870befcc076addbd5d614663f
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:13:29 2008 +0300
slub: pack objects denser
Since we now have more orders available use a denser packing.
Increase slab order if more than 1/16th of a slab would be wasted.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 9b2cd506e5f2117f94c28a0040bf5da058105316
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:41 2008 +0300
slub: Calculate min_objects based on number of processors.
The mininum objects per slab is calculated based on the number of processors
that may come online.
Processors min_objects
---------------------------
1 8
2 12
4 16
8 20
16 24
32 28
64 32
1024 48
4096 56
The higher the number of processors the large the order sizes used for various
slab caches will become. This has been shown to address the performance issues
in hackbench on 16p etc.
The calculation is only performed if slub_min_objects is zero (default). If one
specifies a slub_min_objects on boot then that setting is taken.
As suggested by Zhang Yanmin's performance tests on 16-core Tigerton, use the
formula '4 * (fls(nr_cpu_ids) + 1)':
./hackbench 100 process 2000:
1) 2.6.25-rc6slab: 23.5 seconds
2) 2.6.25-rc7SLUB+slub_min_objects=20: 31 seconds
3) 2.6.25-rc7SLUB+slub_min_objects=24: 23.5 seconds
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Zhang Yanmin <yanmin.zhang at intel.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 114e9e89e668ec561c9b0f3dea7bcc8af7c29d21
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:41 2008 +0300
slub: Drop DEFAULT_MAX_ORDER / DEFAULT_MIN_OBJECTS
We can now fallback to order 0 slabs. So set the slub_max_order to
PAGE_CACHE_ORDER_COSTLY but keep the slub_min_objects at 4. This
will mostly preserve the orders used in 2.6.25. F.e. The 2k kmalloc slab
will use order 1 allocs and the 4k kmalloc slab order 2.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 31d33baf36bda7a2fea800648d87c9fe6155e7ca
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:41 2008 +0300
slub: Simplify any_slab_object checks
Since we now have total_objects counter per node use that to
check for the presence of any objects. The loop over all cpu slabs
is not that useful since any cpu slab would require an object allocation
first. So drop that.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 06b285dc3d6194abe79ab9dcaaab703d6f75627c
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:41 2008 +0300
slub: Make the order configurable for each slab cache
Makes /sys/kernel/slab/<slabname>/order writable. The allocation
order of a slab cache can then be changed dynamically during runtime.
This can be used to override the objects per slabs value establisheed
with the slub_min_objects setting that was manually specified or
calculated on bootup.
The changes of the slab order can occur while allocate_slab() runs.
Allocate slab needs the order and the number of slab objects that
are both changed by the change of order. Both are put into
a single word (struct kmem_cache_order_objects). They can then
be atomically updated and retrieved.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 319d1e240683d37924ea8977c91730c3393fd453
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:41 2008 +0300
slub: Drop fallback to page allocator method
There is now a generic method of falling back to a slab page of minimal
order. No need anymore for the fallback to kmalloc_large().
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 65c3376aaca96c66aa76014aaf430398964b68cb
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:40 2008 +0300
slub: Fallback to minimal order during slab page allocation
If any higher order allocation fails then fall back the smallest order
necessary to contain at least one object. This enables fallback for all
allocations to order 0 pages. The fallback will waste more memory (objects
will not fit neatly) and the fallback slabs will be not as efficient as larger
slabs since they contain less objects.
Note that SLAB also depends on order 1 allocations for some slabs that waste
too much memory if forced into PAGE_SIZE'd page. SLUB now can now deal with
failing order 1 allocs which SLAB cannot do.
Add a new field min that will contain the objects for the smallest possible order
for a slab cache.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 205ab99dd103e3dd5b0964dad8a16dfe2db69b2e
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:40 2008 +0300
slub: Update statistics handling for variable order slabs
Change the statistics to consider that slabs of the same slabcache
can have different number of objects in them since they may be of
different order.
Provide a new sysfs field
total_objects
which shows the total objects that the allocated slabs of a slabcache
could hold.
Add a max field that holds the largest slab order that was ever used
for a slab cache.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 834f3d119234b35a1985a2449831d99356637937
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:31 2008 +0300
slub: Add kmem_cache_order_objects struct
Pack the order and the number of objects into a single word.
This saves some memory in the kmem_cache_structure and more importantly
allows us to fetch both values atomically.
Later the slab orders become runtime configurable and we need to fetch these
two items together in order to properly allocate a slab and initialize its
objects.
Fix the race by fetching the order and the number of objects in one word.
[penberg at cs.helsinki.fi: fix memset() page order in new_slab()]
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 224a88be40c45c0da5bdc45a8118004a37c60e8a
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:31 2008 +0300
slub: for_each_object must be passed the number of objects in a slab
Pass the number of objects to the for_each_object macro. Most of these are
debug related.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 39b264641a0c3b5e0e742e2046b49e92d1f3be88
Author: Christoph Lameter <clameter at sgi.com>
Date: Mon Apr 14 19:11:30 2008 +0300
slub: Store max number of objects in the page struct.
Split the inuse field up to be able to store the number of objects in this
page in the page struct as well. Necessary if we want to have pages of
various orders for a slab. Also avoids touching struct kmem_cache cachelines in
__slab_alloc().
Update diagnostic code to check the number of objects and make sure that
the number of objects always stays within the bounds of a 16 bit unsigned
integer.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 33b12c38134e95e5afa73214af6f49abd7b8418e
Author: Christoph Lameter <clameter at sgi.com>
Date: Fri Apr 25 12:22:43 2008 -0700
slub: Dump list of objects not freed on kmem_cache_close()
Dump a list of unfreed objects if a slab cache is closed but
objects still remain.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 599870b175987008b5f5c82a70b89f751e12822e
Author: Christoph Lameter <clameter at sgi.com>
Date: Wed Apr 23 12:36:52 2008 -0700
slub: free_list() cleanup
free_list looked a bit screwy so here is an attempt to clean it up.
free_list is is only used for freeing partial lists. We do not need to return a
parameter if we decrement nr_partial within the function which allows a
simplification of the whole thing.
The current version modifies nr_partial outside of the list_lock which is
technically not correct. It was only ok because we should be the only user of
this slab cache at this point.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit d629d819579327267884a12de21ef6d4b539db88
Author: Pekka Enberg <penberg at cs.helsinki.fi>
Date: Wed Apr 23 22:31:08 2008 +0300
slub: improve kmem_cache_destroy() error message
As pointed out by Ingo, the SLUB warning of calling kmem_cache_destroy()
with cache that still has objects triggers in practice. So turn this
WARN_ON() into a nice SLUB specific error message to avoid people
confusing it to a SLUB bug.
Cc: Ingo Molnar <mingo at elte.hu>
Acked-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 0701a9e649bf0ffdac0a761d3c3d1041f5375d90
Author: Yi Li <yi.li at analog.com>
Date: Fri Apr 25 19:49:21 2008 +0300
slob: fix bug - when slob allocates "struct kmem_cache", it does not force alignment.
This may trigger misaligned memory access exception.
Acked-by: Matt Mackall <mpm at selenic.com>
Signed-off-by: Yi Li <yi.li at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit 66c0b394f08fd89236515c1c84485ea712a157be
Author: Al Viro <viro at ZenIV.linux.org.uk>
Date: Sat Apr 19 20:33:56 2008 +0100
KVM: kill file->f_count abuse in kvm
Use kvm own refcounting instead of playing with ->filp->f_count.
That will allow to get rid of a lot of crap in anon_inode_getfd() and
kill a race in kvm_dev_ioctl_create_vm() (file might have been closed
immediately by another thread, so ->filp might point to already freed
struct file when we get around to setting it).
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 960b3991698872f68f09d51f4c2794ad484fe1fd
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Wed Apr 16 17:19:06 2008 -0300
KVM: MMU: kvm_pv_mmu_op should not take mmap_sem
kvm_pv_mmu_op should not take mmap_sem. All gfn_to_page() callers down
in the MMU processing will take it if necessary, so as it is it can
deadlock.
Apparently a leftover from the days before slots_lock.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1336028b9a1fb33537eab8caec66e812eb8cad63
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 16 17:01:05 2008 +0200
KVM: SVM: remove selective CR0 comment
There is not selective cr0 intercept bug. The code in the comment sets the
CR0.PG bit. But KVM sets the CR4.PG bit for SVM always to implement the paged
real mode. So the 'mov %eax,%cr0' instruction does not change the CR0.PG bit.
Selective CR0 intercepts only occur when a bit is actually changed. So its the
right behavior that there is no intercept on this instruction.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit aaf697e4e02bf6f7dd6105877bc58ebdbf612d66
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 16 16:51:19 2008 +0200
KVM: SVM: remove now obsolete FIXME comment
With the usage of the V_TPR field this comment is now obsolete.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit aaacfc9ae225e88695e610a35627d2256dc08633
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 16 16:51:18 2008 +0200
KVM: SVM: disable CR8 intercept when tpr is not masking interrupts
This patch disables the intercept of CR8 writes if the TPR is not masking
interrupts. This reduces the total number CR8 intercepts to below 1 percent of
what we have without this patch using Windows 64 bit guests.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit d7bf8221a3037d0d0760a1ccf1833bda03213abf
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 16 16:51:17 2008 +0200
KVM: SVM: sync V_TPR with LAPIC.TPR if CR8 write intercept is disabled
If the CR8 write intercept is disabled the V_TPR field of the VMCB needs to be
synced with the TPR field in the local apic.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ec7cf6903ffced20098e2bcc27a184172836dfb9
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 16 16:51:16 2008 +0200
KVM: export kvm_lapic_set_tpr() to modules
This patch exports the kvm_lapic_set_tpr() function from the lapic code to
modules. It is required in the kvm-amd module to optimize CR8 intercepts.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 649d68643ebf02f31859ffbb16676aa44c72e6e9
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 16 16:51:15 2008 +0200
KVM: SVM: sync TPR value to V_TPR field in the VMCB
This patch adds syncing of the lapic.tpr field to the V_TPR field of the VMCB.
With this change we can safely remove the CR8 read intercept.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit bbf45ba57eaec56569918a8bab96ab653bd45ec1
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Wed Apr 16 23:28:09 2008 -0500
KVM: ppc: PowerPC 440 KVM implementation
This functionality is definitely experimental, but is capable of running
unmodified PowerPC 440 Linux kernels as guests on a PowerPC 440 host. (Only
tested with 440EP "Bamboo" guests so far, but with appropriate userspace
support other SoC/board combinations should work.)
See Documentation/powerpc/kvm_440.txt for technical details.
[stephen: build fix]
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Acked-by: Paul Mackerras <paulus at samba.org>
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 513014b717203d1d689652d0fda86eee959a6a8a
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Wed Apr 16 23:28:08 2008 -0500
KVM: Add MAINTAINERS entry for PowerPC KVM
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Acked-by: Paul Mackerras <paulus at samba.org>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b2312f059c893833de58876c74290511846cd208
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Wed Apr 16 23:28:07 2008 -0500
KVM: ppc: Add DCR access information to struct kvm_run
Device Control Registers are essentially another address space found on PowerPC
4xx processors, analogous to PIO on x86. DCRs are always 32 bits, and can be
identified by a 32-bit number. We forward most DCR accesses to userspace for
emulation (with the exception of CPR0 registers, which can be read directly
for simplicity in timebase frequency determination).
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 4baacfb0de53b05428c87d377fc8a3def4dc10e7
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Wed Apr 16 23:28:06 2008 -0500
ppc: Export tlb_44x_hwater for KVM
PowerPC 440 KVM needs to know how many TLB entries are used for the host kernel
linear mapping (it does not modify these mappings when switching between guest
and host execution).
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Acked-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Acked-by: Paul Mackerras <paulus at samba.org>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 76f7c87902fd2c2de9eb57168adbf9bc5ec2047d
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Tue Apr 15 16:05:42 2008 -0500
KVM: Rename debugfs_dir to kvm_debugfs_dir
It's a globally exported symbol now.
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit f9b7aab35cc6c3542203354d9fc4ec8572074abc
Author: Avi Kivity <avi at qumranet.com>
Date: Mon Apr 14 23:46:37 2008 +0300
KVM: x86 emulator: fix lea to really get the effective address
We never hit this, since there is currently no reason to emulate lea.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 16286d082d99cb41e16938fa6ba84604229f4b77
Author: Avi Kivity <avi at qumranet.com>
Date: Mon Apr 14 14:40:50 2008 +0300
KVM: x86 emulator: fix smsw and lmsw with a memory operand
lmsw and smsw were implemented only with a register operand. Extend them
to support a memory operand as well. Fixes Windows running some display
compatibility test on AMD hosts.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 66b85505736dbd3a3a0ed5ae38c12bb218b231c0
Author: Avi Kivity <avi at qumranet.com>
Date: Mon Apr 14 23:27:07 2008 +0300
KVM: x86 emulator: initialize src.val and dst.val for register operands
This lets us treat the case where mod == 3 in the same manner as other cases.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit a79d2f1805da02d7837ec2240f0093c53272fb3a
Author: Avi Kivity <avi at qumranet.com>
Date: Mon Apr 14 13:10:21 2008 +0300
KVM: SVM: force a new asid when initializing the vmcb
Shutdown interception clears the vmcb, leaving the asid at zero (which is
illegal. so force a new asid on vmcb initialization.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e9571ed54b2a290d61b98ad6f369f963159fe6da
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Fri Apr 11 15:01:22 2008 -0300
KVM: fix kvm_vcpu_kick vs __vcpu_run race
There is a window open between testing of pending IRQ's
and assignment of guest_mode in __vcpu_run.
Injection of IRQ's can race with __vcpu_run as follows:
CPU0 CPU1
kvm_x86_ops->run()
vcpu->guest_mode = 0 SET_IRQ_LINE ioctl
..
kvm_x86_ops->inject_pending_irq
kvm_cpu_has_interrupt()
apic_test_and_set_irr()
kvm_vcpu_kick
if (vcpu->guest_mode)
send_ipi()
vcpu->guest_mode = 1
So move guest_mode=1 assignment before ->inject_pending_irq, and make
sure that it won't reorder after it.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 62d9f0dbc92d7e398fde53fc6021338393522e68
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Fri Apr 11 13:24:45 2008 -0300
KVM: add ioctls to save/store mpstate
So userspace can save/restore the mpstate during migration.
[avi: export the #define constants describing the value]
[christian: add s390 stubs]
[avi: ditto for ia64]
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 582fb6c03a0e89d05e4efa8a3e4bd09d0942dadc
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 19 09:16:38 2008 -0500
[SCSI] esp_scsi: Make cur_residue and tot_residue signed.
Many of the overflow checks test whether the value has
gone negative, and we want to retain such checks.
Reported by Julia Lawall.
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 077e3bdb9ec34d7cb5751b5be81a4a0f6f0eb5dc
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:34 2008 +0200
ide-tape: remove tape->merge_stage
Get rid of the pipeline merge stage but retain the chrdev req caching
functionality by using a merge buffer tape->merge_bh which is flushed in chunks
of several blocks at a time. Also, remove last references to pipelining, e.g.
typedef idetape_stage_s.
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 01a63aebe4dcfcbe983c40a475e4650a4ae614de
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:34 2008 +0200
ide-tape: mv tape->merge_stage_size tape->merge_bh_size
This is the size of the merge buffer.
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d9df937af4f980883d94276000e5af399438e1a9
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:34 2008 +0200
ide-tape: mv idetape_empty_write_pipeline ide_tape_flush_merge_buffer
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ec0fdb01f808e3f0b50378bfabaee4ced41a8fd9
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:34 2008 +0200
ide-tape: mv idetape_discard_read_pipeline ide_tape_discard_merge_buffer
Also, rename its __-low level helper too.
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9798630a75c2c13849aeefcc1ba0559a701b5d95
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:34 2008 +0200
ide-tape: make __idetape_discard_read_pipeline() of type void
It always returns 0 which has no effect on tape positioning calculation so
simplify it by converting its type to void, bringing no functional change to the
driver.
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit fd0949e6e84e4e1649d8ea7367e78e72f59bb19f
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Sun Apr 27 15:38:34 2008 +0200
ide: remove now unused ide_pci_create_host_proc()
It creates files in proc with obsoleted ->get_info interface.
Signed-off-by: Alexey Dobriyan <adobriyan at openvz.org>
Cc: Andrew Morton <akpm at osdl.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 19ba7b8f35116dfafcb02bdb745d5015d97d9cb6
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Sun Apr 27 15:38:33 2008 +0200
ide: remove /proc/ide/ali
Bart says: "can be done from user-space and is not especially interesting
even when debugging problems (raw PCI config space dump is far more useful)."
Signed-off-by: Alexey Dobriyan <adobriyan at openvz.org>
Cc: Andrew Morton <akpm at osdl.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d01dbc3b85d57f3ab89be4291d4739152bb1713a
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:33 2008 +0200
ide-tape: improve buffer pages freeing strategy
Instead of freeing pages one by one, free them 2^order-wise. Also, mv
__idetape_kfree_stage() to ide_tape_kfree_buffer().
[bart: add updating bh->b_data]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit a997a4356ba33dcb9c061677d5943794a29489e8
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:33 2008 +0200
ide-tape: mv tape->pages_per_stage tape->pages_per_buffer
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f73850a302de45c7cb6672d0e8b103c1f122b6ae
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:33 2008 +0200
ide-tape: mv tape->stage_size tape->buffer_size
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 41aa17069ea8d2b5cd2ca1ef7ff6cdb7c6abec95
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:32 2008 +0200
ide-tape: improve buffer allocation strategy
Instead of allocating pages for the buffer one by one, take advantage of the
buddy alloc system and request them 2^order at a time. This increases the chance
for bigger buffer parts to be contigious and reduces loop iteration count. While
at it, rename function __idetape_kmalloc_stage() to ide_tape_kmalloc_buffer().
[bart: fold with "ide-tape: fix mem leak" patch to preserve bisectability]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 4c3032d8a4d6c97bd6e02bcab524ef2428d89561
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:32 2008 +0200
ide: add struct ide_io_ports (take 3)
* Add struct ide_io_ports and use it instead of `unsigned long io_ports[]`
in ide_hwif_t.
* Rename io_ports[] in hw_regs_t to io_ports_array[].
* Use un-named union for 'unsigned long io_ports_array[]' and 'struct
ide_io_ports io_ports' in hw_regs_t.
* Remove IDE_*_OFFSET defines.
v2:
* scc_pata.c build fix from Stephen Rothwell.
v3:
* Fix ctl_adrr typo in Sparc-specific part of ns87415.c.
(Noticed by Andrew Morton)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 387750c3bf49c22f6189436032145e2131985076
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:31 2008 +0200
ide: make ide_unregister() take 'ide_hwif_t *' as an argument (take 2)
* Make ide_unregister() take 'ide_hwif_t *hwif' instead of 'unsigned int
index' (hwif->index) as an argument and update all users accordingly.
While at it:
* Remove unnecessary checks for hwif != NULL from ide-pnp.c::idepnp_remove()
and delkin_cb.c::delkin_cb_remove().
* Remove needless hwif->chipset assignment from scc_pata.c::scc_remove().
v2:
* Fixup ide_unregister() documentation.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit bf64b7a9ddc604883a1f41535d3d7a62bca9ee81
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:31 2008 +0200
ide: sanitize ide_unregister() usage
* Remove ide_unregister() call from ide_exit()
(host drivers take care of unregistering hwif-s themselves).
* Remove ide_unregister() call from probe methods of
bast-ide, palm_bk3710, ide-cs and delkin_cb host drivers
(ide_find_port() returns only free ide_hwifs[] entries).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 16019c35283e99b4b95b8a0757845bc2d0696b20
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:30 2008 +0200
mpc8xx-ide: use ide_find_port()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1dbfeb4bc8fd0276750e5d1d454420f6c2da80e3
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:30 2008 +0200
ide: add "noacpi" / "acpigtf" / "acpionboot" parameters
* Rename ide_noacpi{tfs,onboot} to ide_acpi{gtf,onboot} (+ reverse logic).
* Move ide_*acpi* variables to ide-acpi.c and remove unnecessary initializers.
* Add "noacpi" / "acpigtf" / "acpionboot" parameters.
* Obsolete "ide=noacpi" / "ide=acpigtf" / "ide=acpionboot" kernel parameters.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9dcba7f2b7697db787741cf6698bf5c95130ffce
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:30 2008 +0200
gayle: add "doubler" parameter
* Add "doubler" parameter to enable support for IDE doublers.
* Obsolete "ide=doubler" kernel parameter.
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 4706a7e03a03d6d206a93a49a0c723dd612cf8e9
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:30 2008 +0200
ide: add "cdrom=" and "chs=" parameters
* Add "cdrom=" and "chs=" parameters.
* Obsolete "hdx=cdrom" and "hdx=cyls,heads,sects" kernel parameters.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 6e87543a94fb2a966c81a61fc91246592f9719da
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:30 2008 +0200
ide: add "nodma|noflush|noprobe|nowerr=" parameters
* Add "nodma|noflush|noprobe|nowerr=" parameters.
* Obsolete "hdx=noprobe|none|nowerr|nodma|noflush" kernel parameters.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 207daeaabb5396995ebac63415fab71476b64ca3
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:29 2008 +0200
ide: remove obsoleted "hdx=autotune" kernel parameter
* Remove obsoleted "hdx=autotune" kernel parameter
(we always auto-tune PIO if possible nowadays).
* Remove no longer needed ide_drive_t.autotune flag.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e160124ff6868e53511b16412d2ea91f87936be0
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:29 2008 +0200
ide: remove IDE_HFLAG_NO_AUTOTUNE host flag
* Don't set IDE_HFLAG_NO_AUTOTUNE host flag in sgiioc4 and icside
host drivers - there is no need for it as they don't implement
->set_pio_mode method.
* Remove no longer needed IDE_HFLAG_NO_AUTOTUNE host flag.
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit bdffe5d2717c41945d75b488cfaa401d166cb3dd
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:29 2008 +0200
cmd640: always auto-tune PIO
* Default to tuning PIO0 and disabling prefetch prior to probing
devices for CONFIG_BLK_DEV_CMD640_ENHANCED=y case.
* Always auto-tune PIO.
* Remove no longer used retrieve_drive_counts().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 0d28ec7f213eee37855741410a95ec559f9fa87a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:29 2008 +0200
ide: always auto-tune PIO in legacy VLB host drivers
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 73f1ad8670effa9849c3d42457fa2b58f139e013
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:29 2008 +0200
ide: mark "idebus=" kernel parameter as obsoleted (take 2)
We have "vlb|pci_clock=" parameters now.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ebae41a5a0583fb732c41445df4ac2c41016df74
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:29 2008 +0200
ide: add "vlb|pci_clock=" parameter
* Add "vlb_clock=" parameter for specifying VLB clock frequency (in MHz).
* Add "pci_clock=" parameter for specifying PCI bus clock frequency (in MHz).
While at it:
* qd65xx.c: rename {active,recovery}_cycle variables to {act,rec}_cyc.
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 10569713c78f3c499745651aebc90b0d1c454c28
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:28 2008 +0200
ide-tape: remove comments markup from Documentation/ide/ide-tape.txt
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 4735f22cc10127189a13ce9b1c16fa152a99aaba
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:28 2008 +0200
ide-tape: remove pipelined mode description from Documentation/ide/ide-tape.txt
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5bd50dc6aa842a2b37f68dec73d9e2cc433c2af9
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:28 2008 +0200
ide-tape: remove misc references to pipelined operation in the comments
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit c0674bf3b602c71f18ff1772fdfb4e7ea8ffbacc
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:28 2008 +0200
ide-tape: remove pipelined mode parameters
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 83042b241601170c95b448267861be10a6025b3c
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:27 2008 +0200
ide-tape: remove pipeline-specific members from struct ide_tape_obj
Bart:
- merge "ide-tape: remove pipeline-specific code from idetape_setup" patch
- cleanup __idetape_discard_read_pipeline()
- cleanup idetape_empty_write_pipeline()
- fix 't' assignment in idetape_setup()
- fix idetape_blkdev_ioctl() w.r.t. 'nr_stages'
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 42d5468921e9e9c0a2d13048a2dab09f844e18bc
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:27 2008 +0200
ide-tape: remove pipelined mode tape control flags
[bart: sync patch with current code and fix idetape_init_read()]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 0aa4b01e0345bb43450dee4377fc53fb4fd44eb1
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:27 2008 +0200
ide-tape: remove remaining pipeline functionality
The driver is using now solely its own request queue.
- tape->next_stage is always NULL so it is safe to remove
all code depending on tape->next_stage != NULL
- this patch removes the last place which sets
IDETAPE_FLAG_PIPELINE_ACTIVE in tape->flags
[bart: add above explanations]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ea1ab3d3319b399e2b707c270d2d6077b61183f6
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:27 2008 +0200
ide-tape: unwrap idetape_queue_pc_tail()
idetape_queue_pc_tail() is a wrapper for its __idetape_queue_pc_tail() counterpart
and has no other functionality. Remove it and call the "wrapped" function
directly.
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 189bb3b345f59b11484b43f2717a66824acdc548
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:27 2008 +0200
ide-tape: remove pipeline-specific code from idetape_end_request()
As a side effect, remove unused idetape_kfree_stage() and
idetape_abort_pipeline()
[bart: resurrect taking tape->lock + clearing IDETAPE_FLAG_PIPELINE_ACTIVE]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 473567f1a4996a49cb5456e55815051a6e6eb3f1
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:26 2008 +0200
ide-tape: remove idetape_remove_stage_head()
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b361acb1083f0b313a4b398de48450f5edb81fe1
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:26 2008 +0200
ide-tape: remove idetape_pipeline_size()
The computation of the block offset of the the tape position (MTIOCPOS,
MTIOCGET) is not influenced by the stages queued in the pipeline anymore but by
the size of the current buffer which is going to be sent to the drive.
[bart: resurrect deleted idetape_wait_for_pipeline() call]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7f5e72f471763fe2a6e72863a64a2ef459f37835
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:26 2008 +0200
ide-tape: remove pipeline-specific code in idetape_space_over_filemarks()
Since we don't do pipeline read-ahead anymore, we don't have to look for
filemarks we have crossed. Therefore, remove the code chunk that does that and
pass on the command to the tape. As a side effect, remove unused
idetape_wait_first_stage().
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 8646c88f1572512761b33d01467e8643586972ce
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:26 2008 +0200
ide-tape: remove unused parameter from idetape_copy_stage_from_user
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 99d74e61ef7e9b0e2123830bc42b4639ee30145a
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:25 2008 +0200
ide-tape: remove unused parameter from idetape_copy_stage_to_user
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5e69bd959d1086f87a603b4ddc6bdb0a130ec7db
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:25 2008 +0200
ide-tape: remove pipeline-specific code from idetape_add_chrdev_read_request()
In order to do away with queueing read requests on the pipeline, several things
have to be done:
1. Do not allocate additional pipeline stages in idetape_init_read() until
(tape->nr_stages < max_stages) and do only read operation preparations. As a
collateral result, idetape_add_stage_tail() becomes unused so remove it.
2. Queue the read request's buffer directly thru idetape_queue_rw_tail().
3. Remove now unused idetape_kmalloc_stage() and idetape_switch_buffers().
[bart: simplify the original patch]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ddfe7a776360f7067e06eee9d8b1ae4d957e6ddf
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:25 2008 +0200
ide-tape remove pipeline speed/control calculations
Pipeline handling calculations in idetape_calculate_speeds() can
go since they do not have any effect on other functionality besides:
1. info is only being exported through /proc as a read-only item
(controlled_pipeline_head_speed, uncontrolled_pipeline_head_speed)
2. used in idetape_restart_speed_control() which, in turn, is unrelated to
other code
3. used only for pipeline frames number accounting (tape->pipeline_head),
also unused elsewhere.
4.some variables are:
only written to: tape->buffer_head;
unused: tape->tape_head, tape->last_tape_head
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 97c566cebe083b8e500c9b0b5033212c809d9844
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:25 2008 +0200
ide-tape: remove pipeline-specific code from idetape_add_chrdev_write_request
Refrain from adding more write requests to the pipeline and queue them
directly on the device's request queue instead.
[bart: re-do for minimal behavior changes]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f64eee7bb2819da5506a2db5b6297612a17eb3f8
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sun Apr 27 15:38:25 2008 +0200
ide-tape: remove tape->cache_stage
Prior to allocating a new pipeline stage, the code checked for the existence of
a cached pipeline stage to use. Do away with and stick to normal pipeline
stages only.
[bart: keep idetape_kmalloc_stage() for now]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit cc12175ff2eadb0918d573169af88429440a21ae
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:24 2008 +0200
ide: remove obsoleted "hdx=noautotune" kernel parameter
Remove obsoleted "hdx=noautotune" kernel parameter
(it has been obsoleted since 1 Nov 2004).
Then make ide_hwif_t.autotune a single bit flag
and remove no longer needed IDE_TUNE_* defines.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ef87f8d09639cbe22201c7dfe07586c43b255108
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:24 2008 +0200
ide: remove obsoleted "idex=" kernel parameters
* Remove obsoleted "idex=" kernel parameters.
* Make probe_* and cmd640_vlb variables static.
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e460a59751a7e53b549c63d4d308ba73582c8def
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:24 2008 +0200
ide: remove obsoleted "idex=reset" kernel parameter
Remove obsoleted "idex=reset" kernel parameter
(it has been obsoleted since 1 Nov 2004).
Then remove corresponding code from ide_probe_port()
and no longer used ->reset field from ide_hwif_t.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9dd4cf1fb949f6ba56b67078c09ef1b78f3c9421
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:24 2008 +0200
ide: remove obsoleted "idex=serialize" kernel parameter
Remove obsoleted "idex=serialize" kernel parameter
(it has been obsoleted since 1 Nov 2004).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9fd91d959f1a19d1bfa46d97cbbbb55641ce26a6
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Apr 27 15:38:23 2008 +0200
ide: add "ignore_cable" parameter (take 2)
Add "ignore_cable" parameter:
* "ide_core.ignore_cable=[interface_number]" boot option if IDE is built-in
(i.e. "ide_core.ignore_cable=1" to force ignoring cable for "ide1")
* "ignore_cable=[interface_number]" module parameter (for ide_core module)
if IDE is compiled as module
v2:
* Add ide_port_apply_params() helper
- use it in ide_device_add_all() and ide_scan_port().
* Make it possible to later disable ignoring cable detection by passing
"[interface_number]:0" to /sys/module/ide_core/parameters/ignore_cable
(however sysfs interface is not enabled yet since it needs some other
IDE changes to make it work reliable).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9c391bae6a65bd39962877ad7dc000b600757bbe
Author: Al Viro <viro at ZenIV.linux.org.uk>
Date: Sun Apr 27 15:38:23 2008 +0200
ide: fix icside breakage
Fallout from commit ac95beedf8bc97b24f9540d4da9952f07221c023
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1852448652fd526d56099256dadc4ef32cb1b10e
Author: Mark M. Hoffman <mhoffman at lightlink.com>
Date: Thu Mar 6 08:41:09 2008 -0500
hwmon: (adt7473) minor cleanup / refactoring
Acked-by: Darrick J. Wong <djwong at us.ibm.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 5d822e9bd9d866672984c6a6b613f0c11ca2543b
Author: Mark M. Hoffman <mhoffman at lightlink.com>
Date: Tue Feb 26 08:48:49 2008 -0500
hwmon: (asb100) Remove some dead code
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit ccd6befceb9a9b02114a93ff4cfa29adbdf60b6d
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Feb 19 12:42:58 2008 +0100
hwmon: (lm75) Fix an incorrect comment
High-byte first is not opposite to the usual practice - that's what
almost all hardware monitoring drivers do. It is opposite to the SMBus
standard though.
Also delete a duplicate comment.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 93c75a4ac2d95834e7202965d853d3cd23aadb40
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Feb 12 11:25:07 2008 +0100
hwmon: (w83793) VID and VRM handling cleanups
* Rework the device initialization function so as to read the
"Multi-Function Pin Control" register (0x58) once instead of twice.
I2C transactions aren't cheap so this speeds up the driver loading.
* Only create the "vrm" attribute if at least one VID value is
available.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: Gong Jun <jgong at winbond.com>
Acked-by: Rudolf Marek <r.marek at assembler.cz>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 4040c415f5566ecfe95b509ee84d68fb7050b30c
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Feb 12 11:17:26 2008 +0100
hwmon: (w83l785ts) Don't ask the user to report failures
There's nothing we can do about read errors on the W83L785TS-S, so
don't ask the user to report them.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 35aeb7809345e0362772a75368a3e62ecd931481
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Sun Apr 27 14:54:32 2008 +0200
sis190: use netdev_alloc_skb
This sets skb->dev and allows arch specific allocation.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Acked-by: Francois Romieu <romieu at fr.zoreil.com>
commit e3eccad9f6e84656b45bfa07738934145b09e11e
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Sun Apr 27 14:42:27 2008 +0200
sis190: hard-code the alignment of tiny packets
There is no DMA involved here. Align the IP header without condition.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Acked-by: Francois Romieu <romieu at fr.zoreil.com>
commit 4709aa59ede5ff9902d60088d93d1c0e2e9d2247
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Sun Apr 27 14:36:59 2008 +0200
sis190: use the allocated buffer as a status code in sis190_alloc_rx_skb
The local status code does not carry mory information.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Acked-by: Francois Romieu <romieu at fr.zoreil.com>
commit 5526b7e4513c66bc1c91f661dcd518d5199f8934
Author: David S. Miller <davem at davemloft.net>
Date: Sun Apr 27 02:26:36 2008 -0700
sparc: Remove old style signal frame support.
Back around the same time we were bootstrapping the first 32-bit sparc
Linux kernel with a SunOS userland, we made the signal frame match
that of SunOS.
By the time we even started putting together a native Linux userland
for 32-bit Sparc we realized this layout wasn't sufficient for Linux's
needs.
Therefore we changed the layout, yet kept support for the old style
signal frame layout in there. The detection mechanism is that we had
sys_sigaction() start passing in a negative signal number to indicate
"new style signal frames please".
Anyways, no binaries exist in the world that use the old stuff. In
fact, I bet Jakub Jelinek and myself are the only two people who ever
had such binaries to be honest.
So let's get rid of this stuff.
I added an assertion using WARN_ON_ONCE() that makes sure 32-bit
applications are passing in that negative signal number still.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a45352908b88d383bc40e1e4d1a6cc5bbcefc895
Author: Avi Kivity <avi at qumranet.com>
Date: Sun Apr 13 17:54:35 2008 +0300
KVM: Rename VCPU_MP_STATE_* to KVM_MP_STATE_*
We wish to export it to userspace, so move it into the kvm namespace.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 3d80840d96127401ba6aeadd813c3a15b84e70fe
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Fri Apr 11 14:53:26 2008 -0300
KVM: hlt emulation should take in-kernel APIC/PIT timers into account
Timers that fire between guest hlt and vcpu_block's add_wait_queue() are
ignored, possibly resulting in hangs.
Also make sure that atomic_inc and waitqueue_active tests happen in the
specified order, otherwise the following race is open:
CPU0 CPU1
if (waitqueue_active(wq))
add_wait_queue()
if (!atomic_read(pit_timer->pending))
schedule()
atomic_inc(pit_timer->pending)
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 3564990af1b9f77a63692c1079e9c41af229f066
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 9 16:04:32 2008 +0200
KVM: SVM: do not intercept task switch with NPT
When KVM uses NPT there is no reason to intercept task switches. This patch
removes the intercept for it in that case.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit d4c9ff2d1b78e385471b3f4d80c0596909926ef7
Author: Feng(Eric) Liu <eric.e.liu at intel.com>
Date: Thu Apr 10 08:47:53 2008 -0400
KVM: Add kvm trace userspace interface
This interface allows user a space application to read the trace of kvm
related events through relayfs.
Signed-off-by: Feng (Eric) Liu <eric.e.liu at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 048354c8e6bf95e7347f623d8a0da5b89e216405
Author: Avi Kivity <avi at qumranet.com>
Date: Fri Apr 11 02:51:52 2008 +0300
KVM: ia64: Stub out kvmtrace
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 7732a8d19bdc6ae18f68f9adb47d11c82a3a86cd
Author: Avi Kivity <avi at qumranet.com>
Date: Fri Apr 11 02:50:40 2008 +0300
KVM: s390: Stub out kvmtrace
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 2714d1d3d6be882b97cd0125140fccf9976a460a
Author: Feng (Eric) Liu <eric.e.liu at intel.com>
Date: Thu Apr 10 15:31:10 2008 -0400
KVM: Add trace markers
Trace markers allow userspace to trace execution of a virtual machine
in order to monitor its performance.
Signed-off-by: Feng (Eric) Liu <eric.e.liu at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 53371b5098543ab09dcb0c7ce31da887dbe58c62
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 9 14:15:30 2008 +0200
KVM: SVM: add intercept for machine check exception
To properly forward a MCE occured while the guest is running to the host, we
have to intercept this exception and call the host handler by hand. This is
implemented by this patch.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 6394b6494c0a352a2db3ea3e891ba7aeea7c1441
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 9 14:15:29 2008 +0200
KVM: SVM: align shadow CR4.MCE with host
This patch aligns the host version of the CR4.MCE bit with the CR4 active in
the guest. This is necessary to get MCE exceptions when the guest is running.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ec077263b2bb841d973d82342b7fbc07bbad4246
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Apr 9 14:15:28 2008 +0200
KVM: SVM: indent svm_set_cr4 with tabs instead of spaces
The svm_set_cr4 function is indented with spaces. This patch replaces
them with tabs.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 258ac8e066622df3fef94c8adf32596faae5ab71
Author: Avi Kivity <avi at qumranet.com>
Date: Sun Apr 6 14:25:46 2008 +0300
KVM: Register ioctl range
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 35149e2129fe34fc8cb5917e1ecf5156b0fa3415
Author: Anthony Liguori <aliguori at us.ibm.com>
Date: Wed Apr 2 14:46:56 2008 -0500
KVM: MMU: Don't assume struct page for x86
This patch introduces a gfn_to_pfn() function and corresponding functions like
kvm_release_pfn_dirty(). Using these new functions, we can modify the x86
MMU to no longer assume that it can always get a struct page for any given gfn.
We don't want to eliminate gfn_to_page() entirely because a number of places
assume they can do gfn_to_page() and then kmap() the results. When we support
IO memory, gfn_to_page() will fail for IO pages although gfn_to_pfn() will
succeed.
This does not implement support for avoiding reference counting for reserved
RAM or for IO memory. However, it should make those things pretty straight
forward.
Since we're only introducing new common symbols, I don't think it will break
the non-x86 architectures but I haven't tested those. I've tested Intel,
AMD, NPT, and hugetlbfs with Windows and Linux guests.
[avi: fix overflow when shifting left pfns by adding casts]
Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit fdae862f91728aec6dd8fd62cd2398868c906b6b
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 15:08:29 2008 +0800
KVM: ia64: Add a guide about how to create kvm guests on ia64
Guide for creating virtual machine on kvm/ia64.
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b693919ca983e9eb989d89dac5493ef3c5e98e77
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Fri Mar 28 14:58:47 2008 +0800
KVM: ia64: Enable kvm build for ia64
Update the related Makefile and KConfig for kvm build
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ad86b6c36bbb9c1cac610f1b8a310d87eafea778
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:59:30 2008 +0800
KVM: ia64: Add kvm sal/pal virtulization support
Some sal/pal calls would be traped to kvm for virtulization
from guest firmware.
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 827fa691e41a538bbe941d9c988e07e6abea1648
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:58:42 2008 +0800
KVM: ia64: Add guest interruption injection support
process.c mainly handle interruption injection, and some faults handling.
Signed-off-by: Anthony Xu <anthony.xu at intel.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit d62998a681f4688605895bb7068d76d25132e3a2
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:57:53 2008 +0800
KVM: ia64: Generate offset values for assembly code use
asm-offsets.c will generate offset values used for assembly code
for some fileds of special structures.
Signed-off-by: Anthony Xu <anthony.xu at intel.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 7fc86bd9c0830651826d88c65b6aad55086a6e01
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:57:09 2008 +0800
KVM: ia64: Add optimization for some virtulization faults
optvfault.S Add optimization for some performance-critical
virtualization faults.
Signed-off-by: Anthony Xu <anthony.xu at intel.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 60a07bb9baa83e17d4b540a2f371661ecc353c6c
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 16:14:28 2008 +0800
KVM: ia64: Add processor virtulization support
vcpu.c provides processor virtualization logic for kvm.
Signed-off-by: Anthony Xu <anthony.xu at intel.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit a793537a970584720347293935a4bb6323791a05
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:54:42 2008 +0800
KVM: ia64: Add trampoline for guest/host mode switch
trampoline code targets for guest/host world switch.
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e30af4ce7fea3d3a470f8f9996c53564f34e4754
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:53:32 2008 +0800
KVM: ia64: Add mmio decoder for kvm/ia64
mmio.c includes mmio decoder, and related mmio logics.
Signed-off-by: Anthony Xu <Anthony.xu at intel.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit fbd4b5621c8db767f78c89d1ac708ac4bb276caf
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:52:19 2008 +0800
KVM: ia64: Add interruption vector table for vmm
vmm_ivt.S includes an ivt for vmm use.
Signed-off-by: Anthony Xu <anthony.xu at intel.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 964cd94a2ae3b20f9da9bd43b31aac32c4fe9aee
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:50:59 2008 +0800
KVM: ia64: Add TLB virtulization support
vtlb.c includes tlb/VHPT virtulization.
Signed-off-by: Anthony Xu <anthony.xu at intel.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit bb46fb4af160ec7ae6e5102a79a3b2518eaee7af
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:49:24 2008 +0800
KVM: ia64: VMM module interfaces
vmm.c adds the interfaces with kvm/module, and initialize global data area.
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit a4f500381ac91969fa4f8b0a4e39e76dbf00a913
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 16:00:24 2008 +0800
KVM: ia64: Add header files for kvm/ia64
kvm_minstate.h : Marcos about Min save routines.
lapic.h: apic structure definition.
vcpu.h : routions related to vcpu virtualization.
vti.h : Some macros or routines for VT support on Itanium.
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b024b79322aad213cd2d4f30c23a6c626a0d5b31
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 15:29:29 2008 +0800
KVM: ia64: Add kvm arch-specific core code for kvm/ia64
kvm_ia64.c is created to handle kvm ia64-specific core logic.
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1a9c1ac46990194f6b6ddc591c24e385e611fa25
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:45:06 2008 +0800
KVM: ia64: Add header files for kvm/ia64
Three header files are added:
asm-ia64/kvm.h
asm-ia64/kvm_host.h
asm-ia64/kvm_para.h
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e235f3450f5bf94b989746163b7791784a78ee05
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Tue Apr 1 14:42:00 2008 +0800
KVM: ia64: Prepare some structure and routines for kvm use
Register structures are defined per SDM.
Add three small routines for kernel:
ia64_ttag, ia64_loadrs, ia64_flushrs
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit c71799c1f404c6e4f34fa64e6be39cd6149e5019
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Apr 4 16:03:34 2008 +0200
KVM: s390: Improve pgste accesses
There is no need to use interlocked updates when the rcp
lock is held. Therefore the simple bitops variants can be
used. This should improve performance.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit f603f0731f43421403160f5f8b12e90f2e51f064
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Apr 4 15:12:40 2008 +0200
KVM: s390: rename stfl to kvm_stfl
Temporarily rename this function to avoid merge conflicts and/or
dependencies. This function will be removed as soon as git-s390
and kvm.git are finally upstream.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 7e8e6ab48d78147f69c1ba2d6a362f8d33254468
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Apr 4 15:12:35 2008 +0200
KVM: s390: Fix incorrect return value
kvm_arch_vcpu_ioctl_run currently incorrectly always returns 0.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit bed1d1dfc4a458d82bcd258082638cbba860190d
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Fri Apr 4 14:56:44 2008 -0300
KVM: MMU: prepopulate guest pages after write-protecting
Zdenek reported a bug where a looping "dmsetup status" eventually hangs
on SMP guests.
The problem is that kvm_mmu_get_page() prepopulates the shadow MMU
before write protecting the guest page tables. By doing so, it leaves a
window open where the guest can mark a pte as present while the host has
shadow cached such pte as "notrap". Accesses to such address will fault
in the guest without the host having a chance to fix the situation.
Fix by moving the write protection before the pte prefetch.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit fcd6dbac9267c1c06a205ad8bb4bd027c0ace7f7
Author: Avi Kivity <avi at qumranet.com>
Date: Thu Apr 3 12:02:21 2008 +0300
KVM: MMU: Only mark_page_accessed() if the page was accessed by the guest
If the accessed bit is not set, the guest has never accessed this page
(at least through this spte), so there's no need to mark the page
accessed. This provides more accurate data for the eviction algortithm.
Noted by Andrea Arcangeli.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit d39f13b0da7fa7f705fbe6c80995205d0380bc7a
Author: Izik Eidus <izike at qumranet.com>
Date: Sun Mar 30 16:01:25 2008 +0300
KVM: add vm refcounting
the main purpose of adding this functions is the abilaty to release the
spinlock that protect the kvm list while still be able to do operations
on a specific kvm in a safe way.
Signed-off-by: Izik Eidus <izike at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 9c20456a32ce9e82ccda55e12c10016b181d85e5
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Tue Apr 1 16:44:56 2008 +0200
KVM: function declaration parameter name cleanup
The kvm_host.h file for x86 declares the functions kvm_set_cr[0348]. In the
header file their second parameter is named cr0 in all cases. This patch
renames the parameters so that they match the function name.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 3d45830c2b11a9d756faae161742b7d1ec417f7e
Author: Avi Kivity <avi at qumranet.com>
Date: Tue Mar 25 11:26:13 2008 +0200
KVM: Free apic access page on vm destruction
Noticed by Marcelo Tosatti.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 3ee16c814511cd58f956b47b9c7654f57f674688
Author: Izik Eidus <izike at qumranet.com>
Date: Sun Mar 30 15:17:21 2008 +0300
KVM: MMU: allow the vm to shrink the kvm mmu shadow caches
Allow the Linux memory manager to reclaim memory in the kvm shadow cache.
Signed-off-by: Izik Eidus <izike at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 3200f405a1e8e06c8634f11d33614455baa4e6be
Author: Marcelo Tosatti <marcelo at kvack.org>
Date: Sat Mar 29 20:17:59 2008 -0300
KVM: MMU: unify slots_lock usage
Unify slots_lock acquision around vcpu_run(). This is simpler and less
error-prone.
Also fix some callsites that were not grabbing the lock properly.
[avi: drop slots_lock while in guest mode to avoid holding the lock
for indefinite periods]
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 25c5f225beda4fbea878ed8b6203ab4ecc7de2d1
Author: Sheng Yang <sheng.yang at intel.com>
Date: Fri Mar 28 13:18:56 2008 +0800
KVM: VMX: Enable MSR Bitmap feature
MSR Bitmap controls whether the accessing of an MSR causes VM Exit.
Eliminating exits on automatically saved and restored MSRs yields a
small performance gain.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e976a2b997fc4ad70ccc53acfe62811c4aaec851
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Mar 25 18:47:46 2008 +0100
s390: KVM guest: virtio device support, and kvm hypercalls
This patch implements kvm guest kernel support for paravirtualized devices
and contains two parts:
o a basic virtio stub using virtio_ring and external interrupts and hypercalls
o full hypercall implementation in kvm_para.h
Currently we dont have PCI on s390. Making virtio_pci usable for s390 seems
more complicated that providing an own stub. This virtio stub is similar to
the lguest one, the memory for the descriptors and the device detection is made
via additional mapped memory on top of the guest storage. We use an external
interrupt with extint code 0x2603 for host->guest notification.
The hypercall definition uses the diag instruction for issuing a hypercall. The
parameters are written in R2-R7, the hypercall number is written in R1. This is
similar to the system call ABI (svc) which can use R1 for the number and R2-R6
for the parameters.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit fa5877439d5a062d91c3abd5a690483bbdb4268e
Author: Carsten Otte <cotte at de.ibm.com>
Date: Tue Mar 25 18:47:44 2008 +0100
s390: KVM guest: detect when running on kvm
This patch adds functionality to detect if the kernel runs under the KVM
hypervisor. A macro MACHINE_IS_KVM is exported for device drivers. This
allows drivers to skip device detection if the systems runs non-virtualized.
We also define a preferred console to avoid having the ttyS0, which is a line
mode only console.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 85f8fffe3c2ab13f13526c46b5471fc22e98ccfe
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Mar 25 18:47:41 2008 +0100
KVM: s390: update maintainers
This patch adds an entry for kvm on s390 to the MAINTAINERS file :-). We intend
to push all patches regarding this via Avi's kvm.git.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 5ecee4ba4eb2ada7ece7c41eb08cf7bc51b579e2
Author: Carsten Otte <cotte at de.ibm.com>
Date: Tue Mar 25 18:47:38 2008 +0100
KVM: s390: API documentation
This patch adds Documentation/s390/kvm.txt, which describes specifics of kvm's
user interface that are unique to s390 architecture.
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 77b455f1bcfa0fddb31b8e6f9f2adc246acb4216
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Mar 25 18:47:36 2008 +0100
KVM: s390: add kvm to kconfig on s390
This patch adds the virtualization submenu and the kvm option to the kernel
config. It also defines HAVE_KVM for 64bit kernels.
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e28acfea5dd9dbc67c2594cbefc140129dbd0e3f
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Mar 25 18:47:34 2008 +0100
KVM: s390: intercepts for diagnose instructions
This patch introduces interpretation of some diagnose instruction intercepts.
Diagnose is our classic architected way of doing a hypercall. This patch
features the following diagnose codes:
- vm storage size, that tells the guest about its memory layout
- time slice end, which is used by the guest to indicate that it waits
for a lock and thus cannot use up its time slice in a useful way
- ipl functions, which a guest can use to reset and reboot itself
In order to implement ipl functions, we also introduce an exit reason that
causes userspace to perform various resets on the virtual machine. All resets
are described in the principles of operation book, except KVM_S390_RESET_IPL
which causes a reboot of the machine.
Acked-by: Martin Schwidefsky <martin.schwidefsky at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 5288fbf0ef041ba0e8b4dcb2df4536b5e3a48b32
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Mar 25 18:47:31 2008 +0100
KVM: s390: interprocessor communication via sigp
This patch introduces in-kernel handling of _some_ sigp interprocessor
signals (similar to ipi).
kvm_s390_handle_sigp() decodes the sigp instruction and calls individual
handlers depending on the operation requested:
- sigp sense tries to retrieve information such as existence or running state
of the remote cpu
- sigp emergency sends an external interrupt to the remove cpu
- sigp stop stops a remove cpu
- sigp stop store status stops a remote cpu, and stores its entire internal
state to the cpus lowcore
- sigp set arch sets the architecture mode of the remote cpu. setting to
ESAME (s390x 64bit) is accepted, setting to ESA/S390 (s390, 31 or 24 bit) is
denied, all others are passed to userland
- sigp set prefix sets the prefix register of a remote cpu
For implementation of this, the stop intercept indication starts to get reused
on purpose: a set of action bits defines what to do once a cpu gets stopped:
ACTION_STOP_ON_STOP really stops the cpu when a stop intercept is recognized
ACTION_STORE_ON_STOP stores the cpu status to lowcore when a stop intercept is
recognized
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 453423dce2785b8e22077e3b3eeecb4f60fe3470
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Mar 25 18:47:29 2008 +0100
KVM: s390: intercepts for privileged instructions
This patch introduces in-kernel handling of some intercepts for privileged
instructions:
handle_set_prefix() sets the prefix register of the local cpu
handle_store_prefix() stores the content of the prefix register to memory
handle_store_cpu_address() stores the cpu number of the current cpu to memory
handle_skey() just decrements the instruction address and retries
handle_stsch() delivers condition code 3 "operation not supported"
handle_chsc() same here
handle_stfl() stores the facility list which contains the
capabilities of the cpu
handle_stidp() stores cpu type/model/revision and such
handle_stsi() stores information about the system topology
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ba5c1e9b6ceebdc39343cc03eb39f077abd3c571
Author: Carsten Otte <cotte at de.ibm.com>
Date: Tue Mar 25 18:47:26 2008 +0100
KVM: s390: interrupt subsystem, cpu timer, waitpsw
This patch contains the s390 interrupt subsystem (similar to in kernel apic)
including timer interrupts (similar to in-kernel-pit) and enabled wait
(similar to in kernel hlt).
In order to achieve that, this patch also introduces intercept handling
for instruction intercepts, and it implements load control instructions.
This patch introduces an ioctl KVM_S390_INTERRUPT which is valid for both
the vm file descriptors and the vcpu file descriptors. In case this ioctl is
issued against a vm file descriptor, the interrupt is considered floating.
Floating interrupts may be delivered to any virtual cpu in the configuration.
The following interrupts are supported:
SIGP STOP - interprocessor signal that stops a remote cpu
SIGP SET PREFIX - interprocessor signal that sets the prefix register of a
(stopped) remote cpu
INT EMERGENCY - interprocessor interrupt, usually used to signal need_reshed
and for smp_call_function() in the guest.
PROGRAM INT - exception during program execution such as page fault, illegal
instruction and friends
RESTART - interprocessor signal that starts a stopped cpu
INT VIRTIO - floating interrupt for virtio signalisation
INT SERVICE - floating interrupt for signalisations from the system
service processor
struct kvm_s390_interrupt, which is submitted as ioctl parameter when injecting
an interrupt, also carrys parameter data for interrupts along with the interrupt
type. Interrupts on s390 usually have a state that represents the current
operation, or identifies which device has caused the interruption on s390.
kvm_s390_handle_wait() does handle waitpsw in two flavors: in case of a
disabled wait (that is, disabled for interrupts), we exit to userspace. In case
of an enabled wait we set up a timer that equals the cpu clock comparator value
and sleep on a wait queue.
[christian: change virtio interrupt to 0x2603]
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 8f2abe6a1e525e878bdf58f68ccd146d543fde84
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Mar 25 18:47:23 2008 +0100
KVM: s390: sie intercept handling
This path introduces handling of sie intercepts in three flavors: Intercepts
are either handled completely in-kernel by kvm_handle_sie_intercept(),
or passed to userspace with corresponding data in struct kvm_run in case
kvm_handle_sie_intercept() returns -ENOTSUPP.
In case of partial execution in kernel with the need of userspace support,
kvm_handle_sie_intercept() may choose to set up struct kvm_run and return
-EREMOTE.
The trivial intercept reasons are handled in this patch:
handle_noop() just does nothing for intercepts that don't require our support
at all
handle_stop() is called when a cpu enters stopped state, and it drops out to
userland after updating our vcpu state
handle_validity() faults in the cpu lowcore if needed, or passes the request
to userland
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b0c632db637d68ad39d9f97f452ce176253f5f4e
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Tue Mar 25 18:47:20 2008 +0100
KVM: s390: arch backend for the kvm kernel module
This patch contains the port of Qumranet's kvm kernel module to IBM zSeries
(aka s390x, mainframe) architecture. It uses the mainframe's virtualization
instruction SIE to run virtual machines with up to 64 virtual CPUs each.
This port is only usable on 64bit host kernels, and can only run 64bit guest
kernels. However, running 31bit applications in guest userspace is possible.
The following source files are introduced by this patch
arch/s390/kvm/kvm-s390.c similar to arch/x86/kvm/x86.c, this implements all
arch callbacks for kvm. __vcpu_run calls back into
sie64a to enter the guest machine context
arch/s390/kvm/sie64a.S assembler function sie64a, which enters guest
context via SIE, and switches world before and after that
include/asm-s390/kvm_host.h contains all vital data structures needed to run
virtual machines on the mainframe
include/asm-s390/kvm.h defines kvm_regs and friends for user access to
guest register content
arch/s390/kvm/gaccess.h functions similar to uaccess to access guest memory
arch/s390/kvm/kvm-s390.h header file for kvm-s390 internals, extended by
later patches
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 8a88ac6183975c73c65b45f365f6f3b875c1348b
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Mar 25 18:47:15 2008 +0100
s390: KVM preparation: address of the 64bit extint parm in lowcore
The address 0x11b8 is used by z/VM for pfault and diag 250 I/O to
provide a 64 bit extint parameter. virtio uses the same address, so
its time to update the lowcore structure.
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 5b7baf05783b1ac97a510243d7e82293416a7cf6
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Mar 25 18:47:12 2008 +0100
s390: KVM preparation: host memory management changes for s390 kvm
This patch changes the s390 memory management defintions to use the pgste field
for dirty and reference bit tracking of host and guest code. Usually on s390,
dirty and referenced are tracked in storage keys, which belong to the physical
page. This changes with virtualization: The guest and host dirty/reference bits
are defined to be the logical OR of the values for the mapping and the physical
page. This patch implements the necessary changes in pgtable.h for s390.
There is a common code change in mm/rmap.c, the call to
page_test_and_clear_young must be moved. This is a no-op for all
architecture but s390. page_referenced checks the referenced bits for
the physiscal page and for all mappings:
o The physical page is checked with page_test_and_clear_young.
o The mappings are checked with ptep_test_and_clear_young and friends.
Without pgstes (the current implementation on Linux s390) the physical page
check is implemented but the mapping callbacks are no-ops because dirty
and referenced are not tracked in the s390 page tables. The pgstes introduces
guest and host dirty and reference bits for s390 in the host mapping. These
mapping must be checked before page_test_and_clear_young resets the reference
bit.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Acked-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 402b08622d9ac6e32e25289573272e0f21bb58a7
Author: Carsten Otte <cotte at de.ibm.com>
Date: Tue Mar 25 18:47:10 2008 +0100
s390: KVM preparation: provide hook to enable pgstes in user pagetable
The SIE instruction on s390 uses the 2nd half of the page table page to
virtualize the storage keys of a guest. This patch offers the s390_enable_sie
function, which reorganizes the page tables of a single-threaded process to
reserve space in the page table:
s390_enable_sie makes sure that the process is single threaded and then uses
dup_mm to create a new mm with reorganized page tables. The old mm is freed
and the process has now a page status extended field after every page table.
Code that wants to exploit pgstes should SELECT CONFIG_PGSTE.
This patch has a small common code hit, namely making dup_mm non-static.
Edit (Carsten): I've modified Martin's patch, following Jeremy Fitzhardinge's
review feedback. Now we do have the prototype for dup_mm in
include/linux/sched.h. Following Martin's suggestion, s390_enable_sie() does now
call task_lock() to prevent race against ptrace modification of mm_users.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Acked-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 37817f2982d0f559f90cecc66e150dd9d2c2df05
Author: Izik Eidus <izike at qumranet.com>
Date: Mon Mar 24 23:14:53 2008 +0200
KVM: x86: hardware task switching support
This emulates the x86 hardware task switch mechanism in software, as it is
unsupported by either vmx or svm. It allows operating systems which use it,
like freedos, to run as kvm guests.
Signed-off-by: Izik Eidus <izike at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 2e4d2653497856b102c90153f970c9e344ba96c6
Author: Izik Eidus <izike at qumranet.com>
Date: Mon Mar 24 19:38:34 2008 +0200
KVM: x86: add functions to get the cpl of vcpu
Signed-off-by: Izik Eidus <izike at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 4c9fc8ef501790732ed035585b491756b75ea4c6
Author: Avi Kivity <avi at qumranet.com>
Date: Mon Mar 24 18:15:14 2008 +0200
KVM: VMX: Add module option to disable flexpriority
Useful for debugging.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 268fe02ae058c0c5e84ad678d67e5d7b013e664f
Author: Avi Kivity <avi at qumranet.com>
Date: Sun Mar 23 18:36:30 2008 +0200
KVM: no longer EXPERIMENTAL
Long overdue.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 0b49ea8659fd3b5005823e02d2d0a775521770e5
Author: Avi Kivity <avi at qumranet.com>
Date: Sun Mar 23 15:06:23 2008 +0200
KVM: MMU: Introduce and use spte_to_page()
Encapsulate the pte mask'n'shift in a function.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 855149aaa90016c576a0e684361a34f8047307d0
Author: Izik Eidus <izike at qumranet.com>
Date: Thu Mar 20 18:17:24 2008 +0200
KVM: MMU: fix dirty bit setting when removing write permissions
When mmu_set_spte() checks if a page related to spte should be release as
dirty or clean, it check if the shadow pte was writeble, but in case
rmap_write_protect() is called called it is possible for shadow ptes that were
writeble to become readonly and therefor mmu_set_spte will release the pages
as clean.
This patch fix this issue by marking the page as dirty inside
rmap_write_protect().
Signed-off-by: Izik Eidus <izike at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 69a9f69bb24d6d3dbf3d2ba542ddceeda40536d5
Author: Avi Kivity <avi at qumranet.com>
Date: Fri Mar 21 12:38:23 2008 +0200
KVM: Move some x86 specific constants and structures to include/asm-x86
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 947da53830690cbd77d7f2b625d0df1f161ffd54
Author: Avi Kivity <avi at qumranet.com>
Date: Tue Mar 18 11:05:52 2008 +0200
KVM: MMU: Set the accessed bit on non-speculative shadow ptes
If we populate a shadow pte due to a fault (and not speculatively due to a
pte write) then we can set the accessed bit on it, as we know it will be
set immediately on the next guest instruction. This saves a read-modify-write
operation.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 97646202bc3f190dfcb48a3d506ea2445717d392
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Wed Mar 12 18:10:45 2008 +0100
KVM: kvm.h: __user requires compiler.h
include/linux/kvm.h defines struct kvm_dirty_log to
[...]
union {
void __user *dirty_bitmap; /* one bit per page */
__u64 padding;
};
__user requires compiler.h to compile. Currently, this works on x86
only coincidentally due to other include files. This patch makes
kvm.h compile in all cases.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1e977aa12dd4f80688b1f243762212e75c6d7fe8
Author: Glauber Costa <gcosta at redhat.com>
Date: Mon Mar 17 16:08:40 2008 -0300
x86: KVM guest: disable clock before rebooting.
This patch writes 0 (actually, what really matters is that the
LSB is cleared) to the system time msr before shutting down
the machine for kexec.
Without it, we can have a random memory location being written
when the guest comes back
It overrides the functions shutdown, used in the path of kernel_kexec() (sys.c)
and crash_shutdown, used in the path of crash_kexec() (kexec.c)
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 3c62c62502bea24448d4e82aa1f33c7dbca61a32
Author: Glauber Costa <gcosta at redhat.com>
Date: Mon Mar 17 16:08:39 2008 -0300
x86: make native_machine_shutdown non-static
it will allow external users to call it. It is mainly
useful for routines that will override its machine_ops
field for its own special purposes, but want to call the
normal shutdown routine after they're done
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ed23dc6f5bc950ebbe683dd0bed1d5878230c171
Author: Glauber Costa <gcosta at redhat.com>
Date: Mon Mar 17 16:08:38 2008 -0300
x86: allow machine_crash_shutdown to be replaced
This patch a llows machine_crash_shutdown to
be replaced, just like any of the other functions
in machine_ops
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 096d14a3b57e4a87d27be09cc64b4f84660acd08
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Fri Feb 22 12:21:38 2008 -0500
x86: KVM guest: hypercall batching
Batch pte updates and tlb flushes in lazy MMU mode.
[avi:
- adjust to mmu_op
- helper for getting para_state without debug warnings]
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1da8a77bdc294acdc37e8504926383b86f72d6be
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Fri Feb 22 12:21:37 2008 -0500
x86: KVM guest: hypercall based pte updates and TLB flushes
Hypercall based pte updates are faster than faults, and also allow use
of the lazy MMU mode to batch operations.
Don't report the feature if two dimensional paging is enabled.
[avi:
- guest/host split
- fix 32-bit truncation issues
- adjust to mmu_op
- adjust to ->release_*() renamed
- add ->release_pud()]
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 2f333bcb4edd8daef99dabe4e7df8277af73cff1
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Fri Feb 22 12:21:37 2008 -0500
KVM: MMU: hypercall based pte updates and TLB flushes
Hypercall based pte updates are faster than faults, and also allow use
of the lazy MMU mode to batch operations.
Don't report the feature if two dimensional paging is enabled.
[avi:
- one mmu_op hypercall instead of one per op
- allow 64-bit gpa on hypercall
- don't pass host errors (-ENOMEM) to guest]
[akpm: warning fix on i386]
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 9f81128591ca1e9907f2e7a7b195e33232167d60
Author: Avi Kivity <avi at qumranet.com>
Date: Sun Mar 2 14:06:05 2008 +0200
KVM: Provide unlocked version of emulator_write_phys()
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 0cf1bfd2737f41e59f974a61eab11af206d2042a
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Fri Feb 22 12:21:36 2008 -0500
x86: KVM guest: add basic paravirt support
Add basic KVM paravirt support. Avoid vm-exits on IO delays.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit a28e4f5a621289fe0d9c8a461b0c256f9e17f3bc
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Fri Feb 22 12:21:36 2008 -0500
KVM: add basic paravirt support
Add basic KVM paravirt support. Avoid vm-exits on IO delays.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 308b0f239e8d6754b8b903d279e5b5b987e257ac
Author: Sheng Yang <sheng.yang at intel.com>
Date: Thu Mar 13 10:22:26 2008 +0800
KVM: Add reset support for in kernel PIT
Separate the reset part and prepare for reset support.
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e0f63cb9277b64850854aee301762beeeb463473
Author: Sheng Yang <sheng.yang at intel.com>
Date: Tue Mar 4 00:50:59 2008 +0800
KVM: Add save/restore supporting of in kernel PIT
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 7837699fa6d7adf81f26ab73a5f6897ea1ab9d6a
Author: Sheng Yang <sheng.yang at intel.com>
Date: Mon Jan 28 05:10:22 2008 +0800
KVM: In kernel PIT model
The patch moves the PIT model from userspace to kernel, and increases
the timer accuracy greatly.
[marcelo: make last_injected_time per-guest]
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Tested-and-Acked-by: Alex Davis <alex14641 at yahoo.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 4fcaa98267efc4d39ded9b0bc33c6b4a2f62fecd
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Mar 5 09:33:44 2008 +0200
KVM: Remove pointless desc_ptr #ifdef
The desc_struct changes left an unnecessary #ifdef; remove it.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 019960ae9933161c2809fa4ee608ba30d9639fd2
Author: Avi Kivity <avi at qumranet.com>
Date: Tue Mar 4 10:44:51 2008 +0200
KVM: VMX: Don't adjust tsc offset forward
Most Intel hosts have a stable tsc, and playing with the offset only
reduces accuracy. By limiting tsc offset adjustment only to forward updates,
we effectively disable tsc offset adjustment on these hosts.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b8688d51bbe4872fbcec751e04369606082ac610
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Mar 3 12:59:56 2008 -0800
KVM: replace remaining __FUNCTION__ occurances
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 71c4dfafc0932d92cc99c7e839d25174b0ce10a1
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Tue Feb 26 16:49:16 2008 +0100
KVM: detect if VCPU triple faults
In the current inject_page_fault path KVM only checks if there is another PF
pending and injects a DF then. But it has to check for a pending DF too to
detect a shutdown condition in the VCPU. If this is not detected the VCPU goes
to a PF -> DF -> PF loop when it should triple fault. This patch detects this
condition and handles it with an KVM_SHUTDOWN exit to userspace.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 3e4bb3ac9e0ada5df5f6729648d403ea9f071d10
Author: Xiantao Zhang <xiantao.zhang at intel.com>
Date: Mon Feb 25 18:52:20 2008 +0800
KVM: Use kzalloc to avoid allocating kvm_regs from kernel stack
Since the size of kvm_regs is too big to allocate from kernel stack on ia64,
use kzalloc to allocate it.
Signed-off-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 2d3ad1f40c841bd3e97d30d423eea53915d085dc
Author: Avi Kivity <avi at qumranet.com>
Date: Sun Feb 24 11:20:43 2008 +0200
KVM: Prefix control register accessors with kvm_ to avoid namespace pollution
Names like 'set_cr3()' look dangerously close to affecting the host.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 05da45583de9b383dc81dd695fe248431d6c9f2b
Author: Marcelo Tosatti <marcelo at kvack.org>
Date: Sat Feb 23 11:44:30 2008 -0300
KVM: MMU: large page support
Create large pages mappings if the guest PTE's are marked as such and
the underlying memory is hugetlbfs backed. If the largepage contains
write-protected pages, a large pte is not used.
Gives a consistent 2% improvement for data copies on ram mounted
filesystem, without NPT/EPT.
Anthony measures a 4% improvement on 4-way kernbench, with NPT.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 2e53d63acba75795aa226febd140f67c58c6a353
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Wed Feb 20 14:47:24 2008 -0500
KVM: MMU: ignore zapped root pagetables
Mark zapped root pagetables as invalid and ignore such pages during lookup.
This is a problem with the cr3-target feature, where a zapped root table fools
the faulting code into creating a read-only mapping. The result is a lockup
if the instruction can't be emulated.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Cc: Anthony Liguori <aliguori at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 847f0ad8cbfa70c1af6948025836dfbd9ed6da1e
Author: Alexander Graf <alex at csgraf.de>
Date: Thu Feb 21 12:11:01 2008 +0100
KVM: Implement dummy values for MSR_PERF_STATUS
Darwin relies on this and ceases to work without.
Signed-off-by: Alexander Graf <alex at csgraf.de>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 14af3f3c56103d8c3bb173c255ef5d89fb0c9350
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Feb 19 10:25:50 2008 -0800
KVM: sparse fixes for kvm/x86.c
In two case statements, use the ever popular 'i' instead of index:
arch/x86/kvm/x86.c:1063:7: warning: symbol 'index' shadows an earlier one
arch/x86/kvm/x86.c:1000:9: originally declared here
arch/x86/kvm/x86.c:1079:7: warning: symbol 'index' shadows an earlier one
arch/x86/kvm/x86.c:1000:9: originally declared here
Make it static.
arch/x86/kvm/x86.c:1945:24: warning: symbol 'emulate_ops' was not declared. Should it be static?
Drop the return statements.
arch/x86/kvm/x86.c:2878:2: warning: returning void-valued expression
arch/x86/kvm/x86.c:2944:2: warning: returning void-valued expression
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 4866d5e3d59c7831c7fa117c246a39165817db0d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Feb 19 10:32:02 2008 -0800
KVM: SVM: make iopm_base static
Fixes sparse warning as well.
arch/x86/kvm/svm.c:69:15: warning: symbol 'iopm_base' was not declared. Should it be static?
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 77cd337f2246ae72915538383e8f5a6b7ffb363d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Feb 19 10:43:11 2008 -0800
KVM: x86 emulator: fix sparse warnings in x86_emulate.c
Nesting __emulate_2op_nobyte inside__emulate_2op produces many shadowed
variable warnings on the internal variable _tmp used by both macros.
Change the outer macro to use __tmp.
Avoids a sparse warning like the following at every call site of __emulate_2op
arch/x86/kvm/x86_emulate.c:1091:3: warning: symbol '_tmp' shadows an earlier one
arch/x86/kvm/x86_emulate.c:1091:3: originally declared here
[18 more warnings suppressed]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit f11c3a8d84d7bf091bf963edd7104dd4ba6416c3
Author: Amit Shah <amit.shah at qumranet.com>
Date: Thu Feb 21 01:00:30 2008 +0530
KVM: Add stat counter for hypercalls
Signed-off-by: Amit Shah <amit.shah at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit a5f61300c489e334ddf99781a13a7f8d4b580781
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Feb 20 17:57:21 2008 +0200
KVM: Use x86's segment descriptor struct instead of private definition
The x86 desc_struct unification allows us to remove segment_descriptor.h.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ef2979bd98dac86ea6a4cd9bdd6820a466108017
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Feb 20 12:04:47 2008 +0200
KVM: Increase the number of user memory slots per vm
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit a988b910ef816ed57e1cecbec14e98e906453f91
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Feb 20 11:59:20 2008 +0200
KVM: Add API for determining the number of supported memory slots
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit edbe6c325da48e707a3b31310c5ff5783cf6c0be
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Feb 20 11:56:51 2008 +0200
KVM: Increase vcpu count to 16
With NPT support, scalability is much improved.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit f725230af9ea03f6cc6f4a90e87aa428df46ec19
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Feb 20 11:53:16 2008 +0200
KVM: Add API to retrieve the number of supported vcpus per vm
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 7a95727567f0991751c2db774a110b4f8080de7f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Feb 19 07:40:41 2008 -0800
KVM: x86 emulator: make register_address_increment and JMP_REL static inlines
Change jmp_rel() to a function as well.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e4706772ea46e57cf69a7140c40063a21884c8e0
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Feb 19 07:40:38 2008 -0800
KVM: x86 emulator: make register_address, address_mask static inlines
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ddcb2885e2902ebfc422eccd763b02c5ee22d68b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Feb 18 11:12:48 2008 -0800
KVM: x86 emulator: add ad_mask static inline
Replaces open-coded mask calculation in macros.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 790c73f6289a204f858ffdcbe4a2b38e91657ec6
Author: Glauber de Oliveira Costa <gcosta at redhat.com>
Date: Fri Feb 15 17:52:48 2008 -0200
x86: KVM guest: paravirtualized clocksource
This is the guest part of kvm clock implementation
It does not do tsc-only timing, as tsc can have deltas
between cpus, and it did not seem worthy to me to keep
adjusting them.
We do use it, however, for fine-grained adjustment.
Other than that, time comes from the host.
[randy dunlap: add missing include]
[randy dunlap: disallow on Voyager or Visual WS]
Signed-off-by: Glauber de Oliveira Costa <gcosta at redhat.com>
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 18068523d3a0b41fcee5b53cdb437a0ab4d65e4b
Author: Glauber de Oliveira Costa <gcosta at redhat.com>
Date: Fri Feb 15 17:52:47 2008 -0200
KVM: paravirtualized clocksource: host part
This is the host part of kvm clocksource implementation. As it does
not include clockevents, it is a fairly simple implementation. We
only have to register a per-vcpu area, and start writing to it periodically.
The area is binary compatible with xen, as we use the same shadow_info
structure.
[marcelo: fix bad_page on MSR_KVM_SYSTEM_TIME]
[avi: save full value of the msr, even if enable bit is clear]
[avi: clear previous value of time_page]
Signed-off-by: Glauber de Oliveira Costa <gcosta at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 24e09cbf480a72f9c952af4ca77b159503dca44b
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Feb 13 18:58:47 2008 +0100
KVM: SVM: enable LBR virtualization
This patch implements the Last Branch Record Virtualization (LBRV) feature of
the AMD Barcelona and Phenom processors into the kvm-amd module. It will only
be enabled if the guest enables last branch recording in the DEBUG_CTL MSR. So
there is no increased world switch overhead when the guest doesn't use these
MSRs.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Markus Rechberger <markus.rechberger at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit f65c229c3e7743c6654c16b9ec6248466b5eef21
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Feb 13 18:58:46 2008 +0100
KVM: SVM: allocate the MSR permission map per VCPU
This patch changes the kvm-amd module to allocate the SVM MSR permission map
per VCPU instead of a global map for all VCPUs. With this we have more
flexibility allowing specific guests to access virtualized MSRs. This is
required for LBR virtualization.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Markus Rechberger <markus.rechberger at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e6101a96c9efb74c98bba6322d4c5ea89e47e0fe
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Wed Feb 13 18:58:45 2008 +0100
KVM: SVM: let init_vmcb() take struct vcpu_svm as parameter
Change the parameter of the init_vmcb() function in the kvm-amd module from
struct vmcb to struct vcpu_svm.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Markus Rechberger <markus.rechberger at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 2e11384c2c6f1ce662b1e5b05ba49b216a052f2a
Author: Ryan Harper <ryanh at us.ibm.com>
Date: Mon Feb 11 10:26:38 2008 -0600
KVM: VMX: fix typo in VMX header define
Looking at Intel Volume 3b, page 148, table 20-11 and noticed
that the field name is 'Deliver' not 'Deliever'. Attached patch changes
the define name and its user in vmx.c
Signed-off-by: Ryan Harper <ryanh at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 709ddebf81cb40e3c36c6109a7892e8b93a09464
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Feb 7 13:47:45 2008 +0100
KVM: SVM: add support for Nested Paging
This patch contains the SVM architecture dependent changes for KVM to enable
support for the Nested Paging feature of AMD Barcelona and Phenom processors.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit fb72d1674d860b0c9ef9b66b7f4f01fe5b3d2c00
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Feb 7 13:47:44 2008 +0100
KVM: MMU: add TDP support to the KVM MMU
This patch contains the changes to the KVM MMU necessary for support of the
Nested Paging feature in AMD Barcelona and Phenom Processors.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit cc4b6871e771e76dc1de06adb8aed261a1c66be8
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Feb 7 13:47:43 2008 +0100
KVM: export the load_pdptrs() function to modules
The load_pdptrs() function is required in the SVM module for NPT support.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 4d9976bbdc09e08b69fc12fee2042c3528187b32
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Feb 7 13:47:42 2008 +0100
KVM: MMU: make the __nonpaging_map function generic
The mapping function for the nonpaging case in the softmmu does basically the
same as required for Nested Paging. Make this function generic so it can be
used for both.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1855267210e1a8c9d41fe3a3c7a0d42eca5fb7cd
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Feb 7 13:47:41 2008 +0100
KVM: export information about NPT to generic x86 code
The generic x86 code has to know if the specific implementation uses Nested
Paging. In the generic code Nested Paging is called Two Dimensional Paging
(TDP) to avoid confusion with (future) TDP implementations of other vendors.
This patch exports the availability of TDP to the generic x86 code.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 6c7dac72d5c7dc0e09512dce865398167be9a8f7
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Feb 7 13:47:40 2008 +0100
KVM: SVM: add module parameter to disable Nested Paging
To disable the use of the Nested Paging feature even if it is available in
hardware this patch adds a module parameter. Nested Paging can be disabled by
passing npt=0 to the kvm_amd module.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e3da3acdb32c1804a5c853feebcc037b7434076f
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Feb 7 13:47:39 2008 +0100
KVM: SVM: add detection of Nested Paging feature
Let SVM detect if the Nested Paging feature is available on the hardware.
Disable it to keep this patch series bisectable.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 33bd6a0b3e8baed6469c8e68ea1b16cb50c4f5af
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Feb 7 13:47:38 2008 +0100
KVM: SVM: move feature detection to hardware setup code
By moving the SVM feature detection from the each_cpu code to the hardware
setup code it runs only once. As an additional advance the feature check is now
available earlier in the module setup process.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 9457a712a2f464c4b21bb7f78998775c69673a0c
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Jan 31 14:57:40 2008 +0100
KVM: allow access to EFER in 32bit KVM
This patch makes the EFER register accessible on a 32bit KVM host. This is
necessary to boot 32 bit PAE guests under SVM.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 9f62e19a1107466b9e9501e23a9dd5acb81fdca1
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Jan 31 14:57:39 2008 +0100
KVM: VMX: unifdef the EFER specific code
To allow access to the EFER register in 32bit KVM the EFER specific code has to
be exported to the x86 generic code. This patch does this in a backwards
compatible manner.
[avi: add check for EFER-less hosts]
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 50a37eb4e05efaa7bac6a948fd4db1a48c728b99
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Jan 31 14:57:38 2008 +0100
KVM: align valid EFER bits with the features of the host system
This patch aligns the bits the guest can set in the EFER register with the
features in the host processor. Currently it lets EFER.NX disabled if the
processor does not support it and enables EFER.LME and EFER.LMA only for KVM on
64 bit hosts.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit f2b4b7ddf633ffa24ce7c89c9e0d8a06463484e3
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Jan 31 14:57:37 2008 +0100
KVM: make EFER_RESERVED_BITS configurable for architecture code
This patch give the SVM and VMX implementations the ability to add some bits
the guest can set in its EFER register.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 0aac03f07b37da96e00371e66973d5ffaae578a4
Author: Andrea Arcangeli <andrea at qumranet.com>
Date: Wed Jan 30 19:57:35 2008 +0100
KVM: Disable pagefaults during copy_from_user_inatomic()
With CONFIG_PREEMPT=n, this is needed in order to disable the fault-in
code from sleeping.
Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 31bb117eb48f2629e030ca547ca89a1c34150183
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Mon Jan 28 17:42:34 2008 -0600
KVM: Use CONFIG_PREEMPT_NOTIFIERS around struct preempt_notifier
This allows kvm_host.h to be #included even when struct preempt_notifier is
undefined. This is needed to build ppc asm-offsets.h.
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 2384d2b32640839a4d4d260ca7c5aa4edbf68d91
Author: Sheng Yang <sheng.yang at intel.com>
Date: Thu Jan 17 15:14:33 2008 +0800
KVM: VMX: Enable Virtual Processor Identification (VPID)
To allow TLB entries to be retained across VM entry and VM exit, the VMM
can now identify distinct address spaces through a new virtual-processor ID
(VPID) field of the VMCS.
[avi: drop vpid_sync_all()]
[avi: add "cc" to asm constraints]
Signed-off-by: Sheng Yang <sheng.yang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit adb1ff46754a87f3f6c9e7ee0a92f9a8a183bb38
Author: Avi Kivity <avi at qumranet.com>
Date: Thu Jan 24 15:13:08 2008 +0200
KVM: Limit vcpu mmap size to one page on non-x86
The second page is only needed on archs that support pio.
Noted by Carsten Otte.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit d196e343361c229496adeda42335856da9d057de
Author: Avi Kivity <avi at qumranet.com>
Date: Thu Jan 24 11:44:11 2008 +0200
KVM: MMU: Decouple mmio from shadow page tables
Currently an mmio guest pte is encoded in the shadow pagetable as a
not-present trapping pte, with the SHADOW_IO_MARK bit set. However
nothing is ever done with this information, so maintaining it is a
useless complication.
This patch moves the check for mmio to before shadow ptes are instantiated,
so the shadow code is never invoked for ptes that reference mmio. The code
is simpler, and with future work, can be made to handle mmio concurrently.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1d6ad2073e5354912291277c606a57fd37330f04
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Jan 23 22:26:09 2008 +0200
KVM: x86 emulator: group decoding for group 1 instructions
Opcodes 0x80-0x83
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 09566765efd034feba45611f9d0ae9a702f8bb1d
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Jan 23 18:14:23 2008 +0200
KVM: Only x86 has pio
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 5c5027425ec23ded452879ee5d0775a9a90fb9bf
Author: Jan Engelhardt <jengelh at computergmbh.de>
Date: Tue Jan 22 20:46:14 2008 +0100
KVM: constify function pointer tables
Signed-off-by: Jan Engelhardt <jengelh at computergmbh.de>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit d95058a1a7170ae2af2939cbdab0ff5d5e005238
Author: Avi Kivity <avi at qumranet.com>
Date: Fri Jan 18 13:36:50 2008 +0200
KVM: x86 emulator: add group 7 decoding
This adds group decoding for opcode 0x0f 0x01 (group 7).
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit fd60754e4ffa992586346dd56451723b4c096626
Author: Avi Kivity <avi at qumranet.com>
Date: Fri Jan 18 13:12:26 2008 +0200
KVM: x86 emulator: Group decoding for groups 4 and 5
Add group decoding support for opcode 0xfe (group 4) and 0xff (group 5).
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 7d858a19efe5844a98e060931570359b70dea6d1
Author: Avi Kivity <avi at qumranet.com>
Date: Fri Jan 18 12:58:04 2008 +0200
KVM: x86 emulator: Group decoding for group 3
This adds group decoding support for opcodes 0xf6, 0xf7 (group 3).
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 43bb19cd3398d3f544d8e2d6ed6c5c5d7b4e5819
Author: Avi Kivity <avi at qumranet.com>
Date: Fri Jan 18 12:46:50 2008 +0200
KVM: x86 emulator: group decoding for group 1A
This adds group decode support for opcode 0x8f.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e09d082c03e137015bc0a17ca77e4b9dca08a5d7
Author: Avi Kivity <avi at qumranet.com>
Date: Fri Jan 18 12:38:59 2008 +0200
KVM: x86 emulator: add support for group decoding
Certain x86 instructions use bits 3:5 of the byte following the opcode as an
opcode extension, with the decode sometimes depending on bits 6:7 as well.
Add support for this in the main decoding table rather than an ad-hock
adaptation per opcode.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1ae0a13def678876b9acfb5ac1e2cf7d5d45a60d
Author: Dong, Eddie <eddie.dong at intel.com>
Date: Mon Jan 7 13:20:25 2008 +0200
KVM: MMU: Simplify hash table indexing
Signed-off-by: Yaozu (Eddie) Dong <eddie.dong at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 489f1d6526ab68ca1842398fa3ae95c597fe3d32
Author: Dong, Eddie <eddie.dong at intel.com>
Date: Mon Jan 7 11:14:20 2008 +0200
KVM: MMU: Update shadow ptes on partial guest pte writes
A guest partial guest pte write will leave shadow_trap_nonpresent_pte
in spte, which generates a vmexit at the next guest access through that pte.
This patch improves this by reading the full guest pte in advance and thus
being able to update the spte and eliminate the vmexit.
This helps pae guests which use two 32-bit writes to set a single 64-bit pte.
[truncation fix by Eric]
Signed-off-by: Yaozu (Eddie) Dong <eddie.dong at intel.com>
Signed-off-by: Feng (Eric) Liu <eric.e.liu at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 7cf069955f2f0b95fed6a8b1a61ef598a3df0f4e
Author: David S. Miller <davem at davemloft.net>
Date: Sun Apr 27 00:25:30 2008 -0700
sparc64: Kill bogus RT_ALIGNEDSZ macro from signal.c
The structure has to be 8-byte aligned in size, so
this macro is just noise.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3ade11601f4a3a38d6cd3675ccc87bf11e251915
Author: Robert Reif <reif at earthlink.net>
Date: Sat Apr 26 23:10:19 2008 -0700
sparc: sunzilog.c remove unused argument
Remove unused argument in function call.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 403ae52ac047eb339f2b7e8cdf93a3b8077914db
Author: Robert Reif <reif at earthlink.net>
Date: Sat Apr 26 22:29:43 2008 -0700
sparc: fix drivers/video/tcx.c warning
Fix compile warning:
CC drivers/video/tcx.o
drivers/video/tcx.c: In function ‘tcx_init_one’:
drivers/video/tcx.c:477: warning: format ‘%lx’ expects type ‘long
unsigned int’, but argument 4 has type ‘resource_size_t’
This was the only sparc driver to use the resource directly in the
printk so I changed it to physbase like the other drivers.
Boot tested on SS4.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5da496e4b90626784a82803682e186a8e67222a0
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 26 21:07:35 2008 -0700
sparc64: Kill unused local ISA bus layer.
No more drivers use this, and therefore it can die.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9c1a5077fdca99356c891af37931e537dea874f5
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 26 21:02:21 2008 -0700
input: Rewrite sparcspkr device probing.
Remove all dependencies on EBUS and ISA bus layers, which we'd like to
remove as they are superfluous.
While we're here, add support for proper frequency changing on BBC
beep devices. Unlike the comments that were here, this device can
in fact use a programmable frequency.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit dc8ca2a111c10f031346f6f8f82640d6bc0dd347
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 26 20:59:52 2008 -0700
sparc64: Do not ignore 'pmu' device ranges.
I must have disabled this due to other bugs which were fixed over
time. And this is needed in order for child devices of "pmu"
to get proper resource values.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0eb78f0b1a0f61b292380028b0debd5af7b3838a
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 26 03:35:02 2008 -0700
sparc64: Kill ISA_FLOPPY_WORKS code.
This never was enabled, I could never get it working, and if anyone
wants to try and get it's very easy to reference this code in the
history.
It's the only thing referencing the silly ISA device layer in the
sparc64 tree. OF device layer infrastructure is what should be used
for these things.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 09337f501ebdd224cd69df6d168a5c4fe75d86fa
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 26 03:17:12 2008 -0700
sparc64: Kill CONFIG_SPARC32_COMPAT
It's completely superfluous, CONFIG_COMPAT is sufficient.
What this used to be is an umbrella for enabling code shared
by all 32-bit compat binary support types. But with the
removal of SunOS and Solaris support, the only one left is
Linux 32-bit ELF.
Update defconfig.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 05d515ef3d14eb95ffe9239ec1b8a03b24fa8469
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 26 03:07:34 2008 -0700
sparc64: Cleanups and corrections for arch/sparc64/Kconfig
Refer to chip as "SPARC" throughout.
Say 32-bit SPARC and 64-bit SPARC rather than mentioning specific
chips such like UltraSPARC, as appropriate.
Remove non-sense help text referring to things that will never appear
on a SPARC system, such as EISA busses etc.
Use "help" instead of "--help--"
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 227c3311786dbe64cb221e63d53817f98240e587
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 26 02:19:18 2008 -0700
sparc64: Fix wedged irq regression.
Kernel bugzilla 10273
As reported by Jos van der Ende, ever since commit
5a606b72a4309a656cd1a19ad137dc5557c4b8ea ("[SPARC64]: Do not ACK an
INO if it is disabled or inprogress.") sun4u interrupts
can get stuck.
What this changset did was add the following conditional to
the various IRQ chip ->enable() handlers on sparc64:
if (unlikely(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
return;
which is correct, however it means that special care is needed
in the ->enable() method.
Specifically we must put the interrupt into IDLE state during
an enable, or else it might never be sent out again.
Setting the INO interrupt state to IDLE resets the state machine,
the interrupt input to the INO is retested by the hardware, and
if an interrupt is being signalled by the device, the INO
moves back into TRANSMIT state, and an interrupt vector is sent
to the cpu.
The two sun4v IRQ chip handlers were already doing this properly,
only sun4u got it wrong.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 20430214cc0073dc7e817b032e32ae2ae54b4911
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Sun Apr 27 00:10:11 2008 -0400
Input: xpad - fix build failure
If both CONFIG_JOYSTICK_XPAD_FF and CONFIG_JOYSTICK_XPAD_LEDS are unset
xpad_bulk_out is not defined and build fails. Move it out of the #ifdef
block so it is always defined.
Reported-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 7f424a8b08c26dc14ac5c17164014539ac9a5c65
Author: Peter Zijlstra <peterz at infradead.org>
Date: Fri Apr 25 17:39:01 2008 +0200
fix idle (arch, acpi and apm) and lockdep
OK, so 25-mm1 gave a lockdep error which made me look into this.
The first thing that I noticed was the horrible mess; the second thing I
saw was hacks like: 71e93d15612c61c2e26a169567becf088e71b8ff
The problem is that arch idle routines are somewhat inconsitent with
their IRQ state handling and instead of fixing _that_, we go paper over
the problem.
So the thing I've tried to do is set a standard for idle routines and
fix them all up to adhere to that. So the rules are:
idle routines are entered with IRQs disabled
idle routines will exit with IRQs enabled
Nearly all already did this in one form or another.
Merge the 32 and 64 bit bits so they no longer have different bugs.
As for the actual lockdep warning; __sti_mwait() did a plainly un-annotated
irq-enable.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Tested-by: Bob Copeland <me at bobcopeland.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 5f0b2976cb2b62668a076f54419c24b8ab677167
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Mon Apr 14 16:08:25 2008 -0700
x86: add pci=check_enable_amd_mmconf and dmi check
so will disable that feature by default, and only enable that via
pci=check_enable_amd_mmconf or for system match with dmi table.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit e8ee6f0ae5cd860e8e6c02807edfa3c1fa01bcb5
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Sun Apr 13 01:41:58 2008 -0700
x86: work around io allocation overlap of HT links
normally BIOSes assign io/mmio range to different HT links without
overlapping, even same node same link should get non overlapping
entries.
but Rafael L. Wysocki's buggy BIOS creates a link with overlapping
entries for mmio and io:
node 0 link 0: io port [1000, ffffff]
node 0 link 0: mmio [e0000000, efffffff]
node 0 link 0: mmio [a0000, bffff]
node 0 link 0: mmio [80000000, ffffffff]
try to merge them and we will get:
bus: [00, ff] on node 0 link 0
bus: 00 index 0 io port: [0, ffff]
bus: 00 index 1 mmio: [80000000, fcffffffff]
bus: 00 index 2 mmio: [a0000, bffff]
so later we will reduce the chance to assign used resource to
unassigned device.
Reported-by: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Tested-by: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit cbf9bd603ab1fc4d2ecb1c6a4b7bd1cc50a7e82a
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Tue Feb 19 03:21:06 2008 -0800
acpi: get boot_cpu_id as early for k8_scan_nodes
[mingo at elte.hu: split from "x86_64: get boot_cpu_id as early for k8_scan_nodes]
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4cf19463745fad81ef2eed3e4e0038da5fd153f8
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Fri Apr 11 15:14:52 2008 -0700
x86_64: don't need set default res if only have one root bus
if there's only one root bus there's no need to split resources.
This patch fixes the issue described at:
http://lkml.org/lkml/2008/4/10/304
Reported-and-bisected-by: Rafael J. Wysocki <rjw at sisk.pl>
Tested-by: Rafael J. Wysocki <rjw at sisk.pl>
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 6e184f299d696203bc40545b9db216089d88bef7
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Thu Mar 6 01:15:31 2008 -0800
x86: double check the multi root bus with fam10h mmconf
some bioses give same range to mmconf for fam10h msr, and mmio for node/link.
fam10h msr will overide mmio for node/link.
so we can not assign range to devices under node/link for unassigned resources.
this patch will take range out from the mmio for node/link
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 30a18d6c3f1e774de656ebd8ff219d53e2ba4029
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Tue Feb 19 03:21:20 2008 -0800
x86: multi pci root bus with different io resource range, on 64-bit
scan AMD opteron io/mmio routing to make sure every pci root bus get correct
resource range. Thus later pci scan could assign correct resource to device
with unassigned resource.
this can fix a system without _CRS for multi pci root bus.
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 35ddd068fb94b187e94a3fc497ccecf27bdda9ae
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Tue Feb 19 03:15:08 2008 -0800
x86: use bus conf in NB conf fun1 to get bus range on, on 64-bit
... so we use the same code with Quad core cpu as old opteron.
This patch is useful when acpi=off or _PXM is not there in DSDT.
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 871d5f8dd0f7647f03facd4cb79485938d1b61ab
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Tue Feb 19 03:20:09 2008 -0800
x86: get mp_bus_to_node early
Currently, on an amd k8 system with multi ht chains, the numa_node of
pci devices under /sys/devices/pci0000:80/* is always 0, even if that
chain is on node 1 or 2 or 3.
Workaround: pcibus_to_node(bus) is used when we want to get the node that
pci_device is on.
In struct device, we already have numa_node member, and we could use
dev_to_node()/set_dev_node() to get and set numa_node in the device.
set_dev_node is called in pci_device_add() with pcibus_to_node(bus),
and pcibus_to_node uses bus->sysdata for nodeid.
The problem is when pci_add_device is called, bus->sysdata is not assigned
correct nodeid yet. The result is that numa_node will always be 0.
pcibios_scan_root and pci_scan_root could take sysdata. So we need to get
mp_bus_to_node mapping before these two are called, and thus
get_mp_bus_to_node could get correct node for sysdata in root bus.
In scanning of the root bus, all child busses will take parent bus sysdata.
So all pci_device->dev.numa_node will be assigned correctly and automatically.
Later we could use dev_to_node(&pci_dev->dev) to get numa_node, and we
could also could make other bus specific device get the correct numa_node
too.
This is an updated version of pci_sysdata and Jeff's pci_domain patch.
[ mingo at elte.hu: build fix ]
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit bb63b4219976d48ed6d22ac33c18be334fb5a78c
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Thu Feb 28 23:56:50 2008 -0800
x86 pci: remove checking type for mmconfig probe
doesn't need to check if it is type1 or type2, we can use raw_pci_ops
directly.
also make pci_direct_conf1 static again.
anyway is there system with type 2 and mmconf support?
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d2ebdf4bae4f1d7c30e71fd74f270ca4cda024fc
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Wed Feb 20 22:21:57 2008 -0800
x86: remove unneeded check in mmconf reject
mmconfig is only used to access extended configuration space.
so don't need to reject MFG that only have one entry and only handle bus0.
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 0d358f22f6c8f03ab215eee8d52b74f78cc3c7db
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Tue Feb 19 03:20:41 2008 -0800
driver core: try parent numa_node at first before using default
in the device_add, we try to use use parent numa_node.
need to make sure pci root bus's bridge device numa_node is set.
then we could use device->numa_node direclty for all device.
and don't need to call pcibus_to_node().
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d39398a333ddc490f842ccdd4b76c9674682aa5d
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Tue Feb 26 11:04:17 2008 -0800
x86: seperate mmconf for fam10h out from setup_64.c
Separate mmconf for fam10h out from setup_64.c
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d4c4d09415c48ecb621804cd4ec4a7a4d9a3662f
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Mon Feb 25 18:41:35 2008 -0800
x86: if acpi=off, force setting the mmconf for fam10h
some BIOS only let AMD fam 10h handle bus0, and nvidia mcp55/ck804
to handle other buses. at that case MCFG will cover all over them.
but with acpi=off, we can not use MCFG. this patch will double check
the busnbits, and if it is less handling 256 bues, and acpi=off
will forcely reset the mmconf in msr, so we still use mmconf in above case.
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7fd0da4085d5b012a6bdcbbd63da7ead9fc69ad4
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Tue Feb 19 03:13:02 2008 -0800
x86_64: check MSR to get MMCONFIG for AMD Family 10h
so even booting kernel with acpi=off or even MCFG is not there, we still can
use MMCONFIG.
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Cc: Andi Kleen <ak at suse.de>
Cc: Greg KH <greg at kroah.com>
Cc: "H. Peter Anvin" <hpa at zytor.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit eee206c3bfd0888f22ae9da3172487c61d72187d
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Tue Feb 19 03:13:43 2008 -0800
x86_64: check and enable MMCONFIG for AMD Family 10h
So we can use MMCONF when MMCONF is not set by BIOS
using TOP_MEM2 msr to get memory top, and try to scan fam10h mmio routing to
make sure the range is not conflicted with some prefetch MMIO that is above 4G.
(current only LinuxBIOS assign 64 bit mmio above 4G for some co-processor)
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 57741a779070e0b141b6148136b420c8d35ccbce
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Fri Feb 15 01:32:50 2008 -0800
x86_64: set cfg_size for AMD Family 10h in case MMCONFIG
reuse pci_cfg_space_size but skip check pci express and pci-x CAP ID.
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 05c58b8ac77639c17205f0b2a2d9eb1971dc47ad
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Fri Feb 15 01:30:14 2008 -0800
x86: mmconf enable mcfg early
Patch
"x86: validate against ACPI motherboard resources"
changed the mmconf init sequence, and init MMCONF late in acpi_init.
here change it back to old sequence:
1. check hostbridge in early
2. check MCFG with e820 in early
3. if all fail, will check MCFg with acpi _CRS in acpi_init
So we can make MCONF working again when acpi=off is set if hostbridge
support that.
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Greg KH <greg at kroah.com>
Cc: Greg KH <greg at kroah.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 0b64ad7123eb013c3de26750f2d4c356cd566231
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Fri Feb 15 01:28:41 2008 -0800
x86: clear pci_mmcfg_virt when mmcfg get rejected
For x86_64, need to free pci_mmcfg_virt, and iounmap some pointers
when MMCONF is not reserved in E820 or acpi _CRS and get rejected.
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Greg KH <greg at kroah.com>
Cc: Greg KH <greg at kroah.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 7752d5cfe3d11ca0bb9c673ec38bd78ba6578f8e
Author: Robert Hancock <hancockr at shaw.ca>
Date: Fri Feb 15 01:27:20 2008 -0800
x86: validate against acpi motherboard resources
This path adds validation of the MMCONFIG table against the ACPI reserved
motherboard resources. If the MMCONFIG table is found to be reserved in
ACPI, we don't bother checking the E820 table. The PCI Express firmware
spec apparently tells BIOS developers that reservation in ACPI is required
and E820 reservation is optional, so checking against ACPI first makes
sense. Many BIOSes don't reserve the MMCONFIG region in E820 even though
it is perfectly functional, the existing check needlessly disables MMCONFIG
in these cases.
In order to do this, MMCONFIG setup has been split into two phases. If PCI
configuration type 1 is not available then MMCONFIG is enabled early as
before. Otherwise, it is enabled later after the ACPI interpreter is
enabled, since we need to be able to execute control methods in order to
check the ACPI reserved resources. Presently this is just triggered off
the end of ACPI interpreter initialization.
There are a few other behavioral changes here:
- Validate all MMCONFIG configurations provided, not just the first one.
- Validate the entire required length of each configuration according to
the provided ending bus number is reserved, not just the minimum required
allocation.
- Validate that the area is reserved even if we read it from the chipset
directly and not from the MCFG table. This catches the case where the
BIOS didn't set the location properly in the chipset and has mapped it
over other things it shouldn't have.
This also cleans up the MMCONFIG initialization functions so that they
simply do nothing if MMCONFIG is not compiled in.
Based on an original patch by Rajesh Shah from Intel.
[akpm at linux-foundation.org: many fixes and cleanups]
Signed-off-by: Robert Hancock <hancockr at shaw.ca>
Signed-off-by: Andi Kleen <ak at suse.de>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Greg KH <greg at kroah.com>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Tested-by: Andi Kleen <ak at suse.de>
Cc: Rajesh Shah <rajesh.shah at intel.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Acked-by: Linus Torvalds <torvalds at linux-foundation.org>
Cc: Andi Kleen <ak at suse.de>
Cc: Greg KH <greg at kroah.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit c3bf9bc243092c53946fd6d8ebd6dc2f4e572d48
Merge: e3505dd50caf54e6f81f897cb347441409974a15 c2b91e2eec9678dbda274e906cc32ea8f711da3b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 14:04:32 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-bootmem-v3
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-bootmem-v3:
x86_64/mm: check and print vmemmap allocation continuous
x86_64: fix setup_node_bootmem to support big mem excluding with memmap
x86_64: make reserve_bootmem_generic() use new reserve_bootmem()
mm: allow reserve_bootmem() cross nodes
mm: offset align in alloc_bootmem()
mm: fix alloc_bootmem_core to use fast searching for all nodes
mm: make mem_map allocation continuous
commit e3505dd50caf54e6f81f897cb347441409974a15
Merge: 9b79ed952bd7344d40152f8a560ad8a0d93f3886 f5093913c0b5b93e3ccafd39d056e76557169ced
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 14:03:54 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kbuild: scripts/Makefile.modpost typo fix
kbuild: soften MODULE_LICENSE check
commit c2b91e2eec9678dbda274e906cc32ea8f711da3b
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Sat Apr 12 01:19:24 2008 -0700
x86_64/mm: check and print vmemmap allocation continuous
On big systems with lots of memory, don't print out too much during
bootup, and make it easy to find if it is continuous.
on 256G 8 sockets system will get
[ffffe20000000000-ffffe20002bfffff] PMD -> [ffff810001400000-ffff810003ffffff] on node 0
[ffffe2001c700000-ffffe2001c7fffff] potential offnode page_structs
[ffffe20002c00000-ffffe2001c7fffff] PMD -> [ffff81000c000000-ffff8100255fffff] on node 0
[ffffe20038700000-ffffe200387fffff] potential offnode page_structs
[ffffe2001c800000-ffffe200387fffff] PMD -> [ffff810820200000-ffff81083c1fffff] on node 1
[ffffe20040000000-ffffe2007fffffff] PUD ->ffff811027a00000 on node 2
[ffffe20038800000-ffffe2003fffffff] PMD -> [ffff811020200000-ffff8110279fffff] on node 2
[ffffe20054700000-ffffe200547fffff] potential offnode page_structs
[ffffe20040000000-ffffe200547fffff] PMD -> [ffff811027c00000-ffff81103c3fffff] on node 2
[ffffe20070700000-ffffe200707fffff] potential offnode page_structs
[ffffe20054800000-ffffe200707fffff] PMD -> [ffff811820200000-ffff81183c1fffff] on node 3
[ffffe20080000000-ffffe200bfffffff] PUD ->ffff81202fa00000 on node 4
[ffffe20070800000-ffffe2007fffffff] PMD -> [ffff812020200000-ffff81202f9fffff] on node 4
[ffffe2008c700000-ffffe2008c7fffff] potential offnode page_structs
[ffffe20080000000-ffffe2008c7fffff] PMD -> [ffff81202fc00000-ffff81203c3fffff] on node 4
[ffffe200a8700000-ffffe200a87fffff] potential offnode page_structs
[ffffe2008c800000-ffffe200a87fffff] PMD -> [ffff812820200000-ffff81283c1fffff] on node 5
[ffffe200c0000000-ffffe200ffffffff] PUD ->ffff813037a00000 on node 6
[ffffe200a8800000-ffffe200bfffffff] PMD -> [ffff813020200000-ffff8130379fffff] on node 6
[ffffe200c4700000-ffffe200c47fffff] potential offnode page_structs
[ffffe200c0000000-ffffe200c47fffff] PMD -> [ffff813037c00000-ffff81303c3fffff] on node 6
[ffffe200c4800000-ffffe200e07fffff] PMD -> [ffff813820200000-ffff81383c1fffff] on node 7
instead of a very long print out...
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 1a27fc0a42162964d758e9d36d2d1b49c082a67c
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Tue Mar 18 12:52:37 2008 -0700
x86_64: fix setup_node_bootmem to support big mem excluding with memmap
typical case: four sockets system, every node has 4g ram, and we are using:
memmap=10g$4g
to mask out memory on node1 and node2
when numa is enabled, early_node_mem is used to get node_data and node_bootmap.
if it can not get memory from the same node with find_e820_area(), it will
use alloc_bootmem to get buff from previous nodes.
so check it and print out some info about it.
need to move early_res_to_bootmem into every setup_node_bootmem.
and it takes range that node has. otherwise alloc_bootmem could return addr
that reserved early.
depends on "mm: make reserve_bootmem can crossed the nodes".
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8b3cd09ed23049fcb02479c6286744b36324ac9d
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Tue Mar 18 12:50:21 2008 -0700
x86_64: make reserve_bootmem_generic() use new reserve_bootmem()
"mm: make reserve_bootmem can crossed the nodes" provides new
reserve_bootmem(), let reserve_bootmem_generic() use that.
reserve_bootmem_generic() is used to reserve initramdisk, so this way
we can make sure even when bootloader or kexec load ranges cross the
node memory boundaries, reserve_bootmem still works.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit a5645a61b3b7e7d7de15e1a642ead600150ce94d
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Tue Mar 18 12:49:12 2008 -0700
mm: allow reserve_bootmem() cross nodes
split reserve_bootmem_core() into two functions, one which checks
conflicts, and one which sets the bits.
and make reserve_bootmem to loop bdata_list to cross the nodes.
user could be crashkernel and ramdisk..., in case the range provided
by those externalities crosses the nodes.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9a2dc04cf070ee98e014a172695782ff42015fc4
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Tue Mar 18 12:44:48 2008 -0700
mm: offset align in alloc_bootmem()
need offset alignment when node_boot_start's alignment is less than
the alignment required.
use local node_boot_start to match alignment - so don't add extra operation
in search loop.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ad09315cad17458e51c7f1f8b371cb942c54b955
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Mon Mar 10 23:23:42 2008 -0700
mm: fix alloc_bootmem_core to use fast searching for all nodes
Make the nodes other than node 0 use bdata->last_success for fast
search too.
We need to use __alloc_bootmem_core() for vmemmap allocation for other
nodes when numa and sparsemem/vmemmap are enabled.
Also, make fail_block path increase i with incr only after ALIGN
to avoid extra increase when size is larger than align.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e123dd3f0ec1664576456ea1ea045591a0a95f0c
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Sun Apr 13 11:51:06 2008 -0700
mm: make mem_map allocation continuous
vmemmap allocation currently has this layout:
[ffffe20000000000-ffffe200001fffff] PMD ->ffff810001400000 on node 0
[ffffe20000200000-ffffe200003fffff] PMD ->ffff810001800000 on node 0
[ffffe20000400000-ffffe200005fffff] PMD ->ffff810001c00000 on node 0
[ffffe20000600000-ffffe200007fffff] PMD ->ffff810002000000 on node 0
[ffffe20000800000-ffffe200009fffff] PMD ->ffff810002400000 on node 0
...
note that there is a 2M hole between them - not optimal.
the root cause is that usemap (24 bytes) will be allocated after every 2M
mem_map, and it will push next vmemmap (2M) to the next (2M) alignment.
solution: try to allocate the mem_map continously.
after the patch, we get:
[ffffe20000000000-ffffe200001fffff] PMD ->ffff810001400000 on node 0
[ffffe20000200000-ffffe200003fffff] PMD ->ffff810001600000 on node 0
[ffffe20000400000-ffffe200005fffff] PMD ->ffff810001800000 on node 0
[ffffe20000600000-ffffe200007fffff] PMD ->ffff810001a00000 on node 0
[ffffe20000800000-ffffe200009fffff] PMD ->ffff810001c00000 on node 0
...
which is the ideal layout.
and usemap will share a page because of they are allocated continuously too:
sparse_early_usemap_alloc: usemap = ffff810024e00000 size = 24
sparse_early_usemap_alloc: usemap = ffff810024e00080 size = 24
sparse_early_usemap_alloc: usemap = ffff810024e00100 size = 24
sparse_early_usemap_alloc: usemap = ffff810024e00180 size = 24
...
so we make the bootmem allocation more compact and use less memory
for usemap => mission accomplished ;-)
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9b79ed952bd7344d40152f8a560ad8a0d93f3886
Merge: a52b0d25a722e84da999005b75f972aa4824253c 19870def587554c4055df3e74a21508e3647fb7e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 13:46:11 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-generic-bitops-v3
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-generic-bitops-v3:
x86, bitops: select the generic bitmap search functions
x86: include/asm-x86/pgalloc.h/bitops.h: checkpatch cleanups - formatting only
x86: finalize bitops unification
x86, UML: remove x86-specific implementations of find_first_bit
x86: optimize find_first_bit for small bitmaps
x86: switch 64-bit to generic find_first_bit
x86: generic versions of find_first_(zero_)bit, convert i386
bitops: use __fls for fls64 on 64-bit archs
generic: implement __fls on all 64-bit archs
generic: introduce a generic __fls implementation
x86: merge the simple bitops and move them to bitops.h
x86, generic: optimize find_next_(zero_)bit for small constant-size bitmaps
x86, uml: fix uml with generic find_next_bit for x86
x86: change x86 to use generic find_next_bit
uml: Kconfig cleanup
uml: fix build error
commit a52b0d25a722e84da999005b75f972aa4824253c
Merge: 539a5fe22620a1665cce504167953a71a43232ad f37afdaca711838b50ecd89b9c15fc745270d77c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 13:44:19 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (46 commits)
ide: constify struct ide_dma_ops
ide: add struct ide_dma_ops (take 3)
ide: add IDE_HFLAG_SERIALIZE_DMA host flag
sl82c105: check bridge revision in sl82c105_init_one()
au1xxx-ide: use ->init_dma method
palm_bk3710: use ->init_dma method
sgiioc4: use ->init_dma method
icside: use ->init_dma method
ide-pmac: use ->init_dma method
ide: do complete DMA setup in ->init_dma method (take 2)
au1xxx-ide: fix MWDMA support
ide: cleanup ide_setup_dma()
ide: factor out setting PCI bus-mastering from ide_hwif_setup_dma()
ide: export ide_allocate_dma_engine()
ide: move ide_setup_dma() call out from ->init_dma method
alim15x3: skip DMA initialization completely on revs < 0x20
pdc202xx_old: remove init_dma_pdc202xx()
ide: don't display "BIOS" settings in ide_setup_dma()
ide: remove ->cds field from ide_hwif_t (take 2)
ide: remove ide_dma_iobase()
...
commit 539a5fe22620a1665cce504167953a71a43232ad
Merge: 0124cecfc85a6664b1ad5f1d28cf0ab8df66fc42 fb884381273669fad034538e6cb186678407cf22
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 13:29:41 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-bootparam
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-bootparam:
x86, boot: Document for linked list of struct setup_data
x86, boot: export linked list of struct setup_data via debugfs
x86, boot: add linked list of struct setup_data
x86, boot: add free_early to early reservation machanism
commit f37afdaca711838b50ecd89b9c15fc745270d77c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:24 2008 +0200
ide: constify struct ide_dma_ops
* Export ide_dma_exec_cmd() and __ide_dma_test_irq().
* Constify struct ide_dma_ops.
* Always set hwif->dma_ops to &sff_dma_ops in ide_setup_dma()
(it is later overriden by ide_init_port() if needed) and drop
'const struct ide_port_info *d' argument.
While at it:
* Rename __ide_dma_test_irq() to ide_dma_test_irq().
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5e37bdc081a980dd0d669e6387bcf15ca9666f81
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:24 2008 +0200
ide: add struct ide_dma_ops (take 3)
Add struct ide_dma_ops and convert core code + drivers to use it.
While at it:
* Drop "ide_" prefix from ->ide_dma_end and ->ide_dma_test_irq methods.
* Drop "ide_" "infixes" from DMA methods.
* au1xxx-ide.c:
- use auide_dma_{test_irq,end}() directly in auide_dma_timeout()
* pdc202xx_old.c:
- drop "old_" "infixes" from DMA methods
* siimage.c:
- add siimage_dma_test_irq() helper
- print SATA warning in siimage_init_one()
* Remove no longer needed ->init_hwif implementations.
v2:
* Changes based on review from Sergei:
- s/siimage_ide_dma_test_irq/siimage_dma_test_irq/
- s/drive->hwif/hwif/ in idefloppy_pc_intr().
- fix patch description w.r.t. au1xxx-ide changes
- fix au1xxx-ide build
- fix naming for cmd64*_dma_ops
- drop "ide_" and "old_" infixes
- s/hpt3xxx_dma_ops/hpt37x_dma_ops/
- s/hpt370x_dma_ops/hpt370_dma_ops/
- use correct DMA ops for HPT302/N, HPT371/N and HPT374
- s/it821x_smart_dma_ops/it821x_pass_through_dma_ops/
v3:
* Two bugs slipped in v2 (noticed by Sergei):
- use correct DMA ops for HPT374 (for real this time)
- handle HPT370/HPT370A properly
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1fd1890594bd355a4217f5658a34763e77decee3
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:24 2008 +0200
ide: add IDE_HFLAG_SERIALIZE_DMA host flag
* Add IDE_HFLAG_SERIALIZE_DMA host flag to serialize ports
if DMA is available and handle it in ide_init_port().
* Convert sl82c105 host driver to use this new flag.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 6c61064162e6a9965a062b445c6bd6c8ed019183
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:23 2008 +0200
sl82c105: check bridge revision in sl82c105_init_one()
* Make sl82c105_bridge_revision() return 'u8' instead of 'unsigned long'.
* Check bridge revision in sl82c105_init_one().
While at:
* Use proper KERN_ level for printk().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 8552865935538127d2603110b3d36dba2b4e8eff
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:23 2008 +0200
au1xxx-ide: use ->init_dma method
* Pass 'ide_hwif_t *hwif' instead of '_auide_hwif *auide' to
auide_ddma_init().
* Add 'const struct ide_port_info *d' argument to auide_ddma_init().
* Convert the driver to use ->init_dma method.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b552a2c1dd01ab2380ea9429899591aa743f02e7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:23 2008 +0200
palm_bk3710: use ->init_dma method
* Move DMA setup to palm_bk3710_init_dma().
* Convert the driver to use ->init_dma method.
Cc: Anton Vorontsov <avorontsov at ru.mvista.com>
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 04216fa1befbf8c737b7bf3bcc636009723f40d9
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:23 2008 +0200
sgiioc4: use ->init_dma method
* Move dma_base check from sgiioc4_ide_setup_pci_device()
to ide_dma_sgiioc4().
* Replace ide_dma_sgiioc4() 'unsigned long dma_base' argument
by 'const struct ide_port_info *d'.
* Move hwif->INB setup from ide_init_sgiioc4() to
sgiioc4_ide_setup_pci_device().
* Move ide_init_sgiioc4() call from sgiioc4_ide_setup_pci_device()
to ide_dma_sgiioc4().
* Convert the driver to use ->init_dma method.
Cc: Jeremy Higdon <jeremy at sgi.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 91432f48094db32579776bd0a9d8432b16dc0a09
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:23 2008 +0200
icside: use ->init_dma method
* Add 'const struct ide_port_info *d' argument to icside_dma_init().
* Make icside_dma_init() return an error value and add icside_dma_off_init()
(->init_dma implementation for case when DMA cannot be enabled).
* Convert the driver to use ->init_dma method.
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 0d07192297f664afdee36b330ab4fe52a8e38a6a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:22 2008 +0200
ide-pmac: use ->init_dma method
* Move pmif->dma_regs check from pmac_ide_setup_device() to
pmac_ide_init_dma().
* Get 'pmif' from 'hwif->hwif_data' in pmac_ide_init_dma() and replace
'pmac_ide_hwif_t *pmif' argument by 'const struct ide_port_info *d'.
* Add pmac_ide_init_dma() implementation for CONFIG_BLK_DEV_IDEDMA_PMAC=n
case and convert the driver to use ->init_dma method.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b123f56e04c7c112f754f948198d1ea5a80e649d
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:22 2008 +0200
ide: do complete DMA setup in ->init_dma method (take 2)
* Make ide_hwif_setup_dma() return an error value.
* Pass 'const struct ide_port_info *d' instead of 'unsigned long dmabase'
to ->init_dma method and make it return an error value.
* Rename ide_get_or_set_dma_base() to ide_pci_dma_base(),
change ordering of its arguments and then export it.
* Export ide_pci_set_master().
* Do complete DMA setup inside ->init_dma method and update ->init_dma
users accordingly.
* Sanitize code for DMA setup in ide_init_port().
v2:
* Fix for CONFIG_BLK_DEV_IDEDMA_PCI=n configs
(from Jiri Slaby <jirislaby at gmail.com>):
Fix following compiler warning by returning EINVAL:
In file included from ANYTHING-INCLUDING-IDE.H:45:
include/linux/ide.h: In function ‘ide_hwif_setup_dma’:
include/linux/ide.h:1022: warning: no return statement in function returning non-void
Cc: Jiri Slaby <jirislaby at gmail.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f629b38beddf2ff8bc3fda1754bbd6cc7d3acc03
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:22 2008 +0200
au1xxx-ide: fix MWDMA support
Always use "fast" MWDMA support and remove dma_{black,white}_list
(they were based on completely bogus ->ide_dma_check implementation
which didn't set neither the host controller timings nor the device
for the desired transfer mode).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 63158d5c217e2e62665ae9b10d203bd7da817108
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:21 2008 +0200
ide: cleanup ide_setup_dma()
* There is no need to call ide_release_dma_engine().
* Move the code up to (and including) ide_allocate_dma_engine()
call to the callers of ide_setup_dma().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d54452fbf84500eff77a55a2061f4669441d2cc3
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:21 2008 +0200
ide: factor out setting PCI bus-mastering from ide_hwif_setup_dma()
Factor out setting PCI bus-mastering from ide_hwif_setup_dma()
to ide_pci_set_master() helper.
While at it:
* don't read PCI Command register if not necessary
* use PCI device name instead of hwif->name
* cleanup ide_hwif_setup_dma() a bit
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b8e73fba60414e161d8fd2429b6fb268e34502e2
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:21 2008 +0200
ide: export ide_allocate_dma_engine()
Export ide_allocate_dma_engine() and use it in trm290 host driver.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 23658f8af3dbba53ae9796e4c37c2fdd0272662e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:21 2008 +0200
ide: move ide_setup_dma() call out from ->init_dma method
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 6d36b95fe2cc5655e96da42eaf19f1aa341c6856
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:21 2008 +0200
alim15x3: skip DMA initialization completely on revs < 0x20
Skip DMA initialization completely on revs < 0x20 by setting IDE_HFLAG_NO_DMA
host flag and resetting DMA host masks in alim15x3_init_one() (currently
ide_hwif_setup_dma() will try to obtain DMA base and setup PCI bus-mastering
but init_dma_ali15x3() will fail).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 73369d2a15cfe7dceae89a9e70e3d442e4c21576
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:21 2008 +0200
pdc202xx_old: remove init_dma_pdc202xx()
Do PDC202xx specific DMA initialization in init_chipset_pdc202xx()
and remove no longer needed init_dma_pdc202xx().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 8d9f9a76ea09911f4aaf0d9e852fd25335080f53
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:20 2008 +0200
ide: don't display "BIOS" settings in ide_setup_dma()
Nowadays BIOS info is not very useful and only confuses users since:
- IDE always tries to use DMA
- BIOS info may not be accurate with modular IDE/libata
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5e59c236846df444860ffc8b852117f9ff65c101
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:20 2008 +0200
ide: remove ->cds field from ide_hwif_t (take 2)
* Use hwif->name instead of cds->name in ide_allocate_dma_engine().
* Use pci_name(dev) instead of cds->name in init_dma_pdc202xx().
* Remove no longer needed ->cds field from ide_hwif_t.
v2:
* scc_pata.c also needs to be updated now (noticed by Stephen Rothwell).
There should be no functional changes caused by this patch.
Cc: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Cc: Akira Iguchi <akira2.iguchi at toshiba.co.jp>
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 0a79acd40d1ee8b6bf217a519eee422ed7e6da6b
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:20 2008 +0200
ide: remove ide_dma_iobase()
* ide_mapped_mmio_dma() and ide_iomio_dma() are called only by
ide_dma_iobase() so inline them there.
* ide_dma_iobase() is called only by ide_setup_dma() so inline
it there.
* Setup hwif->extra_base also if hwif->mmio flag is set.
There should be no functional changes casued by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 21a3387ddd9eedcf6d4f47e591ffa90128b9f560
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:20 2008 +0200
ide: remove ->extra field from struct ide_port_info
Always setup hwif->extra_base in ide_iomio_dma() and remove
no longer needed ->extra field from struct ide_port_info.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit eb63963a55f039f049d0dd1121f91f332af6ecc9
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Sat Apr 26 22:25:20 2008 +0200
ide: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
[bart: fix checkpatch.pl errors in ide-lib.c and ppc/mpc8xx.c while at it]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit c4b22f816b8ee316cff06df3880f8341e1251211
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sat Apr 26 22:25:20 2008 +0200
ide-tape: remove idetape_pipeline_active()
This function was simply a wrapper for a test_bit() macro so remove it and
use the macro instead.
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3dd89a9b2af37d8e3efd785e20b12b785e50e48f
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:19 2008 +0200
ide: cleanup setting hwif->mmio flag
It is no longer needed to set hwif->mmio flag to tell IDE layer to not
manage resources so cleanup host drivers that used hwif->mmio flag only
for this purpose.
Ditto for ide_legacy_init_one().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5add22241752a3c689bea2a9d0e71c2a5909ed8a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:19 2008 +0200
ide: remove ide_hwif_request_regions()
Remove no longer used ide_hwif_request_regions() and hwif_request_region().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 0d1bad216c43bcee84cc24d1ed003c19134d2645
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:19 2008 +0200
ide: manage resources for PCI devices in ide_pci_enable() (take 3)
* Reserve PCI BARs 0-3 (0-1 for single port controllers) in
ide_pci_enable() and remove ide_hwif_request_regions() call
from ide_device_add_all() (also cleanup resource management
in scc_pata host driver).
* Fix handling of PCI BAR 4 in ide_pci_enable(), then cleanup
ide_iomio_dma() (+ init_hwif_trm290() in trm290 host driver)
and remove ide_release[_iomio]_dma().
v2:
* Fixup trm290 host driver.
v3:
* Because of scc_pata host driver changes we need to call
pci_request_selected_regions() also in setup_mmio_scc().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7ebe5936c214c656a1625abf9ec3b09e3d1bf34a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:19 2008 +0200
cmd640: manage I/O resources in driver
* Tell IDE layer to not manage resources by setting hwif->mmio flag.
* Use {request,release}_region() for resources management.
* Use driver name for resources management.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d92f1a2829dbe29c644569a3b64a021e4d90005d
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:18 2008 +0200
ide: manage I/O resources in ide_legacy_init_one()
* Tell IDE layer to not manage resources by setting hwif->mmio flag.
* Use {request,release}_region() for resources management.
* Set ->name field of 'struct ide_port_info' instances in legacy VLB
host drivers and use driver name for resources management.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d9b819a025ca1b09dafbe90b5d25ba57a639f048
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:18 2008 +0200
ide: add ide_legacy_init_one() helper
Move the common code for primary/seconary port setup from
ide_legacy_device_add() to ide_legacy_init_one().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 2305d94321bbbdc461acfb24b41fbf50f8a6dd91
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:18 2008 +0200
ide_arm: manage I/O resources in driver
* Tell IDE layer to not manage resources by setting hwif->mmio flag.
* Use {request,release}_region() for resources management.
* Use driver name for resources management.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 2c4be251be1cace01a2a18bf5abb847010516511
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:18 2008 +0200
ide-4drives: manage I/O resources in driver
* Tell IDE layer to not manage resources by setting hwif->mmio flag.
* Use {request,release}_region() for resources management.
* Use driver name for resources management.
* Remove no longer needed 'hwif->chipset == ide_4drives' handling
from ide_device_add_all().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1664949843e8c0782c8f2e40897285a8dfffdf27
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:17 2008 +0200
ide-generic: manage I/O resources in driver
* Tell IDE layer to not manage resources by setting hwif->mmio flag.
* Use {request,release}_region() for resources management.
* Use driver name for resources management.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d083c03f2524af699a6b85cf4d2f8090242b1b84
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:17 2008 +0200
ide: remove ide_hwif_release_regions()
All host drivers using ide_unregister()/module_exit() have been fixed
to manage resources themselves so this function can be removed now.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit eb716beb0aeb4b14489a64c51c63e6a4be2e13a0
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:17 2008 +0200
ide: register ports with non-present devices (for warm-plug)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d703b79e56eb103b72ad1bceebe8ef4e8635fb1c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:17 2008 +0200
ide-cs: manage I/O resources in driver
* Make idecs_register() return pointer to hwif structure instead of
hwif's index.
* Store pointer to hwif structure instead of hwif's index in ide_info_t
(fixes ide-cs for IDE[6-9]_MAJOR major numbers).
* Remove no longer needed ide_major[].
* Tell IDE layer to not manage resources by setting hwif->mmio flag.
* Use {request,release}_region() for resources management.
* Use driver name for resources management.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 134d4548a7a1d27781dcbce9725c7f7914f7ae47
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:16 2008 +0200
ide-pnp: manage I/O resources in driver
* Tell IDE layer to not manage resources by setting hwif->mmio flag.
* Use {request,release}_region() for resources management.
* Use driver name for resources management.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7a2199f341edb2515021ccd6fe122c0d15b08fc7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:16 2008 +0200
qd65xx: cleanup qd_probe()
* Replace 'if ()'-s by 'switch ()' block.
* Merge common code for QD6500/QD6580A/QD6580B.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 0bfeee7d4190938291a76536c7f6cd8f4e2dc30c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:16 2008 +0200
ide: use ide_legacy_device_add() for qd65xx (take 2)
* Add 'unsigned long config' argument to ide_legacy_device_add()
for setting hwif->config_data.
* Use ide_find_port_slot() instead of ide_find_port() in
ide_legacy_device_add().
* Handle IDE_HFLAG_QD_2ND_PORT and IDE_HFLAG_SINGLE host flags in
ide_legacy_device_add().
* Convert qd65xx host driver to use ide_legacy_device_add().
v2:
* Update ali14xx, dtc2278, ht6560b and umc8672 host drivers.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3b36f66b81bc0d69ec7dfa736592224f6ca366b7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:16 2008 +0200
ide: add ide_legacy_device_add() helper
Add ide_legacy_device_add() helper for use by legacy VLB host drivers
(+ convert them to use it).
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e53cd458d593c88247b8a7b2754d0e8055869670
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:16 2008 +0200
ide: remove ->noprobe field from ide_hwif_t
Update IDE PMAC host driver to use drive->noprobe instead of hwif->noprobe
and remove hwif->noprobe completely (it is always set to zero now).
There should be no functional changes caused by this patch.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e5e076a3540af0ed7b6491d1593396c99adbfbe1
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sat Apr 26 22:25:15 2008 +0200
ide-cd: fix remaining checkpatch.pl issues
Some of them are:
WARNING: braces {} are not necessary for single statement blocks
CHECK: multiple assignments should be avoided
WARNING: printk() should include KERN_ facility level
WARNING: no space between function name and open parenthesis '('
[bart: minor fixups]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 83c8565dcc9daa4b28fd6ffe63308d64656ce4db
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sat Apr 26 22:25:15 2008 +0200
ide-cd: shorten lines longer than 80 columns
[bart: minor fixups]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5a3ea3b424369ea8a661f2fe8f4b24ffc90e4543
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sat Apr 26 22:25:15 2008 +0200
ide-cd: fixup comments
[bart: minor fixups, md5sum checked]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5e657a9e29baa0d8f5c0cf99372100d397340f00
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sat Apr 26 22:25:15 2008 +0200
ide-cd: put all proc-related code at one place
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9aba468e4ae834dd0ee37004e5d07309684e14d2
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sat Apr 26 22:25:15 2008 +0200
ide-cd: include proper headers
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ac95beedf8bc97b24f9540d4da9952f07221c023
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 22:25:14 2008 +0200
ide: add struct ide_port_ops (take 2)
* Move hooks for port/host specific methods from ide_hwif_t to
'struct ide_port_ops'.
* Add 'const struct ide_port_ops *port_ops' to 'struct ide_port_info'
and ide_hwif_t.
* Update host drivers and core code accordingly.
While at it:
* Rename ata66_*() cable detect functions to *_cable_detect() to match
the standard naming. (Suggested by Sergei Shtylyov)
v2:
* Fix build for bast-ide. (Noticed by Andrew Morton)
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit fb884381273669fad034538e6cb186678407cf22
Author: Huang, Ying <ying.huang at intel.com>
Date: Fri Mar 28 10:49:50 2008 +0800
x86, boot: Document for linked list of struct setup_data
Documentation for linked list of struct setup_data.
Signed-off-by: Huang Ying <ying.huang at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit c14b2adf19b5d35aff91280b1a73c41a4dcabfe3
Author: Huang, Ying <ying.huang at intel.com>
Date: Fri Mar 28 10:49:48 2008 +0800
x86, boot: export linked list of struct setup_data via debugfs
Export linked list of struct setup_data via debugfs.
Signed-off-by: Huang Ying <ying.huang at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8b664aa66e824a0ddf4ec56d41fa0cf7bb374de6
Author: Huang, Ying <ying.huang at intel.com>
Date: Fri Mar 28 10:49:44 2008 +0800
x86, boot: add linked list of struct setup_data
This patch adds a field of 64-bit physical pointer to NULL terminated
single linked list of struct setup_data to real-mode kernel
header. This is used as a more extensible boot parameters passing
mechanism.
Signed-off-by: Huang Ying <ying.huang at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 50eae2a7c9862afe263a2003c12f457ecfc9e6a2
Author: Huang, Ying <ying.huang at intel.com>
Date: Fri Mar 28 10:49:42 2008 +0800
x86, boot: add free_early to early reservation machanism
Add free_early to early reservation mechanism - this way early bootup
failure paths can stop wasting memory.
Signed-off-by: Huang Ying <ying.huang at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 0124cecfc85a6664b1ad5f1d28cf0ab8df66fc42
Author: Venki Pallipadi <venkatesh.pallipadi at intel.com>
Date: Sat Apr 26 11:32:12 2008 -0700
x86, PAT: disable /dev/mem mmap RAM with PAT
disable /dev/mem mmap of RAM with PAT. It makes things safer and
eliminates aliasing. A future improvement would be to avoid the
range_is_allowed duplication.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f5093913c0b5b93e3ccafd39d056e76557169ced
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 25 23:40:16 2008 +0300
kbuild: scripts/Makefile.modpost typo fix
-EVIUSER ;-)
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 2fa365682943866baf85305ef701741fe41b27e0
Author: Sam Ravnborg <sam at uranus.ravnborg.org>
Date: Sat Apr 26 21:07:26 2008 +0200
kbuild: soften MODULE_LICENSE check
Only modules that has other MODULE_* content
shall have the MODULE_LICENSE() tag.
This fixes allmodconfig build on my box.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit fb96c00819c28860fd10137f1c63f7c48dec252b
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sat Apr 26 13:46:31 2008 -0400
[MTD] Delete long-unused jedec.h header file.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 8136508cd6075a74e68a8d1cde8399a558ca27a7
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sun Apr 27 01:51:12 2008 +0900
[MTD] [NAND] at91_nand: use at91_nand_{en,dis}able consistently.
Use at91_nand_enable(), at91_nand_disable() to manipulate enable_pin.
No functional changes.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 19870def587554c4055df3e74a21508e3647fb7e
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Fri Apr 25 13:12:53 2008 +0200
x86, bitops: select the generic bitmap search functions
Introduce GENERIC_FIND_FIRST_BIT and GENERIC_FIND_NEXT_BIT in
lib/Kconfig, defaulting to off. An arch that wants to use the
generic implementation now only has to use a select statement
to include them.
I added an always-y option (X86_CPU) to arch/x86/Kconfig.cpu
and used that to select the generic search functions. This
way ARCH=um SUBARCH=i386 automatically picks up the change
too, and arch/um/Kconfig.i386 can therefore be simplified a
bit. ARCH=um SUBARCH=x86_64 does things differently, but
still compiles fine. It seems that a "def_bool y" always
wins over a "def_bool n"?
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f19dcf4a61ea4a3d155acb239348d09cb264f6a0
Author: Joe Perches <joe at perches.com>
Date: Sun Mar 23 01:03:07 2008 -0700
x86: include/asm-x86/pgalloc.h/bitops.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe at perches.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d66462f5314b0e70ddad8032eb76099475ca5571
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Fri Apr 4 20:49:30 2008 +0200
x86: finalize bitops unification
include/asm-x86/bitops_32.h and include/asm-x86/bitops_64.h are now
almost identical. The 64-bit version sets ARCH_HAS_FAST_MULTIPLIER
and has an extra inline function set_bit_string. The define currently
has no influence on the generated code, but it can be argued that
setting it on i386 is the right thing to do anyhow. The addition
of the extra inline function on i386 does not hurt either.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 5245698f665c4b7a533dcc47a5afdf33095d436a
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Tue Apr 1 17:47:57 2008 +0200
x86, UML: remove x86-specific implementations of find_first_bit
x86 has been switched to the generic versions of find_first_bit
and find_first_zero_bit, but the original versions were retained.
This patch just removes the now unused x86-specific versions.
also update UML.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 3a48305028aa38afba93fc05066c71a6ee668ad8
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Tue Apr 1 17:42:21 2008 +0200
x86: optimize find_first_bit for small bitmaps
Avoid a call to find_first_bit if the bitmap size is know at
compile time and small enough to fit in a single long integer.
Modeled after an optimization in the original x86_64-specific
code.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 2aba6925fdb96428d1129a61b1233597a03a387b
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Tue Apr 1 17:41:26 2008 +0200
x86: switch 64-bit to generic find_first_bit
Switch x86_64 to generic find_first_bit. The x86_64-specific
implementation is not removed.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 77b9bd9c49442407804c37bcc82021a35277f83c
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Tue Apr 1 11:46:19 2008 +0200
x86: generic versions of find_first_(zero_)bit, convert i386
Generic versions of __find_first_bit and __find_first_zero_bit
are introduced as simplified versions of __find_next_bit and
__find_next_zero_bit. Their compilation and use are guarded by
a new config variable GENERIC_FIND_FIRST_BIT.
The generic versions of find_first_bit and find_first_zero_bit
are implemented in terms of the newly introduced __find_first_bit
and __find_first_zero_bit.
This patch does not remove the i386-specific implementation,
but it does switch i386 to use the generic functions by setting
GENERIC_FIND_FIRST_BIT=y for X86_32.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d57594c203b1e7b54373080a797f0cbfa4aade68
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Sat Mar 15 18:32:36 2008 +0100
bitops: use __fls for fls64 on 64-bit archs
Use __fls for fls64 on 64-bit archs. The implementation for
64-bit archs is moved from x86_64 to asm-generic.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 56a6b1eb7bfb5ace0b5cb9c149f502fbd101b8ab
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Sat Mar 15 18:31:49 2008 +0100
generic: implement __fls on all 64-bit archs
Implement __fls on all 64-bit archs:
alpha has an implementation of fls64.
Added __fls(x) = fls64(x) - 1.
ia64 has fls, but not __fls.
Added __fls based on code of fls.
mips and powerpc have __ilog2, which is the same as __fls.
Added __fls = __ilog2.
parisc, s390, sh and sparc64:
Include generic __fls.
x86_64 already has __fls.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7d9dff22e8ad06ad330968c9e3d3a2fb55a5f9c3
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Sat Mar 15 18:30:57 2008 +0100
generic: introduce a generic __fls implementation
Add a generic __fls implementation in the same spirit as
the generic __ffs one. It finds the last (most significant)
set bit in the given long value.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 12d9c8420b9daa1da3d9e090640fb24bcd0deba2
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Sat Mar 15 13:04:42 2008 +0100
x86: merge the simple bitops and move them to bitops.h
Some of those can be written in such a way that the same
inline assembly can be used to generate both 32 bit and
64 bit code.
For ffs and fls, x86_64 unconditionally used the cmov
instruction and i386 unconditionally used a conditional
branch over a mov instruction. In the current patch I
chose to select the version based on the availability
of the cmov instruction instead. A small detail here is
that x86_64 did not previously set CONFIG_X86_CMOV=y.
Improved comments for ffs, ffz, fls and variations.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 64970b68d2b3ed32b964b0b30b1b98518fde388e
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Tue Mar 11 16:17:19 2008 +0100
x86, generic: optimize find_next_(zero_)bit for small constant-size bitmaps
This moves an optimization for searching constant-sized small
bitmaps form x86_64-specific to generic code.
On an i386 defconfig (the x86#testing one), the size of vmlinux hardly
changes with this applied. I have observed only four places where this
optimization avoids a call into find_next_bit:
In the functions return_unused_surplus_pages, alloc_fresh_huge_page,
and adjust_pool_surplus, this patch avoids a call for a 1-bit bitmap.
In __next_cpu a call is avoided for a 32-bit bitmap. That's it.
On x86_64, 52 locations are optimized with a minimal increase in
code size:
Current #testing defconfig:
146 x bsf, 27 x find_next_*bit
text data bss dec hex filename
5392637 846592 724424 6963653 6a41c5 vmlinux
After removing the x86_64 specific optimization for find_next_*bit:
94 x bsf, 79 x find_next_*bit
text data bss dec hex filename
5392358 846592 724424 6963374 6a40ae vmlinux
After this patch (making the optimization generic):
146 x bsf, 27 x find_next_*bit
text data bss dec hex filename
5392396 846592 724424 6963412 6a40d4 vmlinux
[ tglx at linutronix.de: build fixes ]
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 60b6783a044a55273b637983f52965c2808a6b86
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Thu Mar 13 18:53:52 2008 +0100
x86, uml: fix uml with generic find_next_bit for x86
Update UML to use the generic bits too.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 6fd92b63d0626a8fe7eb8e2e50d19ecaa18cb412
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Sun Mar 9 21:01:04 2008 +0100
x86: change x86 to use generic find_next_bit
The versions with inline assembly are in fact slower on the machines I
tested them on (in userspace) (Athlon XP 2800+, p4-like Xeon 2.8GHz, AMD
Opteron 270). The i386-version needed a fix similar to 06024f21 to avoid
crashing the benchmark.
Benchmark using: gcc -fomit-frame-pointer -Os. For each bitmap size
1...512, for each possible bitmap with one bit set, for each possible
offset: find the position of the first bit starting at offset. If you
follow ;). Times include setup of the bitmap and checking of the
results.
Athlon Xeon Opteron 32/64bit
x86-specific: 0m3.692s 0m2.820s 0m3.196s / 0m2.480s
generic: 0m2.622s 0m1.662s 0m2.100s / 0m1.572s
If the bitmap size is not a multiple of BITS_PER_LONG, and no set
(cleared) bit is found, find_next_bit (find_next_zero_bit) returns a
value outside of the range [0, size]. The generic version always returns
exactly size. The generic version also uses unsigned long everywhere,
while the x86 versions use a mishmash of int, unsigned (int), long and
unsigned long.
Using the generic version does give a slightly bigger kernel, though.
defconfig: text data bss dec hex filename
x86-specific: 4738555 481232 626688 5846475 5935cb vmlinux (32 bit)
generic: 4738621 481232 626688 5846541 59360d vmlinux (32 bit)
x86-specific: 5392395 846568 724424 6963387 6a40bb vmlinux (64 bit)
generic: 5392458 846568 724424 6963450 6a40fa vmlinux (64 bit)
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 18e413f7193ed2f6991d959863f46330813aa242
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 26 19:10:17 2008 +0200
uml: Kconfig cleanup
pointed out by Linus: arch/um/Kconfig.x86_64 should
include arch/x86/Kconfig.cpu instead of defining those
symbols itself.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 297e1b256b1090adbb4357608be3d4301e76c0ce
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 26 18:59:42 2008 +0200
uml: fix build error
fix:
arch/um/os-Linux/helper.c: In function 'run_helper':
arch/um/os-Linux/helper.c:73: error: 'PATH_MAX' undeclared (first use in this function)
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4a27214d7be31e122db4102166f49ec15958e8e9
Merge: c837c93a03be711dd6e09215b74b4f23bbd1ff83 8db979bcfe46dcdced1065e9359e4ef7a50b8a6f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 09:50:58 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86 PAT: decouple from nonpromisc devmem
x86 PAT: tone down debugging messages
commit c837c93a03be711dd6e09215b74b4f23bbd1ff83
Merge: d485cb9aa2e302fac7e7fb586a0cb4c0a5211be9 37c45df740f79c58bb0fc0de151fd2504234032b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 09:49:51 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (7751): ir-kbd-i2c: Save a temporary memory allocation in ir_probe
V4L/DVB (7750): au0828/ cleanups and fixes
V4L/DVB (7748): tuner-core: some adjustments at tuner logs, if debug enabled
V4L/DVB (7746): pvrusb2: make signed one-bit bitfields unsigned
V4L/DVB (7744): pvrusb2-dvb: add atsc/qam support for Hauppauge pvrusb2 model 751xx
V4L/DVB (7742): cx88: Add support for the DViCO FusionHDTV_7_GOLD digital modes
V4L/DVB (7741): s5h1411: Adding support for this ATSC/QAM demodulator
V4L/DVB (7740): tuner-xc2028.c dubious !x & y
V4L/DVB (7739): mt312.h: dubious one-bit signed bitfield
V4L/DVB (7735): Fix compilation for au0828
V4L/DVB (7734): em28xx: copy and paste error in em28xx_init_isoc
V4L/DVB (7733): blackbird_find_mailbox negative return ignored in blackbird_initialize_codec()
V4L/DVB (7732): vivi: fix a warning
commit d485cb9aa2e302fac7e7fb586a0cb4c0a5211be9
Merge: 1292ebb82c00c69cf983e871faa221ce88ed3338 765c68bd54c76d4126796e49af2a1428a258429f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 09:48:52 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-optimized-inlining
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-optimized-inlining:
generic: make optimized inlining arch-opt-in
x86: add optimized inlining
commit 1292ebb82c00c69cf983e871faa221ce88ed3338
Merge: b82287587ef9917afbea5fcbf7aa63424b6f3719 784506cbddd17bcd5929f827df39b0c7014e3f1e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 09:48:00 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (61 commits)
ide: sanitize handling of IDE_HFLAG_NO_SET_MODE host flag
sis5513: fail early for unsupported chipsets
it821x: fix kzalloc() failure handling
qd65xx: use IDE_HFLAG_SINGLE host flag
qd65xx: always use ->selectproc method
ide-cd: put proc-related functions together under single ifdef
ide-cd: Replace __FUNCTION__ with __func__
IDE: Coding Style fixes to drivers/ide/ide-cd.c
IDE: Coding Style fixes to drivers/ide/pci/cy82c693.c
IDE: Coding Style fixes to drivers/ide/pci/it8213.c
IDE: Coding Style fixes to drivers/ide/ide-floppy.c
IDE: Coding Style fixes to drivers/ide/legacy/ali14xx.c
IDE: Coding Style fixes to drivers/ide/legacy/hd.c
IDE: Coding Style fixes to drivers/ide/pci/cmd640.c
IDE: Coding Style fixes to drivers/ide/pci/opti621.c
IDE: Coding Style fixes to drivers/ide/ide-pnp.c
IDE: Coding Style fixes to drivers/ide/ide-proc.c
IDE: Coding Style fixes to drivers/ide/legacy/ide-4drives.c
IDE: Coding Style fixes to drivers/ide/legacy/umc8672.c
IDE: Coding Style fixes to drivers/ide/pci/generic.c
...
commit b82287587ef9917afbea5fcbf7aa63424b6f3719
Merge: 2a8a2719be1397c64e726ccd1c0933a11dc493d0 5afca33a43786408ce74540b54855973dde32bab
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 09:44:32 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-misc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-misc: (28 commits)
x86: section mismatch fixes, #3
x86: section mismatch fixes, #2
x86: pgtable_32.h - prototype and section mismatch fixes
x86: unlock_ExtINT_logic() - fix section mismatch warnings
x86: uniq_ioapic_id - fix section mismatch warning
x86: trampoline_32.S - switch to .cpuinit.data
x86: use get_bios_ebda()
x86: remove duplicate get_bios_ebda() from rio.h
x86: get_bios_ebda() requires asm/io.h
x86: use cpumask function for present, possible, and online cpus
x86: cleanup div_sc() usage
x86: cleanup clocksource_hz2mult usage
x86: remove unnecessary memset and NULL check after alloc_bootmem()
x86: use bitmap library for pin_programmed
x86: use MP_intsrc_info()
x86: use BUILD_BUG_ON() for the size of struct intel_mp_floating
x86_64 ia32 ptrace: convert to compat_arch_ptrace
x86_64 ia32 ptrace: use compat_ptrace_request for siginfo
x86 signals: lift set_fs
x86 signals: lift flags diddling code
...
commit 2a8a2719be1397c64e726ccd1c0933a11dc493d0
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 26 10:26:52 2008 +0200
x86 PAT: decouple from nonpromisc devmem
Linus pointed it out that PAT should not depend on NONPROMISC_DEVMEM.
Also make PAT non-default.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d9c04d678418fe42646de641f499209ca00fd94f
Merge: 4d9c55e44336602f8b2880b972fb55f67bc51dd0 09aa356b5584090aab6810ec8002936d710cd4ac
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 09:29:36 2008 -0700
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
agp: convert drivers/char/agp/frontend.c to use unlocked_ioctl
agp: fix shadowed variable warning in amd-k7-agp.c
commit 4d9c55e44336602f8b2880b972fb55f67bc51dd0
Merge: 50704516f334d5036c09b0ecc0064598f7c5596f b74e2082f8e7b8f37af3fc39e8ee0dd0d218c589
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Apr 26 09:26:39 2008 -0700
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: _end is shadowing real _end, just rename it.
drm/vbl rework: rework how the drm deals with vblank.
drm: reorganise minor number handling using backported modesetting code.
drm/i915: Handle tiled buffers in vblank tasklet
drm/i965: On I965, use correct 3DSTATE_DRAWING_RECTANGLE command in vblank
drm: Remove unneeded dma sync in ATI pcigart alloc
drm: Fix mismerge of non-coherent DMA patch
commit 50704516f334d5036c09b0ecc0064598f7c5596f
Author: Al Viro <viro at ZenIV.linux.org.uk>
Date: Sat Apr 26 05:25:00 2008 +0100
Fix uninitialized 'copy' in unshare_files
Arrgghhh...
Sorry about that, I'd been sure I'd folded that one, but it actually got
lost. Please apply - that breaks execve().
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Tested-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 765c68bd54c76d4126796e49af2a1428a258429f
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 9 11:03:37 2008 +0200
generic: make optimized inlining arch-opt-in
Stephen Rothwell reported that linux-next did not build on powerpc64.
make optimized inlining dependent on architecture opt-in.
Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 60a3cdd0639473c79c253bc08c8ef8f882cca107
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Mar 3 12:38:52 2008 +0100
x86: add optimized inlining
add CONFIG_OPTIMIZE_INLINING=y.
allow gcc to optimize the kernel image's size by uninlining
functions that have been marked 'inline'. Previously gcc was
forced by Linux to always-inline these functions via a gcc
attribute:
#define inline inline __attribute__((always_inline))
Especially when the user has already selected
CONFIG_OPTIMIZE_FOR_SIZE=y this can make a huge difference in
kernel image size (using a standard Fedora .config):
text data bss dec hex filename
5613924 562708 3854336 10030968 990f78 vmlinux.before
5486689 562708 3854336 9903733 971e75 vmlinux.after
that's a 2.3% text size reduction (!).
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 784506cbddd17bcd5929f827df39b0c7014e3f1e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:43 2008 +0200
ide: sanitize handling of IDE_HFLAG_NO_SET_MODE host flag
* Check for IDE_HFLAG_NO_SET_MODE host flag in ide_set_pio(),
ide_set_[pio,dma]_mode(), ide_set_xfer_rate() and set_pio_mode().
* Remove no longer needed IDE_HFLAG_NO_SET_MODE host flag checking
from ide_tune_dma().
* Remove superfluous ->set_pio_mode checking from do_special().
This is a part of preparations for adding 'struct ide_port_ops'.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 4764b68405ac918e9ac9939b1a2d1469102e5af7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:43 2008 +0200
sis5513: fail early for unsupported chipsets
* Factor out chipset family detection from init_chipset_sis5513()
to sis_find_family().
* Use sis_find_family() in sis5513_init_one() to fail early if the
chipset is unsupported.
* Keep a local copy sis5513_chipset in sis5513_init_one()
and set .udma_mask according to chipset family.
* Remove no longer need ->ultra_mask setting from init_hwif_sis5513().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit eb7a07e8d6580ea498cac53acafe42c080af4d06
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:42 2008 +0200
it821x: fix kzalloc() failure handling
Allocate 'struct it821x_dev' objects for both ports in it821x_init_one().
Fixes potential OOPS in it821x_quirkproc() (uses 'itdev' unconditionally)
and other problems ('itdev' is needed for correct operation of the driver).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 79472b6ea9e74ee4400ba57ba84cad86426e2d6d
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:42 2008 +0200
qd65xx: use IDE_HFLAG_SINGLE host flag
* Set IDE_HFLAG_SINGLE host flag in qd_probe() for QD6500 and QD6580
with the second port disabled.
* Check for IDE_HFLAG_SINGLE in qd6580_port_init_devs() instead of
using cached value of QD6580 Control register.
* Don't cache QD6580 Control register value in hwif->config_data
(bits 8-15) and remove no longer needed QD_CONTROL() macro.
* Cache QD65xx base address in hwif->config_data (bits 8-15)
instead of hwif->select_data.
* Set hwif->config_data in qd_probe() and remove qd_setup() helper.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d07616f19336b514eef06e6a361988c4073e6ecb
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:42 2008 +0200
qd65xx: always use ->selectproc method
qd_select() checks itself whether timings should be reprogrammed so
remove superfluous qd_timing_ok() and always use ->selectproc method
(rename qd_select() to qd65xx_select() while at it).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1134b6fec57de7de2c56485bcd2afd9c16295dcb
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sat Apr 26 17:36:42 2008 +0200
ide-cd: put proc-related functions together under single ifdef
[bart: ported it over Paolo's patch]
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 177773ed87586214c423ef1204b42d35f0ec8f81
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:42 2008 +0200
ide-cd: Replace __FUNCTION__ with __func__
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9ce70fb2b5ab9feb24afd1ea971bfa86bbc5625c
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:42 2008 +0200
IDE: Coding Style fixes to drivers/ide/ide-cd.c
Before:
total: 43 errors, 66 warnings, 2183 lines checked
After:
total: 0 errors, 36 warnings, 2192 lines checked
I didn't (and I don't plan to) fix the warnings:
WARNING: line over 80 characters
[bart: minor fixes, md5sum checked (modulo s/"ignore = NULL;"/"ignore;"/ fix)]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 175f354b752ca04cad65588dc2c4e648003b8504
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:42 2008 +0200
IDE: Coding Style fixes to drivers/ide/pci/cy82c693.c
Before:
total: 34 errors, 14 warnings, 456 lines checked
After:
total: 0 errors, 8 warnings, 456 lines checked
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit a2826190aa157a1d29bef70ca81f8b51a9b36d29
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:41 2008 +0200
IDE: Coding Style fixes to drivers/ide/pci/it8213.c
File is now error free, only a few
WARNING: line over 80 characters
are left.
Compile tested.
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 52d3ccf762f4cbc539b727e158cfb7b9ff4dd8d9
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:41 2008 +0200
IDE: Coding Style fixes to drivers/ide/ide-floppy.c
File is now error free.
Compile tested.
[bart: minor fixes, md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 38bdb4105ec852d743eb4e82db2b8b725a14c911
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:41 2008 +0200
IDE: Coding Style fixes to drivers/ide/legacy/ali14xx.c
File is now error free, 2 warnings left.
Compile tested.
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ec29782ba3fe6bd72668af8e0f7f18cd14a3dbcd
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:41 2008 +0200
IDE: Coding Style fixes to drivers/ide/legacy/hd.c
Fix a lot of errors and warnings.
Compile tested.
[bart: some fixes, md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 4752b5e7761a75bfc41ba3d9f4f8986643f22259
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:41 2008 +0200
IDE: Coding Style fixes to drivers/ide/pci/cmd640.c
Fix all the errors and a few warnings.
Compile tested.
[bart: some fixes, md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 4eb68a256d223ce71ae8399e51264708cbc8002b
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:41 2008 +0200
IDE: Coding Style fixes to drivers/ide/pci/opti621.c
Compile tested.
[bart: some fixes, md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 177b8fe9a5f58731e72d5b582a707868e2a29d11
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:40 2008 +0200
IDE: Coding Style fixes to drivers/ide/ide-pnp.c
File is now error free.
Compile tested.
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 441e92dae0b64b577ea5a88861e86805f69e13cf
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:40 2008 +0200
IDE: Coding Style fixes to drivers/ide/ide-proc.c
Lot of errors and warnings removed.
Compile tested.
[bart: minor fixes, md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f94e00847c9eda89c30b96c78d4b08e3fb0cf902
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:40 2008 +0200
IDE: Coding Style fixes to drivers/ide/legacy/ide-4drives.c
File is now error and warning free.
Compile tested.
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 0905bc94d5ad8a928eed26e0896857fb54dcb366
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:40 2008 +0200
IDE: Coding Style fixes to drivers/ide/legacy/umc8672.c
File is now error free.
Compile tested.
[bart: minor fixes, md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 17deabdcded322c04c5ec2baf8cf38c58017f08e
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:40 2008 +0200
IDE: Coding Style fixes to drivers/ide/pci/generic.c
File is now error free.
Compile tested.
[bart: fix issues noticed by Adrian Bunk & Cyrill Gorcunov, md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 740694f5e0fa7db39eac12e06d1df3f2585ad7bd
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:40 2008 +0200
IDE: Coding Style fixes to drivers/ide/pci/jmicron.c
File is now error free.
Compile tested.
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1eb3c2ee1d20cc03d538232c05b8f320de6b1401
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:39 2008 +0200
IDE: Coding Style fixes to drivers/ide/pci/sis5513.c
About 300 errors and warnings fixed.
File is now error free.
Compile tested.
[bart: minor fixes, md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5749c847405dd6f1b34247a38fa5121c17ef1993
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:39 2008 +0200
IDE: Coding Style fixes to drivers/ide/pci/slc90e66.c
File is now error free, only 1 warning left.
Compile tested.
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5c634bb9ad7e8fac0839d0f36e7b9ee197887d45
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:39 2008 +0200
IDE: Coding Style fixes to drivers/ide/pci/tc86c001.c
File is now error and warning free.
Compile tested.
[bart: md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 846bb88ae8980b98b11e0298c7ab8cfc9539c3f6
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Sat Apr 26 17:36:39 2008 +0200
IDE: Coding Style fixes to drivers/ide/setup-pci.c
File is now error free.
Compile tested.
[bart: minor fixes, md5sum checked]
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 05230e23cf02d939865a902f6ec4c1b2c82faf33
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:39 2008 +0200
ide: remove hwif->straight8 flag
All host drivers now either set hwif->mmio or reserve continuous
I/O resources so remove no longer needed hwif->straight8 flag
and never reached code for 'hwif->straight8 == 0' case.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 951784b667d78dad52ffea0a958fdbe14da97972
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:38 2008 +0200
ide: remove IDE_HFLAG_CY82C693 host flag
Sergei suggested that it shouldn't be necessary + it had no effect
anyway since ide_id_dma_bug() is called earlier in ide_tune_dma().
Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit cb5528ab19ece76be5299b33746ca7d58c187a26
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:38 2008 +0200
falconide: fix resources reservation (take 2)
* Tell IDE layer to not manage resources by setting
hwif->mmio flag and request resources in falconide_init().
* Use request_mem_region() for resources reservation.
* Use driver name for resources reservation.
v2:
* Fix missing printk() parameter. (Noticed by Geert Uytterhoeven)
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Michael Schmitz <schmitz at debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 54c05395273678fe23e9169a435fdc15ee17535e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:38 2008 +0200
ide-mpc8xx: fix resources reservation
* Tell IDE layer to not manage resources by setting
hwif->mmio flag and request resources in m8xx_ide_init_ports().
* Use request_mem_region() for resources reservation.
* Use driver name for resources reservation.
Cc: Vitaly Bordug <vitb at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit cb7500db0e94c61b79712bc081dd90da68a4a40c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:38 2008 +0200
ide-mpc8xx: make m8xx_ide_init_ports() return an error value
* Make m8xx_ide_init_ports() return an error value.
* Update mpc8xx_ide_probe() to setup/probe only ports for which
m8xx_ide_init_ports() succedded.
Cc: Vitaly Bordug <vitb at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b81c2266e36f6bdf0c7186d21b375e32d8929df8
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:38 2008 +0200
bast-ide: fix resources reservation
* Tell IDE layer to not manage resources by setting
hwif->mmio flag and request resources in bastide_init().
* Use request_mem_region() for resources reservation.
* Use driver name for resources reservation.
Cc: Ben Dooks <support at simtec.co.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7f6f33c131b34a5eca6350c2bd8a254e55550e92
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:38 2008 +0200
delkin_cb: fix resources handling
Tell IDE layer to not manage resources by setting hwif->mmio flag.
Cc: Mark Lord <mlord at pobox.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3e2990eae03c3f998f365824330290d227e4415a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:37 2008 +0200
ide_platform: fix resources handling
Tell IDE layer to not manage resources by always setting hwif->mmio flag
(resources are handled by a platform device).
Cc: Anton Vorontsov <avorontsov at ru.mvista.com>
Cc: Vitaly Bordug <vitb at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b3a37f1284e05c35687522248e66dfda62924066
Author: Adrian Bunk <bunk at kernel.org>
Date: Sat Apr 26 17:36:37 2008 +0200
remove include/linux/hdsmart.h
include/linux/hdsmart.h is not used by the kernel and should therefore
be removed.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: "Robert P. J. Day" <rpjday at crashcourse.ca>,
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 968c49641338f4fb71d35352d49b1d25a68c5e93
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Sat Apr 26 17:36:37 2008 +0200
ide-cd: remove the internal 64k buffer
This removes the internal ide-cd buffer and falls back to read-ahead block layer
capabilities. Thorough testing (cd burning, dvd read, raw read) gives with the
bufferless mode marginally better performance in addition to simplified code.
bufferless:
dd: reading `/dev/hdc': Input/output error
6238+0 records in
6238+0 records out
204406784 bytes (204 MB) copied, 259.891 s, 787 kB/s
real 4m21.598s
user 0m0.014s
sys 0m0.744s
with the old buffer (2.6.25-rc1):
dd: reading `/dev/hdc': Input/output error
6238+0 records in
6238+0 records out
204406784 bytes (204 MB) copied, 262.893 s, 778 kB/s
real 4m22.938s
user 0m0.009s
sys 0m0.771s
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9841654949f0a3f1289b6b95b2ab56cd99fb5360
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:37 2008 +0200
ide-disk: fix issues found by checkpatch.pl
There are no changes to the resulting drivers/ide/ide-disk.o binary file
(md5sum-s after and before the patch match).
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 799ee57ac83f019f035024614d95067ce583bc2b
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:37 2008 +0200
ide-disk: add proc_idedisk_read_smart() helper
* Factor out common code from proc_idedisk_read_smart_{thresholds,values}()
to proc_idedisk_read_smart() helper.
* Rename proc_idedisk_read_smart_thresholds() to proc_idedisk_read_st()
and proc_idedisk_read_smart_values() to proc_idedisk_read_sv().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1a2f84ea3e5110872b9aa86763360609b4b04e1b
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:36 2008 +0200
ide: unexport ide_hwifs[]
All modular users have been fixed to not reference ide_hwifs[] directly.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit dc9114e27acecc5a2ce2394a284a07e4e6ae5849
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:36 2008 +0200
ide-generic: use ide_find_port() (take 3)
There should be no functional changes caused by this patch.
v2:
* Fix comment (noticed by Sergei Shtylyov).
v3:
* Fix no initalization of idx in some case. (Johann Felix Soden)
Cc: Johann Felix Soden <johfel at users.sourceforge.net>
Cc: Kamalesh Babulal <kamalesh at linux.vnet.ibm.com>
Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e277f91fef8a0ff7726ad33eb79c6f0d0c6229a8
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:36 2008 +0200
ide: use ide_find_port() in legacy VLB host drivers (take 2)
* Add IDE_HFLAG_QD_2ND_PORT host flag to indicate the need of skipping
first ide_hwifs[] slot for the second port of QD65xx controller.
* Handle this new host flag in ide_find_port_slot().
* Convert legacy VLB host drivers to use ide_find_port().
While at it:
* Fix couple of printk()-s in qd65xx host driver to not use hwif->name.
v2:
* Fix qd65xx.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit fe80b937c9917887e4fbfaaf52f498b5ac3a6999
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:36 2008 +0200
ide: merge ide_match_hwif() and ide_find_port()
* Change ide_match_hwif() argument from 'u8 bootable' to
'struct ide_port_info *d'.
* Move ide_match_hwif() to ide-probe.c from setup-pci.c and rename
it to ide_find_port_slot(). Update some comments while at it.
* ide_find_port() can be now just a wrapper for ide_find_port_slot().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 078fdf789c4ef13dcb7b5651ff330e325d764c0e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:36 2008 +0200
ide: remove PIO "downgrade" quirk
No need for it nowadays so remove quirk code from ide_get_best_pio_mode()
and IDE_HFLAG_PIO_DOWNGRADE host flag.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 00fe8b7ac2ff6b8afba11642fb71cdb17aa34df9
Author: Julia Lawall <julia at diku.dk>
Date: Sat Apr 26 17:36:35 2008 +0200
ide: use DIV_ROUND_UP
The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /
(d)) but is perhaps more readable.
An extract of the semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@haskernel@
@@
#include <linux/kernel.h>
@depends on haskernel@
expression n,d;
@@
(
- (n + d - 1) / d
+ DIV_ROUND_UP(n,d)
|
- (n + (d - 1)) / d
+ DIV_ROUND_UP(n,d)
)
@depends on haskernel@
expression n,d;
@@
- DIV_ROUND_UP((n),d)
+ DIV_ROUND_UP(n,d)
@depends on haskernel@
expression n,d;
@@
- DIV_ROUND_UP(n,(d))
+ DIV_ROUND_UP(n,d)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5e71d9c5a50b92b33d35061d42ac39166db9578e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:35 2008 +0200
ide: IDE_HFLAG_BOOTABLE -> IDE_HFLAG_NON_BOOTABLE
"bootable" should be the default behavior so replace
IDE_HFLAG_BOOTABLE host flag with IDE_HFLAG_NON_BOOTABLE.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7daf66dd142b1978bf8670d9d959d835de37476f
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:35 2008 +0200
qd65xx: return error value in qd_probe()
Return error value in qd_probe() and use it in qd65xx_init()
instead of checking ide_hwifs[].chipset.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 2e4ed2955d0de73cd43793ff495ea027e9fd2f44
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:35 2008 +0200
ht6560b: use driver name for resource allocation
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d147e7d8f22c18cfb879513e8e1e10fa52f9789e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:34 2008 +0200
umc8672: don't use ide_hwifs[] in umc_set_pio_mode()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 589b06262021f8d52847c9389acf26e95c6b3732
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:34 2008 +0200
scc_pata: store 'hwif' pointer in struct scc_ports
Replace 'unsigned char hwif_id' by 'ide_hwif_t *hwif' in struct scc_ports.
This allows us to remove ide_hwifs[] usage from scc_remove().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 84f05df49a7376037f8b9fa1135df5a08cc32070
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:33 2008 +0200
cmd640: use ide_find_port()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9523076ac9142cea5a6df29ba9091eb68a10f14d
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:33 2008 +0200
cmd640: remove cmd_drives[]
* Pass 'ide_drive_t *drive' to check_prefetch(), set_prefetch_mode(),
program_drive_counts() and cmd640_set_mode().
* Remove no longer needed cmd_drives[].
* Inline setup_device_ptrs() helper in cmd640x_init().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 4f7bada25098e076e83ffcd762e3079c19d40140
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:33 2008 +0200
au1xxx-ide: use ide_find_port()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3fd4d205c73951ce6eaaa16fa3158636d1c35a5d
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:33 2008 +0200
scc_pata: use ide_find_port()
There should be no functional changes caused by this patch.
Cc: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Cc: Akira Iguchi <akira2.iguchi at toshiba.co.jp>
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e7ee1d5abc2fffad16f7b2fb80f5d4e09133cbc1
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:33 2008 +0200
sgiioc4: use ide_find_port()
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 939b0f1d32c0d5fb68531ced559598df211bc323
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:33 2008 +0200
ide-pmac: use ide_find_port()
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5297a3e522ff77e01fd0e792acc5ff0517822708
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:32 2008 +0200
ide-pmac: dynamically allocate struct pmac_ide_hwif instances (take 2)
* Dynamically allocate struct pmac_ide_hwif instances in pmac_ide_macio_attach()
and pmac_ide_pci_attach(), then remove no longer needed pmac_ide[].
v2:
* Build fix from Kamalesh Babulal.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Kamalesh Babulal <kamalesh at linux.vnet.ibm.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7d9f3d51cf351ac35b4004cc40c7fd885fb30c5c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:32 2008 +0200
swarm: use ide_find_port()
Cc: Maciej W. Rozycki <macro at linux-mips.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 59bff5ba5529feac3a0214d897b1920cbe4e2278
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:32 2008 +0200
ide: cleanup ide_find_port()
Remove no longer needed matching against I/O base and 'base' argument.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit bad7c825cb27377faf1c926953aa15c980c62620
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sat Apr 26 17:36:31 2008 +0200
ide: cleanup ide_match_hwif()
* Remove no longer needed matching against I/O base and 'io_base' argument.
* Move printk() to the caller and remove 'name' argument.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1baccff8a5823b51d7bf2740ef3ef17e06bfa7e2
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Sat Apr 26 17:36:31 2008 +0200
ide: make ide_pci_check_iomem() actually work
This function didn't actually check if a given BAR is in I/O space because of
using the bogus PCI_BASE_ADDRESS_IO_MASK (which equals ~3) to test the resource
flags instead of IORESOURCE_IO -- fix this, make ide_hwif_configure() check the
results failing if necessary, and move the printk() call to the failure path.
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 938da770c205989945ba4cc5f0b4e255702061a1
Author: Frederik Deweerdt <frederik.deweerdt at gmail.com>
Date: Sat Apr 26 17:36:31 2008 +0200
ide/Kconfig: BLK_DEV_4DRIVES should be a tristate
The 4drives should be a tristate, the following breakage occurs otherwise:
ERROR: "probe_4drives" [drivers/ide/ide-core.ko] undefined!
The following (compile tested) patch fixes it for me.
Signed-off-by: Frederik Deweerdt <frederik.deweerdt at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 537166f6fa282c683663d6ac0c631b7456b5be95
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Sat Apr 26 17:36:31 2008 +0200
fix execve()
Arrgghhh...
Sorry about that, I'd been sure I'd folded that one, but it actually got
lost. Please apply - that unbreaks execve().
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5afca33a43786408ce74540b54855973dde32bab
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Fri Apr 11 13:29:04 2008 +0200
x86: section mismatch fixes, #3
This patch fixes section mismatch warnings in unlock_ExtINT_logic().
WARNING: arch/x86/kernel/built-in.o(.text+0x14a92): Section mismatch in reference from the function unlock_ExtINT_logic()
to the function .init.text:find_isa_irq_pin()
The function unlock_ExtINT_logic() references
the function __init find_isa_irq_pin().
This is often because unlock_ExtINT_logic lacks a __init
annotation or the annotation of find_isa_irq_pin is wrong.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b6dbf334b0da14fafd4f747791a177ee4c7aae3b
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Fri Apr 11 13:28:49 2008 +0200
x86: section mismatch fixes, #2
This patch fixes section mismatch warnings in smpboot_setup_io_apic().
WARNING: arch/x86/kernel/built-in.o(.text+0x11781): Section mismatch in reference from the function smpboot_setup_io_apic()
to the function .init.text:setup_IO_APIC()
The function smpboot_setup_io_apic() references
the function __init setup_IO_APIC().
This is often because smpboot_setup_io_apic lacks a __init
annotation or the annotation of setup_IO_APIC is wrong.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 6d4ce043268451b8016480461717f2aa59b5486c
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Sun Apr 13 17:41:04 2008 +0200
x86: pgtable_32.h - prototype and section mismatch fixes
This patch adds extern to native_pagetable_setup_[start,done]() protypes and
fixes following section mismatch warning:
WARNING: arch/x86/mm/built-in.o(.text+0xf2): Section mismatch in reference from
the function paravirt_pagetable_setup_start()
paravirt_pagetable_setup_[start,done]() is used by __init pagetable_init().
Annotate both functions with __init.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 28acf285deb193a1898bd531d778b0d1b1b75f2c
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Sat Apr 12 17:41:12 2008 +0200
x86: unlock_ExtINT_logic() - fix section mismatch warnings
Fix following warning:
WARNING: arch/x86/kernel/built-in.o(.text+0x12cc9): Section mismatch in reference from the function unlock_ExtINT_logic()
unlock_ExtINT_logic() is only used by __init check_timer(). Annotate unlock_ExtINT_logic() witch __init.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 991074fd35e9e584d3cc28b4cba2e12743aeaa46
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Sat Apr 12 17:39:57 2008 +0200
x86: uniq_ioapic_id - fix section mismatch warning
Fix folowing warning:
WARNING: arch/x86/kernel/built-in.o(.text+0x10799): Section mismatch in reference from the function uniq_ioapic_id()
uniq_ioapic_id() is only used by __init mp_register_ioapic(). Annotate uniq_ioapic_id() with __init.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4c01f23bdbd34e7edeadbaa920c3018307a541d5
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Sat Apr 12 17:38:52 2008 +0200
x86: trampoline_32.S - switch to .cpuinit.data
This patch fixes section mismatch warnings of __cpuinit
setup_trampoline() on 32-bit host.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 356fa0c6e1ad3d3b01884f08a203bc84d555b880
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:20 2008 +0900
x86: use get_bios_ebda()
Use get_bios_ebda().
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ae5830a6f8278e1bb700a0956cacc9ceaf311f83
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:19 2008 +0900
x86: remove duplicate get_bios_ebda() from rio.h
get_bios_ebda() exists in asm/rio.h and asm/bios_ebda.h.
This patch removes the one in asm/rio.h.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 2c0903f2abde95d931ecccac7198a685eb04e958
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:18 2008 +0900
x86: get_bios_ebda() requires asm/io.h
include <asm/io.h> for phys_to_virt()
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7c04e64a1b43b4c8fea281ce1f82df30ed9bab4e
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:17 2008 +0900
x86: use cpumask function for present, possible, and online cpus
cpu_online(), cpu_present(), for_each_possible_cpu(), num_possible_cpus()
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 877084fb1cf6167c5441b0a30c3d9ef9b7be0a3a
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:16 2008 +0900
x86: cleanup div_sc() usage
Remove the magic number in the third argment of div_sc().
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d454157b113718a92ba5accc03cee64c7e081483
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:15 2008 +0900
x86: cleanup clocksource_hz2mult usage
Remove the magic number in the second argument of clocksource_hz2mult()
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b1fceac2b9e04d278316b2faddf276015fc06e3b
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:14 2008 +0900
x86: remove unnecessary memset and NULL check after alloc_bootmem()
memset and NULL check after alloc_bootmem() are unnecessary.
Because it returns zeroed memory and it never return NULL.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit a1a33fa315b8a5a390f1132681485209500ff5b5
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:13 2008 +0900
x86: use bitmap library for pin_programmed
Use bitmap library for pin_programmed rather than reinvent
bitmaps.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4abc1a0068945ac078fb0a00a359cd3be2e7dd8d
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:12 2008 +0900
x86: use MP_intsrc_info()
Remove duplicate code by using MP_intsrc_info() in mpparse.c
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 5d47a271f38cf2ba7299047ad0bf3ac7e4c4a214
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 19 23:55:11 2008 +0900
x86: use BUILD_BUG_ON() for the size of struct intel_mp_floating
Use BUILD_BUG_ON() instead of compile-time error technique with
extern non-exsistent function.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 562b80bafffaf42a6d916b0a2ee3d684220a1c10
Author: Roland McGrath <roland at redhat.com>
Date: Tue Apr 22 12:21:25 2008 -0700
x86_64 ia32 ptrace: convert to compat_arch_ptrace
Now that there are no more special cases in sys32_ptrace, we
can convert to using the generic compat_sys_ptrace entry point.
The sys32_ptrace function gets simpler and becomes compat_arch_ptrace.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit cdb69904794d2173176b1a58e849b7b39fced390
Author: Roland McGrath <roland at redhat.com>
Date: Tue Apr 22 12:20:20 2008 -0700
x86_64 ia32 ptrace: use compat_ptrace_request for siginfo
This removes the special-case handling for PTRACE_GETSIGINFO
and PTRACE_SETSIGINFO from x86_64's sys32_ptrace. The generic
compat_ptrace_request code handles these.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 55928e37b29ba5557a5edc8ab679fe5191bc051d
Author: Roland McGrath <roland at redhat.com>
Date: Sat Apr 19 14:27:56 2008 -0700
x86 signals: lift set_fs
This lifts the set_fs(USER_DS) call for signal handler setup out of the
three places copying the same code into the one place that calls them
all. There is no change in what it does.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8b9c5ff380aa4f10658171ed2b9abc1e0861b770
Author: Roland McGrath <roland at redhat.com>
Date: Sat Apr 19 14:26:54 2008 -0700
x86 signals: lift flags diddling code
This lifts the code diddling the TF and DF bits for signal handler setup
out of the several places copying the same code into the one place that
calls them all. There is no change in what it does.
I also separated the recently-added DF bit clearing from the TF diddling.
The compiler turns them back into one instruction anyway. The tossing
in of DF to the same line of code with no new comments was a bit more
arcane than seems wise.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f7f17a67c589f031c567d9fdc809dee7c5868c8a
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Mon Apr 21 00:47:55 2008 +0400
x86: remove NexGen support
It is claimed that NexGen CPUs were never shipped:
http://lkml.org/lkml/2008/4/20/179
Also, the kernel support for these chips has been broken for
a long time, the code intended to support NexGen thereby being
essentially dead.
As an outcome of the discussion that can be found using the URL
above, this patch removes the NexGen support altogether.
The changes in this patch survived a defconfig build for i386, a
couple of successful randconfig builds, as well as a runtime test,
which consisted in booting a 32-bit x86 box up to the shell prompt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit a2b4bd9c95a799ce1002e699187f17ddaa754eb1
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Sun Apr 20 06:54:33 2008 +0400
x86: array can become static
In arch/x86/kernel/setup_64.c, the standard_io_resources array
is needlessly defined as global. This patch makes this variable
static.
This patch was successfully build-tested using the defconfig
for x86_64. Runtime test was performed by booting a 64-bit x86
box up to the shell prompt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f3b14a32db9a74f2bbda980bc95cd4b1f136d80a
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date: Sun Apr 20 06:54:31 2008 +0400
x86: remove unused function amd_init_cpu()
There are no users for the function amd_init_cpu() defined in
arch/x86/kernel/cpu/amd.c. This patch removes this routine.
This patch was build-tested using defconfigs for i386 and x86_64,
and a few randconfig instances. Runtime tests were performed by
booting 32- and 64-bit x86 boxen up to the shell prompt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 911f6a7ba21795865ab30fc5f88aa198b0daee5f
Author: Jan Beulich <jbeulich at novell.com>
Date: Tue Apr 22 16:22:21 2008 +0100
x86-64: extend MCE CPU quirk handling
At least on my Barcelona, I see MCE log entries after cold boot caused
by BIOS not properly clearing the respective registers. Therefore, this
patch extends the workaround to families 0x10 and 0x11 (the latter just
for completeness, I have nothing to verify this against).
At the same time, provide a way to make these entries visible via the
'mce=bootlog' command line option even on these machines.
Signed-off-by: Jan Beulich <jbeulich at novell.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 79bf0e0353e0a34dbe0b2ef659a9bdd8056ca524
Author: Jan Beulich <jbeulich at novell.com>
Date: Tue Apr 22 16:19:25 2008 +0100
i386: fix signal type for iret exception
.. since it uses ILL_BADSTK (which is meaningless in the context of
SIGSEGV).
Signed-off-by: Jan Beulich <jbeulich at novell.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 86d78f640257344cc90a50da8cd52297ba1c6bdf
Author: Jan Beulich <jbeulich at novell.com>
Date: Tue Apr 22 16:28:41 2008 +0100
x86: fix watchdog ops for CoreDuo
There apparently was an unnoticed conflict between an earlier patch to
this file and mine (d1e084746b0e5806e6345ab31c5b370f8dee2b23), which
I noticed only now. I suppose a change like the one below (untested) is
needed; I didn't get any response on a confirmation request for this from
the submitter of the first patch.
The issue is the writing of the 'checkbit' member at the end of
setup_intel_arch_watchdog(), which my patch made go to intel_arch_wd_ops
rather than wd_ops.
Signed-off-by: Jan Beulich <jbeulich at novell.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b11caa7c7063ea92a0a58115d3fc6d038ed89510
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun Apr 20 22:02:17 2008 +0300
fix asm-x86/{posix_types,unistd}.h
Jeff Chua reported that:
Commit e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9
(x86: cleanup duplicate includes) turned the userspace
asm-x86/posix_types.h and asm-x86/unistd.h headers into
empty files.
This patch reverts these bogus changes.
Reported-by: Jeff Chua <jeff.chua.linux at gmail.com>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 5065dbafc299507f16731434e95b91dadff03006
Author: Jan Beulich <jbeulich at novell.com>
Date: Tue Apr 22 16:16:50 2008 +0100
i386: fix asm constraint in do_IRQ()
Two prior changes resulted in the "ecx" clobber being lost.
Signed-off-by: Jan Beulich <jbeulich at novell.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8db979bcfe46dcdced1065e9359e4ef7a50b8a6f
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 26 10:26:52 2008 +0200
x86 PAT: decouple from nonpromisc devmem
Linus pointed it out that PAT should not depend on NONPROMISC_DEVMEM.
Also make PAT non-default.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 1ebcc654f010d4a63f3ebf8ddd2cab5a709b1824
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 26 11:40:31 2008 +0200
x86 PAT: tone down debugging messages
Linus reported these excessive debug printouts:
> Overlap at 0xe0300000-0xe0400000
> Overlap at 0xe0300000-0xe0380000
> Overlap at 0xe0300000-0xe0400000
> Overlap at 0xe0300000-0xe0400000
> Overlap at 0xe0300000-0xe0400000
> Overlap at 0xe0300000-0xe0400000
> Overlap at 0xe0300000-0xe0400000
turn that into a pr_debug().
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 37c45df740f79c58bb0fc0de151fd2504234032b
Author: Jean Delvare <khali at linux-fr.org>
Date: Fri Apr 25 20:42:45 2008 -0300
V4L/DVB (7751): ir-kbd-i2c: Save a temporary memory allocation in ir_probe
Using i2c_transfer instead of i2c_master_recv in ir_probe saves a
temporary memory allocation.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b33d24c4cc14ee40d83a7e1ea0bfb9567d6059aa
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 25 19:06:03 2008 -0300
V4L/DVB (7750): au0828/ cleanups and fixes
This patch contains the following cleanups and fixes:
- "debug" is definitely not a good name for a global variable,
renamed it to "au0828_debug"
this fixes a compile error with some kernel configurations
- since the module parameter is int the variable shouldn't be unsigned
- remove the {usb,bridge,i2c}_debug module parameters since they are
already covered by the "debug" module parameter
- remove the unused au0828_bcount
- make the needlessly global i2c_scan static
- make the needlessly global dvb_register() static
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b9ef6bbbbeaf65c6a452fe3c75c196f86e0d984d
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sat Apr 26 11:29:34 2008 -0300
V4L/DVB (7748): tuner-core: some adjustments at tuner logs, if debug enabled
set_addr log were almost useless: discarded SET_TYPE_ADDR commands weren't
reported.
This patch changed set_addr printk to print a message only if set_addr is
wrong.
It also fix printk at set_type, since, if an attach were failing, nothing
were reported.
With the current code, working or not, a call to set_addr will produce a debug
printk.
also, set_type() were producing a false error message on tuner_xc2028, since
it were requesting for setting a frequency on a place where firmware name
weren't set yet.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0e3cbe81d52d18d83d068935512bd623a8765c12
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 25 02:19:44 2008 -0300
V4L/DVB (7746): pvrusb2: make signed one-bit bitfields unsigned
Single-bit signed bitfields can only take 0/-1 rather than 0/1 as the
drivers seems to assume...add unsigned.
Noticed by sparse:
drivers/media/video/pvrusb2/pvrusb2-devattr.h:107:34: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:114:37: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:117:30: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:120:23: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:124:24: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:128:23: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:138:36: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:143:24: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:144:28: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:145:26: error: dubious one-bit signed bitfield
drivers/media/video/pvrusb2/pvrusb2-devattr.h:146:23: error: dubious one-bit signed bitfield
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4aef8fddb6639056ea830509ce3015c79f158011
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri Apr 25 04:19:02 2008 -0300
V4L/DVB (7744): pvrusb2-dvb: add atsc/qam support for Hauppauge pvrusb2 model 751xx
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d893d5dc7fef94a072a74f3141f9d1f60fd0cc7e
Author: Steven Toth <stoth at hauppauge.com>
Date: Fri Apr 25 03:46:43 2008 -0300
V4L/DVB (7742): cx88: Add support for the DViCO FusionHDTV_7_GOLD digital modes
The S5H1411 demodulator is now enabled.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8b4f1d031627d6f36d6ada05ab7670c2317efdaa
Author: Steven Toth <stoth at hauppauge.com>
Date: Fri Apr 25 03:44:36 2008 -0300
V4L/DVB (7741): s5h1411: Adding support for this ATSC/QAM demodulator
This adds full support for this demodulator.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8367fe248d74d53a6ae10e373c73230ab1536599
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 25 01:28:10 2008 -0300
V4L/DVB (7740): tuner-xc2028.c dubious !x & y
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a45e0b45e52adb10634112b338dfb3e66a83de31
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 25 01:49:24 2008 -0300
V4L/DVB (7739): mt312.h: dubious one-bit signed bitfield
Make it unsigned (0/1) rather than signed (0/-1).
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d0d14226b94546a0054ded495157aa1cb41a7259
Author: Brandon Philips <brandon at ifup.org>
Date: Thu Apr 24 21:34:00 2008 -0300
V4L/DVB (7735): Fix compilation for au0828
Encountered this error when testing.
Kernel: arch/x86/boot/bzImage is ready (#76)
MODPOST 813 modules
ERROR: "dvb_dmx_init" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_unregister_adapter" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_register_frontend" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_unregister_frontend" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_net_release" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_frontend_detach" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_dmxdev_release" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_net_init" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_dmx_release" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_dmx_swfilter_packets" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_register_adapter" [drivers/media/video/au0828/au0828.ko] undefined!
ERROR: "dvb_dmxdev_init" [drivers/media/video/au0828/au0828.ko] undefined!
WARNING: modpost: Found 9 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 094f9b4b317b235b8d7fa03b356b9a3f3633b55b
Author: Janne Grunau <janne-dvb at grunau.be>
Date: Thu Apr 24 20:19:22 2008 -0300
V4L/DVB (7734): em28xx: copy and paste error in em28xx_init_isoc
Fixes a copy and paste error in check of kzalloc return value. The check block
was copied from the previous allocation but the variable wasn't exchanged.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 50fa46b25490039ef51ef0dc8afdded60c4d3b59
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Sat Apr 26 11:25:18 2008 -0300
V4L/DVB (7733): blackbird_find_mailbox negative return ignored in blackbird_initialize_codec()
dev->mailbox is unsigned. so a negative return goes unnoticed
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 63b79cfa05b35973713caa91e290311bd5ebbe1d
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sat Apr 26 08:25:18 2008 -0300
V4L/DVB (7732): vivi: fix a warning
some gcc versions complain that fh is used without being defined.
The error report is bogus. However, fixing it is trivial. Better to make
gcc happy.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 09aa356b5584090aab6810ec8002936d710cd4ac
Author: Mathieu Segaud <mathieu.segaud at regala.cx>
Date: Fri Apr 18 13:29:38 2008 -0700
agp: convert drivers/char/agp/frontend.c to use unlocked_ioctl
As of now, agp_compat_ioctl already runs without the BKL. Mutual exclusion
is enforced by agp_fe.agp_mutex in agp_ioctl() and agp_compat_ioctl().
Apply the same locking rationale to the two functions allowing BKL cleanup.
Signed-off-by: Mathieu Segaud <mathieu.segaud at regala.cx>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Airlie <airlied at linux.ie>
commit 4ab92bcf773e7b9e1367897047d5fa4d151d9e90
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Sat Apr 26 18:38:04 2008 +1000
agp: fix shadowed variable warning in amd-k7-agp.c
Introduced between 2.6.25-rc2 and -rc3
drivers/char/agp/amd-k7-agp.c:439:6: warning: symbol 'cap_ptr' shadows an
earlier one
drivers/char/agp/amd-k7-agp.c:414:5: originally declared here
cap_ptr is never used again in this function, don't bother redeclaring.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Airlie <airlied at linux.ie>
commit b74e2082f8e7b8f37af3fc39e8ee0dd0d218c589
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Apr 26 18:21:28 2008 +1000
drm: _end is shadowing real _end, just rename it.
Signed-off-by: Dave Airlie <airlied at linux.ie>
commit ac741ab71bb39e6977694ac0cc26678d8673cda4
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Tue Apr 22 16:03:07 2008 +1000
drm/vbl rework: rework how the drm deals with vblank.
Other Authors: Michel Dänzer <michel at tungstengraphics.com>
mga: Ian Romanick <idr at us.ibm.com>
via: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
This re-works the DRM internals to provide a better interface for drivers
to expose vblank on multiple crtcs.
It also includes work done by Michel on making i915 triple buffering and pageflipping work properly.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 2c14f28be2a3f2a2e9861b156d64fbe2bc7000c3
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Apr 21 16:47:32 2008 +1000
drm: reorganise minor number handling using backported modesetting code.
rips out the head crap and replaces it with an idr and drm_minor structure
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 7b832b56bd971348329c3f4c753ca0abfdf3a3d1
Author: Keith Packard <keithp at keithp.com>
Date: Mon Apr 21 16:31:10 2008 +1000
drm/i915: Handle tiled buffers in vblank tasklet
The vblank tasklet update code must build 2D blt commands with the appropriate
tiled flags
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit a36b7dcc05bc4c4580f11cf78e95edfefa86b8a6
Author: Keith Packard <keithp at keithp.com>
Date: Mon Apr 21 16:27:24 2008 +1000
drm/i965: On I965, use correct 3DSTATE_DRAWING_RECTANGLE command in vblank
The batchbuffer submission paths were fixed to use the 965-specific command,
but the vblank tasklet was not. When the older version is sent, the 965 will
lock up.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit f1c3e67eb73a4a1db31e235883156ac098e29ff6
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Sun Apr 20 10:26:31 2008 +1000
drm: Remove unneeded dma sync in ATI pcigart alloc
Now that the ATI pcigart code uses dma_alloc_coherent, we don't need
the dma_sync_single_for_device() that we used to have here.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 5ff64611333fd282793ff8997e02138aa2f6aab9
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Sun Apr 20 10:26:25 2008 +1000
drm: Fix mismerge of non-coherent DMA patch
The patch for supporting non coherent PCI DMA in the DRM was mismerged
causing the page protection to be updated for the wrong type of
mapping.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit b1721d0da266b4af8cb4419473b4ca36206ab200
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 25 19:03:08 2008 -0700
v4l/dvb: add statics to avoid multiple definitions
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bc84e0a160e383deb56568f4e03bc51b1ce16775
Merge: a92910723a5af54f81373875fd95133c88df94bd f8f95702f0c4529b0f59488f4509608f0c160e77
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 19:05:55 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] sanitize locate_fd()
[PATCH] sanitize unshare_files/reset_files_struct
[PATCH] sanitize handling of shared descriptor tables in failing execve()
[PATCH] close race in unshare_files()
[PATCH] restore sane ->umount_begin() API
cifs: timeout dfs automounts +little fix.
commit a92910723a5af54f81373875fd95133c88df94bd
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 25 18:40:01 2008 -0700
mac-hid: fix build after lockdep annotation
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 753d7054c318f323a7c135c71c68171a6b6a88fc
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Fri Apr 25 16:38:44 2008 -0700
documentation: remove smart-config.txt
As requested by Sam Ravnborg: Remove Documentation/smart-config.txt.
It is outdated and has been (functionally) replaced by
Documentation/kbuild/*.txt.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3dd7b71ca0f7ff8410a6b8cb15e5f670f90181e4
Author: Roland Dreier <rdreier at cisco.com>
Date: Fri Apr 25 15:32:51 2008 -0700
Export __locks_copy_lock() so modular lockd builds
Commit 1a747ee0 ("locks: don't call ->copy_lock methods on return of
conflicting locks") changed fs/lockd/svclock.c to call
__locks_copy_lock() instead of locks_copy_lock(), but lockd can be built
as a module and __locks_copy_lock() is not exported, which causes a
build error
ERROR: "__locks_copy_lock" [fs/lockd/lockd.ko] undefined!
with CONFIG_LOCKD=m.
Fix this by exporting __locks_copy_lock().
Signed-off-by: Roland Dreier <rolandd at cisco.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ed4d3c1061d6f367a4ef5e1656c25af3314fe2b7
Author: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Date: Fri Apr 25 14:52:32 2008 -0700
mlx4_core: Add helper to move QP to ready-to-send
Avoid duplicating code in ethernet and FC modules.
Signed-off-by: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit b7aa1f1603bea4fdec49a915712dea280cfd07e8
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:39:14 2008 -0700
pciehp: Fix command write
Current implementation of pciehp_write_cmd() always enables command
completed interrupt. But pciehp_write_cmd() is also used for clearing
command completed interrupt enable bit. In this case, we must not set
the command completed interrupt enable bit. To fix this bug, this
patch add the check to see if caller wants to change command complete
interrupt enable bit.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit ef0ff95f136f0f2d035667af5d18b824609de320
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:39:12 2008 -0700
shpchp: fix slot name
Current shpchp uses the combination of bus number and slot number as a
slot name. But it is not a good idea because bus number is not a
physical identifier but a logical identifier. This is against the shpc
specification. So remove the bus number from the physical identifier.
However, there are some platforms with the problem that it provides
the same slot number. For those platforms, this patch also introduces
new module option 'shpchp_slot_with_bus'. If it is specified, shpchp
uses the combination of bus number and slot number as a slot name.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 4ea3e58b22b3719af99c567d08136bbe50cb4435
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 25 14:39:10 2008 -0700
make pciehp_acpi_get_hp_hw_control_from_firmware()
this_patch_makes_the_needlessly_global_pciehp_acpi_get_hp_hw_control_from_firmware_static
;)
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 2aeeef11999590d88249fbd086671af8300116f4
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:39:08 2008 -0700
pciehp: Clean up pcie_init()
Clean up pciehp_ini(). This patch is trying to
- Remove redundant capablity checks that were already done in PCIe
port bus driver.
- Separate the code only for debugging and make debug information
easier to read.
- Make the entire code easier to read and understand what it is doing.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit d84be093a81c29e085144c4d483d9fa0a83a1918
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:39:07 2008 -0700
pciehp: Mask hotplug interrupt at controller release
We must disable hotplug interrupt at controller relase time, otherwise
spurious interrupts might happen if any slot events occured (e.g. MRL
change) after unloading pciehp driver.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit cff006543fa3fca2a47dd795ac524237489858d6
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:39:06 2008 -0700
pciehp: Remove useless hotplug interrupt enabling
Hotplug interrupt is enabled at initialization and nobody clears it.
So we need to setup it in each command. This patch removes redundant
codes about this.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit ae416e6b2936fdb70aeee6eb9066115d4521daa6
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:39:06 2008 -0700
pciehp: Fix wrong slot capability check
Current pciehp saves only 8bits of Slot Capability registers in
ctrl->ctrlcap. But it refers more than 8bit for checking EMI capability.
It is clearly a bug and EMI would never work. To fix this problem,
this patch saves full Slot Capability contens in ctrl->slot_cap. It also
reduce the redundant reads of Slot Capability register. And this pach
also cleans up the macros to check the slot capabilitys (e.g. MRL_SENS(),
and so on).
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit c27fb883dffe11aa4cb35ecea1fa1832ba45d4da
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:39:05 2008 -0700
pciehp: Fix wrong slot control register access
Current pciehp implementaion clears hotplug events without waiting for
command completion. Because of this, events might not be cleared properly.
To prevent this problem, we must use pciehp_write_cmd() to write to
Slot Control register.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 2d32a9aed2e335d110fbb11985a9545b1f7219ab
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:39:02 2008 -0700
pciehp: Add missing memory barrier
Fix the possible race condition between pcie_isr() and pciehp_write_cmd()
because of the lack of memory barrier.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit c6b069e94601aea8887afbbd922afe20a3580a7d
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:38:57 2008 -0700
pciehp: Fix interrupt event handlig
Current pciehp implementation disables and re-enables hotplug interrupts
in its interrupt handler. This operation might be intend to guarantee
that interrupts for the events newly occured during previous events are
being handled will be successfully generated. But current implementaion
has the following prolems.
- Current interrupt service routin clears status changes without
waiting command completion. Because of this, events might not be
cleared properly.
- Current interrupt service routine clears status changes caused by
disabling or enabling hotplug interrupts itself. This will lose new
events that occurs during previous interrupts are being handled.
- Current implementation doesn't have any serialization mechanism
between the code to wait for command completion and the interrupt
handler that clears the command completion events caused by itself.
There is clearly race conditions between them, and it may cause
the problem that waiting for command completion doesn't work for
example.
To fix those problems, this patch stops disabling/re-enabling hotplug
interrupts in interrupt service routine. Instead of this, this patch
re-inspects Slot Status register after clearing what is presumed to
be the last bending interrupt in order to guarantee that all interrupt
events are serviced.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 3800345f723fd130d50434d4717b99d4a9f383c8
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Fri Apr 25 14:38:38 2008 -0700
pciehp: fix slot name
Current pciehp uses the combination of bus number and slot number as a
slot name. But it is not a good idea because bus number is not a
physical identifier but a logical identifier. This is against the PCIE
specification. So remove the bus number from the physical identifier.
However, there are some platforms with the problem that it provides
the same slot number. For those platforms, this patch also introduces
new module option 'pciehp_slot_with_bus'. If it is specified, pciehp
uses the combination of bus number and slot number as a slot name.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 38ae6a535470b959df67ded6798fc542bb212e19
Author: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Date: Fri Apr 25 14:27:08 2008 -0700
mlx4_core: Add HW queues allocation helpers
Wrap doorbell, buffer and MTT allocation in helper functions for
ethernet and FC modules to use.
Signed-off-by: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit b9fa38f75ea7e1f64bc29653ca9758303ce698e4
Merge: 6e18933f2b6156d0a0ec9d5522ab6a6033cf7241 f360bf0015e5b3e82be61c68e0863b3f98852ee2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:52:16 2008 -0700
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (49 commits)
[POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
[POWERPC] bootwrapper: fix build error on virtex405-head.S
[POWERPC] 4xx: Fix 460GT support to not enable FPU
[POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
[POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
[POWERPC] Xilinx: boot support for Xilinx uart 16550.
[POWERPC] celleb: Add support for PCI Express
[POWERPC] celleb: Move miscellaneous files for Beat
[POWERPC] celleb: Move a file for SPU on Beat
[POWERPC] celleb: Move files for Beat mmu and iommu
[POWERPC] celleb: Move files for Beat hvcall interfaces
[POWERPC] celleb: Move the SCC related code for celleb
[POWERPC] celleb: Move the files for celleb base support
[POWERPC] celleb: Consolidate io-workarounds code
[POWERPC] cell: Generalize io-workarounds code
[POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
[POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
[POWERPC] Register udbg console early on pseries LPAR
[POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
[POWERPC] Set udbg_console index to 0
...
commit 6e18933f2b6156d0a0ec9d5522ab6a6033cf7241
Merge: eb855fd8e7f6b1d8b50f24aa36803e29b367b041 03970f065d9b4b156d0e879f82989440f7045396
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:50:00 2008 -0700
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[PATCH] Build fix for CONFIG_NUMA=y && CONFIG_SMP=n
[IA64] fix bootmem regression on Altix
commit eb855fd8e7f6b1d8b50f24aa36803e29b367b041
Merge: bf16ae250999e76aff0491a362073a552db965fc 060856c799191ffc360105cac49f3f9e68d526b7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:48:44 2008 -0700
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
leds: Add default-on trigger
leds: Document the context brightness_set needs
leds: Add new driver for the LEDs on the Freecom FSG-3
leds: Add support to leds with readable status
leds: enable support for blink_set() platform hook in leds-gpio
leds: Cleanup various whitespace and code style issues
leds: disable triggers on brightness set
leds: Add mail LED support for "Clevo D400P"
commit bf16ae250999e76aff0491a362073a552db965fc
Merge: 0b79dada976198cb1a4c043068e3b44d5cab2a5a 1526a756fba5b1f2eb5001b8e8de2a0ea1bd2c66
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:48:08 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-pat
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-pat:
generic: add ioremap_wc() interface wrapper
/dev/mem: make promisc the default
pat: cleanups
x86: PAT use reserve free memtype in mmap of /dev/mem
x86: PAT phys_mem_access_prot_allowed for dev/mem mmap
x86: PAT avoid aliasing in /dev/mem read/write
devmem: add range_is_allowed() check to mmap of /dev/mem
x86: introduce /dev/mem restrictions with a config option
commit 0b79dada976198cb1a4c043068e3b44d5cab2a5a
Merge: 50be4917ee70218f59e04dec029121b97fb9cb3d 3f5087a2bae5d1ce10a3d698dec8f879a96f5419
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:47:56 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
sched: fix share (re)distribution
softlockup: fix NOHZ wakeup
seqlock: livelock fix
commit 50be4917ee70218f59e04dec029121b97fb9cb3d
Merge: 37b05b17985ecc43a33e2a8cbdaa220115de4703 f9d42491723dbb77bdc9b9dc7e096ea57d535992
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:41:55 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_bf54x: decrease count first.
sata_mv: re-enable hotplug, update TODO list
sata_mv: leave SError bits untouched in mv_err_intr
sata_mv: more interrupt handling rework
sata_mv: tidy host controller interrupt handling
sata_mv: simplify request/response queue handling
sata_mv: simplify freeze/thaw bit-shift calculations
sata_mv mask all interrupt coalescing bits
sata_mv more cosmetics
ata_piix: add Asus Eee 701 controller to short cable list
libata-eh set tf flags in NCQ EH result_tf
make sata_set_spd_needed() static
make sata_print_link_status() static
libata-acpi.c: remove unneeded #if's
sata_nv: make hardreset return -EAGAIN on success
ahci: retry enabling AHCI a few times before spitting out WARN_ON()
libata: make WARN_ON conditions in ata_sff_hsm_move() more strict
ATA/IDE: fix platform driver hotplug/coldplug
sata_sis: SCR accessors return -EINVAL when requested SCR isn't available
libata: functions with definition should not be extern
commit 37b05b17985ecc43a33e2a8cbdaa220115de4703
Merge: ce1d5b23a8d1e19866ab82bdec0dc41fde5273d8 4953d141dc5db748475001cfbfdcc42e66cf900e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:40:57 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (120 commits)
usb: don't update devnum for wusb devices
wusb: make ep0_reinit available for modules
wusb: devices dont use a set address
wusb: teach choose_address() about wireless devices
wusb: add link wusb-usb device
wusb: add authenticathed bit to usb_dev
USB: remove unnecessary type casting of urb->context
usb serial: more fixes and groundwork for tty changes
USB: replace remaining __FUNCTION__ occurrences
USB: usbfs: export the URB_NO_INTERRUPT flag to userspace
USB: fix compile problems in ehci-hcd
USB: ehci: qh_completions cleanup and bugfix
USB: cdc-acm: signedness fix
USB: add documentation about callbacks
USB: don't explicitly reenable root-hub status interrupts
USB: OHCI: turn off RD when remote wakeup is disabled
USB: HCDs use the do_remote_wakeup flag
USB: g_file_storage: ignore bulk-out data after invalid CBW
USB: serial: remove endpoints setting checks from core and header
USB: serial: remove unneeded number endpoints settings
...
commit ce1d5b23a8d1e19866ab82bdec0dc41fde5273d8
Merge: ad5e1b0f5d913d2c8bddfba81049cc07228da1a6 308f0a5898033691d050374a949bbfe173987a16
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:38:14 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
Input: wacom - add support for Cintiq 20WSX
Input: ucb1400_ts - IRQ probe fix
Input: at32psif - update MODULE_AUTHOR with new email
Input: mac_hid - add lockdep annotation to emumousebtn
Input: i8042 - fix incorrect usage of strncpy and strncat
Input: bf54x-keys - add infrastructure for keypad wakeups
Input: add MODULE_ALIAS() to hotpluggable platform modules
Input: drivers/char/keyboard.c - use time_after
Input: fix ordering in joystick Makefile
Input: wm97xx-core - support use as a wakeup source
Input: wm97xx-core - use IRQF_SAMPLE_RANDOM
Input: wm97xx-core - only schedule interrupt handler if not already scheduled
Input: add Zhen Hua driver
Input: aiptek - add support for Genius G-PEN 560 tablet
Input: wacom - implement suspend and autosuspend
Input: xpad - set proper buffer length for outgoing requests
Input: omap-keypad - fix build warning
Input: gpio_keys - irq handling cleanup
Input: add PS/2 serio driver for AVR32 devices
Input: put ledstate in the keyboard notifier
...
commit ad5e1b0f5d913d2c8bddfba81049cc07228da1a6
Merge: 6f97b220f414e3599ea5374905ba6d0dc47d63b0 4217516e52949e6550ff01d57f92b9b24ce04be1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:36:42 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kconfig: fix broken target update-po-config
kbuild: silence documentation GEN xml messages according to $(quiet)
commit 6f97b220f414e3599ea5374905ba6d0dc47d63b0
Merge: 4b7227ca321ccf447cdc04538687c895db8b77f5 e3dcc5a387fc38e9c3c6c4f857cd9a7f71a8553a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:33:49 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (24 commits)
dm crypt: add documentation
dm: remove md argument from specific_minor
dm table: remove unused dm_create_error_table
dm table: drop void suspend_targets return
dm: unplug queues in threads
dm raid1: use timer
dm: move include files
dm kcopyd: rename
dm: expose macros
dm kcopyd: remove redundant client counting
dm kcopyd: private mempool
dm kcopyd: per device
dm log: make module use tracking internal
dm log: move register functions
dm log: clean interface
dm kcopyd: clean interface
dm io: clean interface
dm io: rename error to error_bits
dm snapshot: store pointer to target instance
dm log: move dirty region log code into separate module
...
commit 4b7227ca321ccf447cdc04538687c895db8b77f5
Merge: 5dae61b80564a5583ff4b56e357bdbc733fddb76 1775826ceec51187aa868406585799b7e76ffa7d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:32:10 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-xen-next
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-xen-next: (52 commits)
xen: add balloon driver
xen: allow compilation with non-flat memory
xen: fold xen_sysexit into xen_iret
xen: allow set_pte_at on init_mm to be lockless
xen: disable preemption during tlb flush
xen pvfb: Para-virtual framebuffer, keyboard and pointer driver
xen: Add compatibility aliases for frontend drivers
xen: Module autoprobing support for frontend drivers
xen blkfront: Delay wait for block devices until after the disk is added
xen/blkfront: use bdget_disk
xen: Make xen-blkfront write its protocol ABI to xenstore
xen: import arch generic part of xencomm
xen: make grant table arch portable
xen: replace callers of alloc_vm_area()/free_vm_area() with xen_ prefixed one
xen: make include/xen/page.h portable moving those definitions under asm dir
xen: add resend_irq_on_evtchn() definition into events.c
Xen: make events.c portable for ia64/xen support
xen: move events.c to drivers/xen for IA64/Xen support
xen: move features.c from arch/x86/xen/features.c to drivers/xen
xen: add missing definitions in include/xen/interface/vcpu.h which ia64/xen needs
...
commit 5dae61b80564a5583ff4b56e357bdbc733fddb76
Merge: 2e561c7b7e705b619122e5386d6f99f28f2b6e5a 2664ef44cf5053d2b7dff01cecac70bc601a5f68
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:29:55 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit().
[SPARC64]: Fix args to 64-bit sys_semctl() via sys_ipc().
commit 2e561c7b7e705b619122e5386d6f99f28f2b6e5a
Merge: 2cfed60cc24676d65e01278dbf10d0069de02592 653252c2302cdf2dfbca66a7e177f7db783f9efa
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:28:28 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (48 commits)
net: Fix wrong interpretation of some copy_to_user() results.
xfrm: alg_key_len & alg_icv_len should be unsigned
[netdrvr] tehuti: move ioctl perm check closer to function start
ipv6: Fix typo in net/ipv6/Kconfig
via-velocity: fix vlan receipt
tg3: sparse cleanup
forcedeth: realtek phy crossover detection
ibm_newemac: Increase MDIO timeouts
gianfar: Fix skb allocation strategy
netxen: reduce stack usage of netxen_nic_flash_print
smc911x: test after postfix decrement fails in smc911x_{reset,drop_pkt}
net drivers: fix platform driver hotplug/coldplug
forcedeth: new backoff implementation
ehea: make things static
phylib: Add support for board-level PHY fixups
[netdrvr] atlx: code movement: move atl1 parameter parsing
atlx: remove flash vendor parameter
korina: misc cleanup
korina: fix misplaced return statement
WAN: Fix confusing insmod error code for C101 too.
...
commit 2cfed60cc24676d65e01278dbf10d0069de02592
Author: Matthew Wilcox <matthew at wil.cx>
Date: Fri Apr 25 04:21:11 2008 -0600
Update .gitignore files
Add some autogenerated files to various .gitignore files
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7e97b28309edc5669ced2bb1371704e8f8d084e3
Merge: 5421d059068341b3f21df1a21c2ba9175e55ebef 3887ed5231fb6f339f36c3a0297c996cd1a1dad9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:25:48 2008 -0700
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (82 commits)
[MTD] m25p80: Add Support for ATMEL AT25DF641 64-Megabit SPI Flash
[MTD] m25p80: add FAST_READ access support to M25Pxx
[MTD] [NAND] bf5xx_nand: Avoid crash if bfin_mac is installed.
[MTD] [NAND] at91_nand: control NCE signal
[MTD] [NAND] AT91 hardware ECC compile fix for at91sam9263 / at91sam9260
[MTD] [NAND] Hardware ECC controller on at91sam9263 / at91sam9260
[JFFS2] Introduce dbg_readinode2 log level, use it to shut read_dnode() up
[JFFS2] Fix jffs2_reserve_space() when all blocks are pending erasure.
[JFFS2] Add erase_checking_list to hold blocks being marked.
UBI: add a message
[JFFS2] Return values of jffs2_block_check_erase error paths
[MTD] Clean up AR7 partition map support
[MTD] [NOR] Fix Intel CFI driver for collie flash
[JFFS2] Finally remove redundant ref->__totlen field.
[JFFS2] Honour TEST_TOTLEN macro in debugging code. ref->__totlen is going!
[JFFS2] Add paranoia debugging for superblock counts
[JFFS2] Fix free space leak with in-band cleanmarkers
[JFFS2] Self-sufficient #includes in jffs2_fs_i.h: include <linux/mutex.h>
[MTD] [NAND] Verify probe by retrying to checking the results match
[MTD] [NAND] S3C2410 Allow ECC disable to be specified by the board
...
commit 5421d059068341b3f21df1a21c2ba9175e55ebef
Merge: 5f3b28781cbc030351e2fa0712602afbea592aae 5a9d3225a0d7060bdf3a18018992dc8cef958425
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:25:03 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes2:
sched: use alloc_bootmem() instead of alloc_bootmem_low()
commit 5f3b28781cbc030351e2fa0712602afbea592aae
Merge: f7ce1f5e083fc099346019fb1f8d56a5452703ed e38649702ea64fdbbab3dd459bf8558142dd3bc4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:24:06 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: silence defined but not used warning in non-modular builds
ieee1394: rawiso: requeue packet for transmission after skipped cycle
commit 4217516e52949e6550ff01d57f92b9b24ce04be1
Author: Sam Ravnborg <sam at uranus.ravnborg.org>
Date: Fri Apr 25 21:15:41 2008 +0200
kconfig: fix broken target update-po-config
Massimo Maiurana reported:
In the latest kernel "make update-po-config" fails because it tries
to open arch/Kconfig/Kconfig, since the ls command doesn't
distinguish between files and directories.
Cc: Massimo Maiurana <maiurana at gmail.com>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit f7ce1f5e083fc099346019fb1f8d56a5452703ed
Merge: dd0e101d630b0d7ed6c9e1ccf7af7fc91818330e 0254da07d9d51044140a904c47affaeeb8b74ae8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:06:46 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kbuild: fix depmod comment
kbuild: Add new Kbuild variable KBUILD_EXTRA_SYMBOLS
kbuild: support loading extra symbols in modpost
Add option to enable -Wframe-larger-than= on gcc 4.4
kbuild: add kconfig symbols to tags output
kbuild: fix some minor typoes
kbuild: error out on missing MODULE_LICENSE
commit dd0e101d630b0d7ed6c9e1ccf7af7fc91818330e
Merge: cf2ec150fc5f59dbf2260863225c79aa0cfc46af 00c6b2d5d7b2414bd46c620d6a8c37fa7a716f29
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 12:03:36 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-x86-fixes4
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-x86-fixes4:
x86: harden kernel code patching
x86: clean up text_poke()
x86: fix text_poke()
x86: remove set_fixmap() warning
x86: make __set_fixmap() non-init
x86: make clear_fixmap() available on 64-bit as well
commit 759cd603beea7f4ab7df1e6bcfda90b62b5f4125
Author: Mike Frysinger <vapier at gentoo.org>
Date: Fri Mar 28 14:30:58 2008 -0700
kbuild: silence documentation GEN xml messages according to $(quiet)
Add rules for gen_xml and its quiet & silent variants. This causes "make -s"
to be silent for gen_xml.
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 0254da07d9d51044140a904c47affaeeb8b74ae8
Author: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Date: Wed Mar 5 15:57:04 2008 +0100
kbuild: fix depmod comment
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Cc: trivial at kernel.org
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit cf2ec150fc5f59dbf2260863225c79aa0cfc46af
Merge: 9f4def9ae4772ea3da5e2359de698742ebae53b5 e36cd4a2873c398ba188f16e4087cce7f00a1506
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 25 11:45:40 2008 -0700
Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
* 'for-linus' of git://linux-nfs.org/~bfields/linux:
nfsd: don't allow setting ctime over v4
Update to NFS/RDMA documentation
locks: don't call ->copy_lock methods on return of conflicting locks
lockd: unlock lockd locks held for a certain filesystem
lockd: unlock lockd locks associated with a given server ip
leases: remove unneeded variable from fcntl_setlease().
leases: move lock allocation earlier in generic_setlease()
leases: when unlocking, skip locking-related steps
leases: fix a return-value mixup
commit 0d96fb20b7ed757fc936bb35e26c22251a75b734
Author: Richard Hacker <lerichi at gmx.net>
Date: Thu Feb 28 09:40:58 2008 +0100
kbuild: Add new Kbuild variable KBUILD_EXTRA_SYMBOLS
This patch adds a new (Kbuild) Makefile variable KBUILD_EXTRA_SYMBOLS.
The space separated list of file names assigned to KBUILD_EXTRA_SYMBOLS
is used when calling scripts/mod/modpost during stage 2 of the Kbuild
process for non-kernel-tree modules.
Signed-off-by: Richard Hacker <lerichi at gmx.net>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 2d04b5ae1bf527201a7505c9be7526c43ebd2930
Author: Richard Hacker <lerichi at gmx.net>
Date: Thu Feb 28 09:40:52 2008 +0100
kbuild: support loading extra symbols in modpost
This patch adds a new command line option -E to modpost, expecting a symbol
file as an argument which is read prior to symbol processing. -E can be
supplied multiple times for as many files as is needed.
When building kernel modules that depend on other modules not in the main
kernel tree, modpost complains about undefined symbols:
# make -C /path/to/linux/kernel M=/path/to/my/module
...
Building modules, stage 2.
....
WARNING: "rt_copy_buf" [/home/rich/osc_etl_rtw/osc_kmod.ko] undefined!
...etc
This situation occurs when modpost processes the new module's symbols. When
it finds symbols not exported by the mainline kernel, it issues this warning.
The patch adds a new command line option -e to modpost which expects a symbol
file as an argument. The symbols listed in this file are added to modpost's
symbol tables during startup. -e can be supplied as often as required.
This patch works together with the second patch. It introduces a new make
variable, KBUILD_EXTRA_SYMBOLS, which is used when calling modpost.
Signed-off-by: Richard Hacker <lerichi at gmx.net>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 35bb5b1e0e84cfa1a8906f7e6a77f391ff315791
Author: Andi Kleen <andi at firstfloor.org>
Date: Fri Feb 22 15:15:03 2008 +0100
Add option to enable -Wframe-larger-than= on gcc 4.4
Add option to enable -Wframe-larger-than= on gcc 4.4
gcc mainline (upcoming 4.4) added a new -Wframe-larger-than=...
option to warn at build time about too large stack frames. Add a config
option to enable this warning, since this very useful for the kernel.
I choose (somewhat arbitarily) 2048 as default warning threshold for 64bit
and 1024 as default for 32bit architectures. With some research and
fixing all the code for smaller values these defaults should be probably
lowered.
With the default allyesconfigs have some new warnings, but I think
that is all code that should be just fixed.
At some point (when gcc 4.4 is released and widely used) this should
obsolete make checkstack
Signed-off-by: Andi Kleen <ak at suse.de>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 80ff26241623875636674a31c0540a78c0fb5433
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Fri Feb 22 15:02:33 2008 +0300
kbuild: add kconfig symbols to tags output
Steps to reproduce:
vi -t NETFILTER
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 3156fd0529b5216f4f444f4a7752b82dc1bd99c0
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Feb 18 04:48:20 2008 -0500
kbuild: fix some minor typoes
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit eed7d2798ce7b78547106d0c3557a88251b413d0
Author: Sam Ravnborg <sam at uranus.ravnborg.org>
Date: Fri Apr 25 20:13:30 2008 +0200
kbuild: error out on missing MODULE_LICENSE
Adrian Bunk suggested a build time check for
missing MODULE_LICENSE annotation in modules.
The build time check is fatal as we really
want this fixed for all modules.
In-tree modules should all have been fixed up by now.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Adrian Bunk <bunk at kernel.org>
commit 9f4def9ae4772ea3da5e2359de698742ebae53b5
Author: Jonathan Corbet <corbet at lwn.net>
Date: Fri Apr 25 11:56:37 2008 -0600
Document seq_path_root()
Signed-off-by: Jonathan Corbet <corbet at lwn.net>
commit 00c6b2d5d7b2414bd46c620d6a8c37fa7a716f29
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Apr 25 17:07:03 2008 +0200
x86: harden kernel code patching
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b7b66baa8bc3f8e0cda6576e31e9bde09382565d
Author: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Date: Thu Apr 24 11:03:33 2008 -0400
x86: clean up text_poke()
Clean up the codepath, remove alignment restrictions and do sanity
checking of the end result, to make sure we patched the right site.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8b132ecbcfea8b1b556a832df7290379df79ad79
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Mon Apr 28 02:51:23 2008 +0200
x86: fix text_poke()
kernel_text_address returns true even for modules which is not wanted
in text_poke. Use core_kernel_text instead.
This is a regression introduced in e587cadd8f47e202a30712e2906a65a0606d5865
which caused occasionaly crashes after suspend/resume.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
CC: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
CC: Andi Kleen <andi at firstfloor.org>
CC: pageexec at freemail.hu
CC: H. Peter Anvin <hpa at zytor.com>
CC: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 70c9f590ffc3f959cc81c1a3cecb6b8133caf35d
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Apr 25 18:05:57 2008 +0200
x86: remove set_fixmap() warning
set_fixmap()+clear_fixmap() is safe.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 82a355f5a2fdc203e5a32626d667ec43fc76b8b1
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Apr 25 18:28:21 2008 +0200
x86: make __set_fixmap() non-init
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 3ec96783e3c1d21bf9a1fa3f238f8354c92827f6
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Apr 25 18:25:25 2008 +0200
x86: make clear_fixmap() available on 64-bit as well
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 0fe8a3ce73ef31d1480e82798503948a979e8e52
Author: Jonathan Corbet <corbet at lwn.net>
Date: Fri Apr 25 11:23:56 2008 -0600
Various fixes to Documentation/HOWTO
Fix a number of things which have gone somewhat out-of-date over the last
few months.
Signed-off-by: Jonathan Corbet <corbet at lwn.net>
commit 460895c4b234754804300c074dfba104fa069afa
Author: Jesse Barnes <jbarnes at jbarnes-t61.(none)>
Date: Fri Apr 25 10:14:28 2008 -0700
Update MAINTAINERS with location of PCI tree
The PCI tree is now in git at
kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git; add that info to
MAINTAINERS.
commit e36cd4a2873c398ba188f16e4087cce7f00a1506
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Thu Apr 24 16:59:30 2008 -0400
nfsd: don't allow setting ctime over v4
Presumably this is left over from earlier drafts of v4, which listed
TIME_METADATA as writeable. It's read-only in rfc 3530, and shouldn't
be modifiable anyway.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit c272cca625ab507e7cc23708ee5c64d2f384708f
Author: James Lentini <jlentini at netapp.com>
Date: Thu Apr 24 15:57:43 2008 -0400
Update to NFS/RDMA documentation
Update to the NFS/RDMA documentation to clarify how to configure the
exports file.
Signed-off-by: James Lentini <jlentini at netapp.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 1a747ee0cc11a198f9e2435add821bd0dfedb7c1
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Thu Apr 24 10:08:22 2008 -0400
locks: don't call ->copy_lock methods on return of conflicting locks
The file_lock structure is used both as a heavy-weight representation of
an active lock, with pointers to reference-counted structures, etc., and
as a simple container for parameters that describe a file lock.
The conflicting lock returned from __posix_lock_file is an example of
the latter; so don't call the filesystem or lock manager callbacks when
copying to it. This also saves the need for an unnecessary
locks_init_lock in the nfsv4 server.
Thanks to Trond for pointing out the error.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
Cc: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 17efa372cfe4d189705edf6cd4fbe283827a5dc7
Author: Wendy Cheng <wcheng at redhat.com>
Date: Thu Jan 17 11:10:12 2008 -0500
lockd: unlock lockd locks held for a certain filesystem
Add /proc/fs/nfsd/unlock_filesystem, which allows e.g.:
shell> echo /mnt/sfs1 > /proc/fs/nfsd/unlock_filesystem
so that a filesystem can be unmounted before allowing a peer nfsd to
take over nfs service for the filesystem.
Signed-off-by: S. Wendy Cheng <wcheng at redhat.com>
Cc: Lon Hohberger <lhh at redhat.com>
Cc: Christoph Hellwig <hch at lst.de>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
fs/lockd/svcsubs.c | 66 +++++++++++++++++++++++++++++++++++++++-----
fs/nfsd/nfsctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/lockd.h | 7 ++++
3 files changed, 131 insertions(+), 7 deletions(-)
commit 4373ea84c84d8a96e99d3da99e813d3e36d1bd11
Author: Wendy Cheng <wcheng at redhat.com>
Date: Thu Jan 17 11:10:12 2008 -0500
lockd: unlock lockd locks associated with a given server ip
For high-availability NFS service, we generally need to be able to drop
file locks held on the exported filesystem before moving clients to a
new server. Currently the only way to do that is by shutting down lockd
entirely, which is often undesireable (for example, if you want to
continue exporting other filesystems).
This patch allows the administrator to release all locks held by clients
accessing the client through a given server ip address, by echoing that
address to a new file, /proc/fs/nfsd/unlock_ip, as in:
shell> echo 10.1.1.2 > /proc/fs/nfsd/unlock_ip
The expected sequence of events can be:
1. Tear down the IP address
2. Unexport the path
3. Write IP to /proc/fs/nfsd/unlock_ip to unlock files
4. Signal peer to begin take-over.
For now we only support IPv4 addresses and NFSv2/v3 (NFSv4 locks are not
affected).
Also, if unmounting the filesystem is required, we assume at step 3 that
clients using the given server ip are the only clients holding locks on
the given filesystem; otherwise, an additional patch is required to
allow revoking all locks held by lockd on a given filesystem.
Signed-off-by: S. Wendy Cheng <wcheng at redhat.com>
Cc: Lon Hohberger <lhh at redhat.com>
Cc: Christoph Hellwig <hch at lst.de>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
fs/lockd/svcsubs.c | 66 +++++++++++++++++++++++++++++++++++++++-----
fs/nfsd/nfsctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/lockd.h | 7 ++++
3 files changed, 131 insertions(+), 7 deletions(-)
commit 9d91cdcc0cce3186742f38e7352459b2087fbb86
Author: David M. Richter <richterd at citi.umich.edu>
Date: Wed Apr 23 16:29:02 2008 -0400
leases: remove unneeded variable from fcntl_setlease().
fcntl_setlease() has a struct dentry* that is used only once; this patch
removes it.
Signed-off-by: David M. Richter <richterd at citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 190855576743a510219fc67886dace29b825d8cb
Author: David M. Richter <richterd at citi.umich.edu>
Date: Wed Apr 23 16:29:01 2008 -0400
leases: move lock allocation earlier in generic_setlease()
In generic_setlease(), the struct file_lock is allocated after tests for the
presence of conflicting readers/writers is done, despite the fact that the
allocation might block; this patch moves the allocation earlier. A subsequent
set of patches will rely on this behavior to properly serialize between a
modified __break_lease() and generic_setlease().
Signed-off-by: David M. Richter <richterd at citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 288b2fd8251cb0bcb14b8a93755ef9c78de70e0f
Author: David M. Richter <richterd at citi.umich.edu>
Date: Wed Apr 23 16:29:00 2008 -0400
leases: when unlocking, skip locking-related steps
In generic_setlease(), we don't need to allocate a new struct file_lock
or check for readers or writers when called with F_UNLCK.
Signed-off-by: David M. Richter <richterd at citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 5fcc60c3a05bf417229fba715e7aec52bf6717fb
Author: David M. Richter <richterd at citi.umich.edu>
Date: Wed Apr 23 16:28:59 2008 -0400
leases: fix a return-value mixup
Fixes a return-value mixup from 85c59580b30c82aa771aa33b37217a6b6851bc14
"locks: Fix potential OOPS in generic_setlease()", in which -ENOMEM replaced
what had been intended to stay -EAGAIN in the variable "error".
Signed-off-by: David M. Richter <richterd at citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit e38649702ea64fdbbab3dd459bf8558142dd3bc4
Author: Tony Breeds <tony at bakeyournoodle.com>
Date: Thu Apr 24 09:02:04 2008 +0200
ieee1394: silence defined but not used warning in non-modular builds
Currently the kernel will issue the following warning:
drivers/ieee1394/raw1394.c:2938: warning: 'raw1394_id_table' defined but not used
Add #ifdef MODULE guards around the declaration.
Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
Ditto with dv1394_id_table and video1394_id_table.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit cc9429bcb6e36e9f2c51e4e47b95740e472c4c2d
Author: Pieter Palmers <pieterp at joow.be>
Date: Wed Mar 19 22:10:59 2008 +0100
ieee1394: rawiso: requeue packet for transmission after skipped cycle
As it seems, some host controllers have issues that can cause them to
skip cycles now and then when using large packets. I suspect that this
is due to DMA not succeeding in time. If the transmit fifo can't contain
more than one packet (big packets), the DMA should provide a new packet
each cycle (125us). I am under the impression that my current PCI
express test system can't guarantee this.
In any case, the patch tries to provide a workaround as follows:
The DMA program descriptors are modified such that when an error occurs,
the DMA engine retries the descriptor the next cycle instead of
stalling. This way no data is lost. The side effect of this is that
packets are sent with one cycle delay. This however might not be that
much of a problem for certain protocols (e.g. AM824). If they use
padding packets for e.g. rate matching they can drop one of those to
resync the streams.
The amount of skips between two userspace wakeups is counted. This
number is then propagated to userspace through the upper 16 bits of the
'dropped' parameter. This allows unmodified userspace applications due
to the following:
1) libraw simply passes this dropped parameter to the user application
2) the meaning of the dropped parameter is: if it's nonzero, something
bad has happened. The actual value of the parameter at this moment does
not have a specific meaning.
A libraw client can then retrieve the number of skipped cycles and
account for them if needed.
Signed-off-by: Pieter Palmers <pieterp at joow.be>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit e19166d5df10be0ea404c4e346cf6be93bfb1d63
Author: Jeff Garzik <jeff at garzik.org>
Date: Fri Apr 18 19:22:52 2008 -0400
[SCSI] aha152x, eata, u14-34f: minor irq handler cleanups
- remove pointless casts from void*
- remove needless references to 'irq' function argument, when that
information is already stored somewhere in a driver-private struct.
- where the 'irq' function argument is known never to be used, rename
it to 'dummy' to make this more obvious
- remove always-false tests for dev_id==NULL
- remove always-true tests for 'irq == host_struct->irq'
- replace per-irq lookup functions and tables with a direct reference
to data object obtained via 'dev_id' function argument, passed from
request_irq()
This change's main purpose is to prepare for the patchset in
jgarzik/misc-2.6.git#irq-remove, that explores removal of the
never-used 'irq' argument in each interrupt handler.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit f8f95702f0c4529b0f59488f4509608f0c160e77
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Wed Apr 23 20:38:10 2008 -0400
[PATCH] sanitize locate_fd()
* 'file' argument is unused; lose it.
* move setting flags from the caller (dupfd()) to locate_fd();
pass cloexec flag as new argument. Note that files_fdtable()
that used to be in dupfd() isn't needed in the place in
locate_fd() where the moved code ends up - we know that ->file_lock
hadn't been dropped since the last time we calculated fdt because
we can get there only if expand_files() returns 0 and it doesn't
drop/reacquire in that case.
* move getting/dropping ->file_lock into locate_fd(). Now the caller
doesn't need to do anything with files_struct *files anymore and
we can move that inside locate_fd() as well, killing the
struct files_struct * argument.
At that point locate_fd() is extremely similar to get_unused_fd_flags()
and the next patches will merge those two.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 3b1253880b7a9e6db54b943b2d40bcf2202f58ab
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Tue Apr 22 05:31:30 2008 -0400
[PATCH] sanitize unshare_files/reset_files_struct
* let unshare_files() give caller the displaced files_struct
* don't bother with grabbing reference only to drop it in the
caller if it hadn't been shared in the first place
* in that form unshare_files() is trivially implemented via
unshare_fd(), so we eliminate the duplicate logics in fork.c
* reset_files_struct() is not just only called for current;
it will break the system if somebody ever calls it for anything
else (we can't modify ->files of somebody else). Lose the
task_struct * argument.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit fd8328be874f4190a811c58cd4778ec2c74d2c05
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Tue Apr 22 05:11:59 2008 -0400
[PATCH] sanitize handling of shared descriptor tables in failing execve()
* unshare_files() can fail; doing it after irreversible actions is wrong
and de_thread() is certainly irreversible.
* since we do it unconditionally anyway, we might as well do it in do_execve()
and save ourselves the PITA in binfmt handlers, etc.
* while we are at it, binfmt_som actually leaked files_struct on failure.
As a side benefit, unshare_files(), put_files_struct() and reset_files_struct()
become unexported.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 6b335d9c80d7f3c2a3f6545f664ae9007a0f3821
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Tue Apr 22 04:45:46 2008 -0400
[PATCH] close race in unshare_files()
updating current->files requires task_lock
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 42faad99658eed7ca8bd328ffa4bcb7d78c9bcca
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Thu Apr 24 07:21:56 2008 -0400
[PATCH] restore sane ->umount_begin() API
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 78d31a3a87f84cf56004b7bc154831f2ee1186e8
Author: Igor Mammedov <niallain at gmail.com>
Date: Thu Apr 24 12:56:07 2008 +0400
cifs: timeout dfs automounts +little fix.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit e3dcc5a387fc38e9c3c6c4f857cd9a7f71a8553a
Author: Milan Broz <mbroz at redhat.com>
Date: Thu Apr 24 22:11:03 2008 +0100
dm crypt: add documentation
Add description of dm-crypt to device-mapper documentation.
Signed-off-by: Milan Broz <mbroz at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit cf13ab8e02d452e2236d0b5fda9972b3b7f503cb
Author: Frederik Deweerdt <frederik.deweerdt at gmail.com>
Date: Thu Apr 24 22:10:59 2008 +0100
dm: remove md argument from specific_minor
The small patch below:
- Removes the unused md argument from both specific_minor() and next_free_minor()
- Folds kmalloc + memset(0) into a single kzalloc call in alloc_dev()
This has been compile tested on x86.
Signed-off-by: Frederik Deweerdt <frederik.deweerdt at gmail.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 4fdfe401e9d7e30029972d568c667234c0c1d828
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu Apr 24 22:10:56 2008 +0100
dm table: remove unused dm_create_error_table
dm_create_error_table() was added in kernel 2.6.18 and never used...
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit e8488d08586e6df7fab3db7881631bb13619311b
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu Apr 24 22:10:51 2008 +0100
dm table: drop void suspend_targets return
void returning functions returned the return value of another void
returning function...
Spotted by sparse.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 7ff14a36159d947872870e7a3e9dcaebc46b23eb
Author: Mikulas Patocka <mpatocka at redhat.com>
Date: Thu Apr 24 22:10:47 2008 +0100
dm: unplug queues in threads
Remove an avoidable 3ms delay on some dm-raid1 and kcopyd I/O.
It is specified that any submitted bio without BIO_RW_SYNC flag may plug the
queue (i.e. block the requests from being dispatched to the physical device).
The queue is unplugged when the caller calls blk_unplug() function. Usually, the
sequence is that someone calls submit_bh to submit IO on a buffer. The IO plugs
the queue and waits (to be possibly joined with other adjacent bios). Then, when
the caller calls wait_on_buffer(), it unplugs the queue and submits the IOs to
the disk.
This was happenning:
When doing O_SYNC writes, function fsync_buffers_list() submits a list of
bios to dm_raid1, the bios are added to dm_raid1 write queue and kmirrord is
woken up.
fsync_buffers_list() calls wait_on_buffer(). That unplugs the queue, but
there are no bios on the device queue as they are still in the dm_raid1 queue.
wait_on_buffer() starts waiting until the IO is finished.
kmirrord is scheduled, kmirrord takes bios and submits them to the devices.
The submitted bio plugs the harddisk queue but there is no one to unplug it.
(The process that called wait_on_buffer() is already sleeping.)
So there is a 3ms timeout, after which the queues on the harddisks are
unplugged and requests are processed.
This 3ms timeout meant that in certain workloads (e.g. O_SYNC, 8kb writes),
dm-raid1 is 10 times slower than md raid1.
Every time we submit something asynchronously via dm_io, we must unplug the
queue actually to send the request to the device.
This patch adds an unplug call to kmirrord - while processing requests, it keeps
the queue plugged (so that adjacent bios can be merged); when it finishes
processing all the bios, it unplugs the queue to submit the bios.
It also fixes kcopyd which has the same potential problem. All kcopyd requests
are submitted with BIO_RW_SYNC.
Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
Acked-by: Jens Axboe <jens.axboe at oracle.com>
commit a2aebe03be60ae4da03507a00d60211d5e0327c3
Author: Mikulas Patocka <mpatocka at redhat.com>
Date: Thu Apr 24 22:10:42 2008 +0100
dm raid1: use timer
This patch replaces the schedule() in the main kmirrord thread with a timer.
The schedule() could introduce an unwanted delay when work is ready to be
processed.
The code instead calls wake() when there's work to be done immediately, and
delayed_wake() after a failure to give a short delay before retrying.
Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit a765e20eeb423d0fa6a02ffab51141e53bbd93cb
Author: Alasdair G Kergon <agk at redhat.com>
Date: Thu Apr 24 22:02:01 2008 +0100
dm: move include files
Publish the dm-io, dm-log and dm-kcopyd headers in include/linux.
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 2d1e580afe23287871529ce54429e249809525a1
Author: Alasdair G Kergon <agk at redhat.com>
Date: Thu Apr 24 21:55:00 2008 +0100
dm kcopyd: rename
Rename kcopyd.[ch] to dm-kcopyd.[ch].
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 0da336e5fab75c712ba8c67f3135d5a20528465f
Author: Alasdair G Kergon <agk at redhat.com>
Date: Thu Apr 24 21:43:52 2008 +0100
dm: expose macros
Make dm.h macros and inlines available in include/linux/device-mapper.h
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 945fa4d283a3a472186c11028f6fea1e77a91d14
Author: Mikulas Patocka <mpatocka at redhat.com>
Date: Thu Apr 24 21:43:49 2008 +0100
dm kcopyd: remove redundant client counting
Remove client counting code that is no longer needed.
Initialization and destruction is made globally from dm_init and dm_exit and is
not based on client counts. Initialization allocates only one empty slab cache,
so there is no negative impact from performing the initialization always,
regardless of whether some client uses kcopyd or not.
Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 08d8757a4d52d21d825b9170af36f2696d1da1a8
Author: Mikulas Patocka <mpatocka at redhat.com>
Date: Thu Apr 24 21:43:46 2008 +0100
dm kcopyd: private mempool
Change the global mempool in kcopyd into a per-device mempool to avoid
deadlock possibilities.
Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 8c0cbc2f79bb222d21b466422fde71fcc9bd37e3
Author: Mikulas Patocka <mpatocka at redhat.com>
Date: Thu Apr 24 21:43:44 2008 +0100
dm kcopyd: per device
Make one kcopyd thread per device.
The original shared kcopyd could deadlock.
Configuration:
commit 2a23aa1ddb1f0c9eef2c929c89565c387f6bf68b
Author: Jonathan Brassow <jbrassow at redhat.com>
Date: Thu Apr 24 21:43:41 2008 +0100
dm log: make module use tracking internal
Remove internal module reference fields from the interface.
Signed-off-by: Jonathan Brassow <jbrassow at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit b8206bc3de0b0665d47655d270c18ea46aff5372
Author: Alasdair G Kergon <agk at redhat.com>
Date: Thu Apr 24 21:43:38 2008 +0100
dm log: move register functions
Reorder a couple of functions in the file so the next patch is readable.
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 416cd17b1982217bca3dc41b9f00b0b38fdaadad
Author: Heinz Mauelshagen <hjm at redhat.com>
Date: Thu Apr 24 21:43:35 2008 +0100
dm log: clean interface
Clean up the dm-log interface to prepare for publishing it in include/linux.
Signed-off-by: Heinz Mauelshagen <hjm at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit eb69aca5d3370b81450d68edeebc2bb9a3eb9689
Author: Heinz Mauelshagen <hjm at redhat.com>
Date: Thu Apr 24 21:43:19 2008 +0100
dm kcopyd: clean interface
Clean up the kcopyd interface to prepare for publishing it in include/linux.
Signed-off-by: Heinz Mauelshagen <hjm at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 22a1ceb1e6a7fbce95a1531ff10bb4fb036d4a37
Author: Heinz Mauelshagen <hjm at redhat.com>
Date: Thu Apr 24 21:43:17 2008 +0100
dm io: clean interface
Clean up the dm-io interface to prepare for publishing it in include/linux.
Signed-off-by: Heinz Mauelshagen <hjm at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit e01fd7eeb00f8078103f4ed3e8ef64474c11f300
Author: Alasdair G Kergon <agk at redhat.com>
Date: Thu Apr 24 21:43:14 2008 +0100
dm io: rename error to error_bits
Rename 'error' to 'error_bits' for clarity.
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 72727bad544b4ce0a3f7853bfd7ae939f398007d
Author: Mikulas Patocka <mpatocka at redhat.com>
Date: Thu Apr 24 21:43:11 2008 +0100
dm snapshot: store pointer to target instance
Save pointer to dm_target in dm_snapshot structure.
Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 769aef30f0f505c44bbe9fcd2c911a052a386139
Author: Heinz Mauelshagen <hjm at redhat.com>
Date: Thu Apr 24 21:43:09 2008 +0100
dm log: move dirty region log code into separate module
Move the dirty region log code into a separate module so
other targets can share the code.
Signed-off-by: Heinz Mauelshagen <hjm at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit b7fd54a70f99061721e604d72d940541e5b2b168
Author: Heinz Mauelshagen <hjm at redhat.com>
Date: Thu Apr 24 21:43:06 2008 +0100
dm log: generalise name in messages
Change dm-log.c messages from "mirror log" to "dirty region log" as
a new dm target wants to share this code.
Signed-off-by: Heinz Mauelshagen <hjm at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit c12bfc923ee02de5611730ddec087c11b3947038
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Thu Apr 24 21:42:44 2008 +0100
dm raid1: use list_split_init
Use shorter list_splice_init() for brevity.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 8ee2767a5903fde549fd3597690f64c8d951051a
Author: Milan Broz <mbroz at redhat.com>
Date: Thu Apr 24 21:42:36 2008 +0100
dm snapshot: reduce default memory allocation
Limit the amount of memory allocated per snapshot on systems
with a large page size. (The larger default chunk size on
these systems compensates for the smaller number of pages reserved.)
Signed-off-by: Milan Broz <mbroz at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
commit 924362629bf5645aee5f49f8a0d0d5b193e65997
Author: Mikulas Patocka <mpatocka at redhat.com>
Date: Thu Apr 24 21:41:50 2008 +0100
dm snapshot: fix chunksize sector conversion
If a snapshot has a smaller chunksize than the page size the
conversion to pages currently returns 0 instead of 1, causing:
kernel BUG in mempool_resize.
Signed-off-by: Mikulas Patocka <mpatocka at redhat.com>
Signed-off-by: Milan Broz <mbroz at redhat.com>
Signed-off-by: Alasdair G Kergon <agk at redhat.com>
Cc: stable at kernel.org
commit 2664ef44cf5053d2b7dff01cecac70bc601a5f68
Author: David S. Miller <davem at davemloft.net>
Date: Fri Apr 25 03:11:37 2008 -0700
[SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit().
Otherwise all sorts of bad things can happen, including
spurious softlockup reports.
Other platforms have this same bug, in one form or
another, just don't see the issue because they
don't sleep as long as sparc64 can in NOHZ.
Thanks to some brilliant debugging by Peter Zijlstra.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 020cfb05f2c594c778537159bd45ea5efb0c5e0d
Author: David S. Miller <davem at davemloft.net>
Date: Fri Apr 25 02:12:05 2008 -0700
[SPARC64]: Fix args to 64-bit sys_semctl() via sys_ipc().
Second and third arguments were swapped for whatever reason.
Reported by Tom Callaway.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 653252c2302cdf2dfbca66a7e177f7db783f9efa
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Fri Apr 25 01:49:48 2008 -0700
net: Fix wrong interpretation of some copy_to_user() results.
I found some places, that erroneously return the value obtained from
the copy_to_user() call: if some amount of bytes were not able to get
to the user (this is what this one returns) the proper behavior is to
return the -EFAULT error, not that number itself.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3887ed5231fb6f339f36c3a0297c996cd1a1dad9
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Fri Apr 25 12:07:33 2008 +0800
[MTD] m25p80: Add Support for ATMEL AT25DF641 64-Megabit SPI Flash
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 2230b76b3838a37167f80487c694d8691248da9f
Author: Bryan Wu <cooloney at kernel.org>
Date: Fri Apr 25 12:07:32 2008 +0800
[MTD] m25p80: add FAST_READ access support to M25Pxx
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit afc4bca63941746f1d49394620d294074150e664
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Fri Apr 25 12:07:31 2008 +0800
[MTD] [NAND] bf5xx_nand: Avoid crash if bfin_mac is installed.
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=4053
Singed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 2314488e81b6f8966d3ea607c4517a64bf58f283
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Apr 24 23:51:29 2008 +0900
[MTD] [NAND] at91_nand: control NCE signal
This driver did not control NCE signal during normal operations (only
enable NCE on probing and disable NCE on removing). This patch make
NCE signal inactive on idle state.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 5a9d3225a0d7060bdf3a18018992dc8cef958425
Author: David Miller <davem at davemloft.net>
Date: Thu Apr 24 20:46:20 2008 -0700
sched: use alloc_bootmem() instead of alloc_bootmem_low()
There is no guarantee that there is physical ram below 4GB, and in
fact many boxes don't have exactly that.
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d43fa1499622e3e561380c34e076aade954e2c2c
Author: Richard Genoud <richard.genoud at gmail.com>
Date: Fri Apr 25 09:32:26 2008 +0200
[MTD] [NAND] AT91 hardware ECC compile fix for at91sam9263 / at91sam9260
The sam926x docs allegedly don't list an "ECC_PARITY" field, and the
header files in the upstream kernel don't have it either.
Masking with it was useless anyway, so just remove it.
Signed-off-by: Richard Genoud <richard.genoud at gmail.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit cc93d7d77d28d65d4f947dabc95a01c42d713ea3
Merge: 461e6c856faf9cdd8862fa4d0785974a64e39dba f946dffed6334f08da065a89ed65026ebf8b33b4
Author: David S. Miller <davem at davemloft.net>
Date: Fri Apr 25 00:31:07 2008 -0700
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit 461e6c856faf9cdd8862fa4d0785974a64e39dba
Author: Eric Dumazet <dada1 at cosmosbay.com>
Date: Fri Apr 25 00:29:00 2008 -0700
xfrm: alg_key_len & alg_icv_len should be unsigned
In commit ba749ae98d5aa9d2ce9a7facde0deed454f92230 ([XFRM]: alg_key_len
should be unsigned to avoid integer divides
<http://git2.kernel.org/?p=linux/kernel/git/davem/net-2.6.git;a=commitdiff;h=ba749ae98d5aa9d2ce9a7facde0deed454f92230>)
alg_key_len field of struct xfrm_algo was converted to unsigned int to
avoid integer divides.
Then Herbert in commit 1a6509d991225ad210de54c63314fd9542922095
([IPSEC]: Add support for combined mode algorithms) added a new
structure xfrm_algo_aead, that resurrected a signed int for alg_key_len
and re-introduce integer divides.
This patch avoids these divides and saves 64 bytes of text on i386.
Signed-off-by: Eric Dumazet <dada1 at cosmosbay.com>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f946dffed6334f08da065a89ed65026ebf8b33b4
Author: Jeff Garzik <jeff at garzik.org>
Date: Fri Apr 25 03:11:31 2008 -0400
[netdrvr] tehuti: move ioctl perm check closer to function start
Noticed by davem.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 5b3f129c5592ca35b3fe8916767c58b98710478c
Author: Michael Beasley <youvegotmoxie at gmail.com>
Date: Thu Apr 24 23:50:30 2008 -0700
ipv6: Fix typo in net/ipv6/Kconfig
Two is used in the wrong context here, as you are connecting to an
IPv6 network over IPv4; not connecting two IPv6 networks to an IPv4
one.
Signed-off-by: Michael Beasley <youvegotmoxie at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit d4f73c8e459d355e10051174d859ffd0ef5764c0
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Thu Apr 24 23:32:33 2008 +0200
via-velocity: fix vlan receipt
- vlans were using a single CAM register (see mac_set_vlan_cam)
- setting the address filtering registers for vlans is not
needed when there is no vlan
The non-tagged interface is filtered out as soon as a tagged
(!= 0) interface is created. Its traffic appears again when an
zero-tagged interface is created.
Tested on Via Epia SN (VT6130 chipset) with several vlans whose
tag was above or beyond 255.
Signed-off-by: Séguier Régis <rseguier at e-teleport.net>
Acked-by: Francois Romieu <romieu at fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 78c6146f16d45f52c33ddb6b48c10fc6cfc53659
Author: Eric Dumazet <dada1 at cosmosbay.com>
Date: Thu Apr 24 23:33:06 2008 -0700
tg3: sparse cleanup
Fix the following sparse warning :
drivers/net/tg3.c:4025:3: warning: context imbalance in 'tg3_restart_hw'
- unexpected unlock
Signed-off-by: Eric Dumazet <dada1 at cosmosbay.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9f3f7910c67adfb520bbae3d8b16985439a97198
Author: Ayaz Abdulla <aabdulla at nvidia.com>
Date: Wed Apr 23 14:37:30 2008 -0400
forcedeth: realtek phy crossover detection
This patch fixes an issue seen with the realtek 8201 phy. This phy has a
problem with crossover detection and it needs to be disabled. The
problem only arises on certain switches. Therefore, a module parameter
has been added to allow enabling crossover detection if needed. The
default will be set to disabled.
Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit cca87c18ce3357e52facf6519f4ab0fbedd1279f
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Wed Apr 23 15:17:14 2008 +1000
ibm_newemac: Increase MDIO timeouts
This patch doubles the MDIO timeouts in EMAC as there are field
cases where they are two short to communicate with some PHYs.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 815b97c6b8861f2e539c9ecb44c02b7b8ac11ca4
Author: Andy Fleming <afleming at freescale.com>
Date: Tue Apr 22 17:18:29 2008 -0500
gianfar: Fix skb allocation strategy
gianfar was unable to handle failed skb allocation for rx buffers, so
we were spinning until it succeeded. Actually, it was worse--we were
spinning for a long time, and then silently failing. Instead, we take
Stephen Hemminger's suggestion to try the allocation earlier, and drop the
packet if it failed.
We also make a couple of tweaks to how buffer descriptors are set up.
Signed-off-by: Andy Fleming <afleming at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8d74849b91536b126c822968b0f5a1dfd658394d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 22 11:48:35 2008 -0700
netxen: reduce stack usage of netxen_nic_flash_print
Don't need to keep a struct netxen_new_user_info on the stack
when we only are interested in printing the serial_num. Change
to only reading the serial_num.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit db2961c5a13562503c82ae306af269fde4fea8f0
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Fri Apr 18 13:50:48 2008 -0700
smc911x: test after postfix decrement fails in smc911x_{reset,drop_pkt}
When timeout reaches 0 the postfix decrement still subtracts, so the test
fails.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Acked-by: Peter Korsgaard <jacmet at sunsite.dk>
Cc: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 72abb46101fb5c47a9592914adb221b430ff26bd
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri Apr 18 13:50:44 2008 -0700
net drivers: fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is
prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable network
platform drivers, to re-enable auto loading.
NOTE: didn't change drivers/net/fs_enet/fs_enet-main.c "old binding" support.
That looks problematic in the first place (it even uses the ancient "struct
device_driver" binding scheme for platform_bus!) and I suspect it will vanish
soonish when arch/powerpc rules the world. Also, drivers/net/ne.c would have
needed more thought to sort out.
[akpm at linux-foundation.org: fix sgiseeq.c]
[dbrownell at users.sourceforge.net: more drivers, registration fixes]
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Scott Wood <scottwood at freescale.com>
Cc: Vitaly Bordug <vitb at kernel.crashing.org>
Cc: Dale Farnsworth <dale at farnsworth.org>
Cc: Ben Dooks <ben-linux at fluff.org>
Cc: Ralf Baechle <ralf at linux-mips.org>
Cc: Andrew Victor <andrew at sanpeople.com>
Cc: Bryan Wu <bryan.wu at analog.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a433686c73bf63242475ef7e611114f43dd06581
Author: Ayaz Abdulla <aabdulla at nvidia.com>
Date: Fri Apr 18 13:50:43 2008 -0700
forcedeth: new backoff implementation
This patch adds support for a new backoff algorithm for half duplex supported
in newer hardware. The old method is will be designated as legacy mode.
Re-seeding random values for the backoff algorithms are performed when a
transmit has failed due to a maximum retry count (1 to 15, where max is
considered the wraparound case of 0).
Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 22559c5d7488fe21f5f46117a4d275fc72066aa6
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Fri Apr 18 13:50:39 2008 -0700
ehea: make things static
ehea_flush_sq() and ehea_purge_sq() should be static.
Cc: Jeff Garzik <jeff at garzik.org>
Cc: Thomas Klein <osstklei at de.ibm.com>
Cc: Thomas Klein <tklein at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f62220d3a9ccb879c3f90f845ae57b724b7bbb62
Author: Andy Fleming <afleming at freescale.com>
Date: Fri Apr 18 17:29:54 2008 -0500
phylib: Add support for board-level PHY fixups
Sometimes the specific interaction between the platform and the PHY
requires special handling. For instance, to change where the PHY's
clock input is, or to add a delay to account for latency issues in the
data path. We add a mechanism for registering a callback with the PHY
Lib to be called on matching PHYs when they are brought up, or reset.
Signed-off-by: Andy Fleming <afleming at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8ec7226a93dcd4a314e2387d1033aef01145061b
Author: Chris Snook <csnook at redhat.com>
Date: Fri Apr 18 21:51:53 2008 -0400
[netdrvr] atlx: code movement: move atl1 parameter parsing
Move some code from atlx.c to atl1.c to prevent build conflict with
the upcoming atl2 code. No changes, just movement.
Signed-off-by: Chris Snook <csnook at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3b49f0354561aefc5235b8dd6ee4ae779a26e06b
Author: Chris Snook <csnook at redhat.com>
Date: Fri Apr 18 21:47:41 2008 -0400
atlx: remove flash vendor parameter
There's no good reason to manually set the flash vendor in a module
parameter, outside of an Atheros hardware lab. Remove it, so nobody
accidentally bricks their board using it incorrectly.
Signed-off-by: Chris Snook <csnook at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit e3152ab901bcec132639d123b0e7c2b5ed237957
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Sun Apr 20 18:06:13 2008 +0200
korina: misc cleanup
- useless initialization (korina_ope / korina_restart)
- use a single variable for the status code in korina_probe
and propagate the error status code from below
- useless checks in korina_remove : the variables are
necessarily set when korina_probe succeeds
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 751c2e4755027468a79349f8e9f4885a4518426e
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Sun Apr 20 18:05:31 2008 +0200
korina: fix misplaced return statement
The driver takes the error unwind path without condition.
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d753d82405ac3504ed69fb6be4d219d9702b8d64
Author: Krzysztof Halasa <khc at pm.waw.pl>
Date: Sun Apr 20 19:10:56 2008 +0200
WAN: Fix confusing insmod error code for C101 too.
Signed-off-by: Krzysztof Hałasa <khc at pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7cda1edf029370d396fb610f7e41fad9a7123164
Author: Cédric Augonnet <Cedric.Augonnet at ens-lyon.fr>
Date: Sun Apr 20 19:15:51 2008 +0200
Removing dead code in drivers/net/wan/hdlc_fr.c
The local variable "prefix" is never used anymore, and the content of
this string appears a bit later, directly in a call to "alloc_netdev"
after doing exactly the same if/else test. So there seems to be no
point keeping those 4 lines anymore.
Signed-off-by: Cédric Augonnet <cedric.augonnet at ens-lyon.org>
Signed-off-by: Krzysztof Hałasa <khc at pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 6131a2601f42cd7fdbac0e960713396fe68af59f
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Sun Apr 20 19:32:34 2008 +0200
tehuti: check register size
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 5a0e2cd51145748c4fd44d0c3a06d39eb87e8725
Author: Grant Grundler <grundler at parisc-linux.org>
Date: Sun Apr 20 22:44:15 2008 -0600
[netdrvr] typhoon: typhoon_resume - remove call to start_queue
While trying to fix http://bugzilla.kernel.org/show_bug.cgi?id=8952
I looked at a few other drivers to figure out what drivers _should_
be doing for suspend/resume. I noticed typhoon driver is likely doing
more than it needs to. Patch below is untested since I don't have the HW.
Suspend/resume code across NIC drivers is fairly inconsistent.
And I couldn't find any documentation on what the canonical sequence
NICs need to do for suspend or resume. Is there any?
Barring contrary advice, I'm going model the tulip suspend/resume
fixes after tg3.c since a number of "modern" (< 5 years old) laptops
have that and I'm silly enough to assume it works.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 11121e3008a9282fc185cb2e81eda2d5436d099b
Author: Valentine Barshak <vbarshak at ru.mvista.com>
Date: Tue Apr 22 10:46:48 2008 +1000
ibm_newemac: PowerPC 440EP/440GR EMAC PHY clock workaround
This patch adds ibm_newemac PHY clock workaround for 440EP/440GR EMAC
attached to a PHY which doesn't generate RX clock if there is no link.
The code is based on the previous ibm_emac driver stuff. The 440EP/440GR
allows controlling each EMAC clock separately as opposed to global clock
selection for 440GX.
BenH: Made that #ifdef CONFIG_PPC_DCR_NATIVE for now as dcri_* stuff doesn't
exist for MMIO type DCRs like Cell. Some future rework & improvements of the
DCR infrastructure will make that cleaner but for now, this makes it work.
Signed-off-by: Valentine Barshak <vbarshak at ru.mvista.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0925ab5d385b6cd1c435c82bfc01898c81f3d062
Author: Valentine Barshak <vbarshak at ru.mvista.com>
Date: Tue Apr 22 10:46:46 2008 +1000
ibm_newemac: PowerPC 440GX EMAC PHY clock workaround
The PowerPC 440GX Taishan board fails to reset EMAC3 (reset timeout
error) if there's no link. Because of that it fails to find PHY
chip. The older ibm_emac driver had a workaround for that: the
EMAC_CLK_INTERNAL/EMAC_CLK_EXTERNAL macros, which toggle the Ethernet
Clock Select bit in the SDR0_MFR register. This patch does the same for
"ibm,emac-440gx" compatible chips. The workaround forces clock on -all-
EMACs, so we select clock under global emac_phy_map_lock.
BenH: Made that #ifdef CONFIG_PPC_DCR_NATIVE for now as dcri_* stuff
doesn't exist for MMIO type DCRs like Cell. Some future rework &
improvements of the DCR infrastructure will make that cleaner but
for now, this makes it work.
Signed-off-by: Valentine Barshak <vbarshak at ru.mvista.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit be63c09afe9153be6ba4373d1b69848cf2b32268
Author: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Date: Tue Apr 22 10:46:44 2008 +1000
ibm_newemac Use status property for unused/unwired EMACs
Convert ibm_newemac to use the of_device_is_available function when checking
for unused/unwired EMACs. We leave the current check for an "unused" property
to maintain backwards compatibility for older device trees. Newer device
trees should simply use the standard "status" property in the EMAC node.
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 51d4a1cc2e20e2848c6141989f733f0e6548598b
Author: Josh Boyer <jwboyer at gmail.com>
Date: Tue Apr 22 10:46:43 2008 +1000
ibm_newemac: Fix section mismatch warnings
This patch fixes several section mismatch warnings in the
ibm_newemac driver similar to:
WARNING: vmlinux.o(.devinit.text+0x3a04): Section mismatch in reference from the function emac_probe() to the function .devexit.text:tah_detach()
The function __devinit emac_probe() references
a function __devexit tah_detach().
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit afd1dee896e8b1cbd24258ac673aeccd803ff582
Author: Stefan Roese <sr at denx.de>
Date: Tue Apr 22 10:46:42 2008 +1000
ibm_newemac: Add support for 460EX/GT-type MAL rx-channel handling
On some 4xx PPC's (e.g. 460EX/GT), the rx channel number is a multiple
of 8 (e.g. 8 for EMAC1, 16 for EMAC2), but enabling in MAL_RXCASR needs
the divided by 8 value for the bitmask.
Signed-off-by: Stefan Roese <sr at denx.de>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f34ebab68a8e3c80ff4364f4c61734faec5161d4
Author: Stefan Roese <sr at denx.de>
Date: Tue Apr 22 10:46:42 2008 +1000
ibm_newemac: Fix problem with jumbo frame support and EMAC V4.patch
This fixes the jumbo frame support on EMAC V4 systems. Now the correct
bit is set depending on the EMAC version configured.
Tested on Kilauea (405EX) and Canyonlands (460EX).
Signed-off-by: Stefan Roese <sr at denx.de>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f014e97ec6a447184f48a9d43432ab2ad1ffc7d8
Author: Jesse Brandeburg <jesse.brandeburg at intel.com>
Date: Wed Apr 23 11:09:39 2008 -0700
e1000e: Increment version to 0.2.1
Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c682fc238a9ed45633822f107e1e9de192059bcc
Author: Auke Kok <auke-jan.h.kok at intel.com>
Date: Wed Apr 23 11:09:34 2008 -0700
igb: save and restore pcie/msi state to support EEH recovery
To enable EEH support for pci-express network adapters, pcie/msi state
needs to be saved and restored for that adapter.
[after similar patches for ixgbe and e1000e from Wendy Xiong]
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Cc: Wendy Xiong <wendyx at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit aad32739641d3a75818fbe653d4b0d530e965f2f
Author: Wendy Xiong <wendyx at us.ibm.com>
Date: Wed Apr 23 11:09:29 2008 -0700
e1000e: save and restore pcie/msi state to support EEH recovery
To enable EEH support for pci-express network adapters, pcie/msi state
needs to be saved and restored for that adapter.
Tested this EEH patch with 2ports and 4ports pci-express e1000e
adapters.
Signed-off-by: Wendy Xiong <wendyx at us.ibm.com>
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit fb3b27bc00ca2b6d69c3a22ff43b4d95fef47bed
Author: Wendy Xiong <wendyx at us.ibm.com>
Date: Wed Apr 23 11:09:24 2008 -0700
ixgbe: save and restore pcie/msi state to support EEH recovery
To enable EEH support for pci-express network adapters, pcie/msi state
needs to be saved and restored for that adapter.
Tested this EEH patch with Intel 10G pci-express ixgbe adapter.
Signed-off-by: Wendy Xiong <wendyx at us.ibm.com>
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7b1be1987c1e8163b3631dcd1ce4f03707d60c3b
Author: Auke Kok <auke-jan.h.kok at intel.com>
Date: Wed Apr 23 11:09:19 2008 -0700
e1000e: lower ring minimum size to 64
The lower limit of 80 descriptors in the ring is only valid for
one older 8254x chipset. All e1000e devices can use as low as
64 descriptors.
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 2d9498f369706d6db174abd2e75b37732b9dbbde
Author: David Graham <david.graham at intel.com>
Date: Wed Apr 23 11:09:14 2008 -0700
e1000e: Fix HW Error on es2lan, ARP capture issue by BMC
Several components to this complex fix. The es2lan cards occasionally
gave a "HW Error" especially when forcing speed. Some users also
reported that the BMC stole ARP packets.
The fixes include setting the proper SW_FW bits to tell the BMC
that we're active and not do any un-initialization at all, so the
setup routine is largely changed.
Signed-off-by: David Graham <david.graham at intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit de5b3077da8275e87196a1e34c5535f5279c5e1a
Author: Auke Kok <auke-jan.h.kok at intel.com>
Date: Wed Apr 23 11:09:08 2008 -0700
e1000e: Add interrupt moderation run-time ethtool interface
The ethtool -c / -C interface can now be used to modify the
irq moderation algorithm. This change does not require an
adapter reset and can thus be used at all times. The adapter
only supports changing/reading rx-usecs which has special
values for 0, 1 and 3:
0 - no irq moderation whatsoever
1 - normal moderation favoring regular mixed traffic (default)
3 - best attempt at low latency possible at cost of CPU
For values between 10 and 10000 the rx-usecs defines "the minimum
time between successive irqs" in usec, unlike the module parameter.
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7c25769f88ff0b186766d6a9f9390a2e9fd4670f
Author: Bruce Allan <bruce.w.allan at intel.com>
Date: Wed Apr 23 11:09:00 2008 -0700
e1000e: cleanup several stats issues
Several stats registers are completely unused and we just waste pci
bus time reading them. We also omit using the high 32 bits of the GORC/
GOTC counters. We can just read clear them and only read the low registers.
Mii-tool can also break es2lan if it executes a MII PHY register
ioctl while the device is in autonegotiation. Unfortunately it seems
that several applications and installations still perform this ioctl
call periodically and especially in this crucial startup time. We
can fool the ioctl by providing fail safe information that mimics
the "down" link state and only perform the dangerous PHY reads once
after link comes up to fill in the real values. As long as link
stays up the information will not change.
Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c9fcbf4774d7a29b73078017af25d100f152a4af
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date: Wed Apr 23 13:31:33 2008 -0400
S2io: Removed rx_lock and put_lock
- Removed rx_lock and put_lock as the buffer replenishment and
receive completion is handled serially.
Signed-off-by: Surjit Reang <surjit.reang at neterion.com>
Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 99993af6981aaf8d212a5efa888a19c9db152d58
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date: Wed Apr 23 13:29:42 2008 -0400
S2io: Removed receive buffer replenishment tasklet
- Removed receive buffer replenishment tasklet s2io_tasklet and instead
allocating the receive buffers in either the interrupt handler (no napi)
or the napi handler (napi enabled).
Signed-off-by: Surjit Reang <surjit.reang at neterion.com>
Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 10371b5e6ba22173425877ea6a7040619b005fa1
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date: Wed Apr 23 13:28:58 2008 -0400
S2io: Version update for memory leak fix during free_tx_buffers
- Updated version number.
Signed-off-by: Santosh Rastapur <santosh.rastapur at neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b35b3b49fc6750806964048b31799c8782980ef9
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date: Wed Apr 23 13:28:08 2008 -0400
S2io: Fix memory leak during free_tx_buffers
- Fix the memory leak during free_tx_buffers.
Signed-off-by: Santosh Rastapur <santosh.rastapur at neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f38d1008b034e39397d3da67919e220c851db75e
Author: Andy Fleming <afleming at freescale.com>
Date: Wed Apr 23 16:56:17 2008 -0500
ucc_geth: Fix sneaky merge conflict regarding bus_id
The patch that changed mdio_bus to a string didn't conflict strongly enough
with the patch that added fixed PHY support to UCC. Gather it back into
the fold.
Fixes this error:
...
CC drivers/net/ucc_geth.o
'ucc_geth_probe':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/net/ucc_geth.c:3935: error:
incompatible types in assignment
make[3]: *** [drivers/net/ucc_geth.o] Error 1
Signed-off-by: Andy Fleming <afleming at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f9d42491723dbb77bdc9b9dc7e096ea57d535992
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Fri Apr 25 11:37:54 2008 +0800
pata_bf54x: decrease count first.
When count reaches 0 the postfix decrement still subtracts (to -1),
so bfin_reset_controller() returns as if the busy flag was cleared
while it was not.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Acked-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 85afb934575abdff1b2ac8ea4d522d1355f22a89
Author: Mark Lord <liml at rtr.ca>
Date: Sat Apr 19 14:54:41 2008 -0400
sata_mv: re-enable hotplug, update TODO list
Re-enable hotplug, now that the interrupt/error handling are mostly sane.
Also update the TODO list at the top.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8d07379d251ab24d937e6cb0748b71106dddbc74
Author: Mark Lord <liml at rtr.ca>
Date: Sat Apr 19 15:07:49 2008 -0400
sata_mv: leave SError bits untouched in mv_err_intr
Here it is again, minus the checkpatch.pl complaint:
Rework mv_err_intr() to leave the SError bits as-is,
so that libata-eh has a chance to see/use them.
We originally thought that clearing them here was necessary
before writing back to edma_err_cause (per the Marvell datasheets),
but we will end up reseting the chip regardless in those cases.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8f767f8a02e6c65d393fd0f2ca19a91c9898cc2d
Author: Mark Lord <liml at rtr.ca>
Date: Sat Apr 19 14:53:07 2008 -0400
sata_mv: more interrupt handling rework
Continue fixing the interrupt handling logic.
Get rid of mv_intr_pio(), by using ata_sff_host_intr() for PIO..
Add a mv_unexpected_intr() catch-all for "impossible" scenarios,
where we get an interrupt that shouldn't have happened
(never seen in testing, but just in case..).
Rearrange the logic so that we always process completed
response queue entries before looking for other events,
This avoids having to re-issue commands that had already succeeded.
As part of this, we split out some duplicated functionality
into a new function, mv_get_active_qc().
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a3718c1f230240361ed92d3e53342df0ff7efa8c
Author: Mark Lord <liml at rtr.ca>
Date: Sat Apr 19 15:07:18 2008 -0400
sata_mv: tidy host controller interrupt handling
Tidy up host controller interrupt handling, by moving the weirdo
bit shifting from mv_interrupt() to mv_host_intr().
This lets us take advantage of the MV_PORT_TO_SHIFT_AND_HARDPORT() macro
from an earlier patch to greatly simplify the port numbering logic.
Also, defer reading the hc_irq_cause (one per hc) until it is
actually proven to be needed. This may save a microsecond or
so per interrupt, on average (a later patchset will further reduce
unnecessary register reads throughout the driver).
Apart from that, we still leave the actual IRQ handling logic alone.
Subsequent patches in this series will address that.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit fcfb1f77cea81f74d865b4d33f2e452ffa1973e8
Author: Mark Lord <liml at rtr.ca>
Date: Sat Apr 19 15:06:40 2008 -0400
sata_mv: simplify request/response queue handling
Try and simplify handling of the request/response queues.
Maintain the cached copies of queue indexes in a fully-masked state,
rather than having each use of them have to do the masking.
Split off handling of a single crpb response into a separate function,
to reduce complexity in the main mv_process_crpb_entries() routine.
Ignore the rarely-valid error bits from the crpb status field,
as we already handle that information in mv_err_intr().
For now, preserve the rest of the original logic.
A later patch will deal with fixing that separately.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1cfd19aeb8c8b6291a9d11143b4d8f3dac508ed4
Author: Mark Lord <liml at rtr.ca>
Date: Sat Apr 19 15:05:50 2008 -0400
sata_mv: simplify freeze/thaw bit-shift calculations
Introduce the MV_PORT_TO_SHIFT_AND_HARDPORT() macro,
to centralize/simplify various scattered bits of logic
for calculating bit shifts and the like.
Some of the places that do this get it wrong, too,
so consolidating the algorithm at one place will help
keep the code correct.
For now, we use the new macro in mv_eh_{freeze,thaw}.
A subsequent patch will re-use this in the interrupt handlers
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f9f7fe014fc7197a5f36f9d9859cbb27c3bdd2ab
Author: Mark Lord <liml at rtr.ca>
Date: Sat Apr 19 14:44:42 2008 -0400
sata_mv mask all interrupt coalescing bits
Ignore *all* interrupt coalescing bits on all controllers,
not just some of each.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 352fab701ca4753dd005b67ce5e512be944eb591
Author: Mark Lord <liml at rtr.ca>
Date: Sat Apr 19 14:43:42 2008 -0400
sata_mv more cosmetics
More cosmetic cleanups prior to the interrupt/error handling logic changes.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 01ce2601e4ba354fe1e25bb940817570d0c8ed4f
Author: Dan McGee <dpmcgee at gmail.com>
Date: Sun Apr 20 22:03:27 2008 -0500
ata_piix: add Asus Eee 701 controller to short cable list
The drive is directly soldered to the controller, so there is no cable at
all. Remove the 40-wire assumption so the drive can operate at max speed.
Before patch:
$ dd if=/dev/sda of=/dev/null bs=2M count=64 iflag=direct
134217728 bytes (134 MB) copied, 5.29612 s, 25.3 MB/s
After patch:
$ dd if=/dev/sda of=/dev/null bs=2M count=64 iflag=direct
134217728 bytes (134 MB) copied, 3.94955 s, 34.0 MB/s
Signed-off-by: Dan McGee <dpmcgee at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a6116c9e60978a6deaa20691c67ffed727e50df1
Author: Mark Lord <liml at rtr.ca>
Date: Wed Apr 23 22:36:25 2008 -0400
libata-eh set tf flags in NCQ EH result_tf
Fix mis-reporting of NCQ errors by ensuring that result_tf->flags
is properly initialized in libata-eh. This allows ata_gen_ata_sense()
to report the failed block number correctly to SCSI after a media error
during NCQ.
This patch may also be a candidate for backporting to earlier kernels.
Without this fix, SCSI will fail I/O on the entire request rather
than just the bad sector. That can be bad for a request that was
merged from many independent read reads from different tasks.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1dc55e876182a13dcc5991c3aab893f38455d8a7
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 11:51:17 2008 +0300
make sata_set_spd_needed() static
sata_set_spd_needed() can now become static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 6bdb4fc9f9e5307012f6f2afb8642b52dad9c186
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 11:51:11 2008 +0300
make sata_print_link_status() static
sata_print_link_status() can now become static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 66a9099e02e3fca5198ab52b4bb7088f03dee42e
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 01:50:35 2008 +0300
libata-acpi.c: remove unneeded #if's
These #if's are unneeded since they:
- did anyway not handle the CONFIG_ACPI_DOCK_MODULE case correctly and
- this is already handled in include/acpi/acpi_drivers.h and
- it's now correctly handled in kconfig.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a0b9f4bc1ec2ea25e47e7958e544fef0d122e012
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 23 12:14:05 2008 +0900
sata_nv: make hardreset return -EAGAIN on success
sata_nv hardreset can't classify but was left out while unifying
follow-up SRST request mechanism[1]. This caused detection failures
on those controllers. Fix it.
Reported and bisected by Roland Dreier, Petr Vandrovec and Marc
Dionne. Thanks guys.
[1] 305d2a1ab137d11d573319c315748a87060fe82d
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Roland Dreier <rdreier at cisco.com>
Cc: Petr Vandrovec <vandrove at vc.cvut.cz>
Cc: Marc Dionne <marc.c.dionne at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 15fe982e429e0e6b7466719acb6cfd9dbfe47f0c
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 23 20:52:58 2008 +0900
ahci: retry enabling AHCI a few times before spitting out WARN_ON()
Some chips need AHCI_EN set more than once to actually set it. Try a
few times before giving up and spitting out WARN_ON().
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Peer Chen <pchen at nvidia.com>
Cc: Volker Armin Hemmann <volker.armin.hemmann at tu-clausthal.de>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 411cb3869afd91ed40e8f12df64cd9e315356305
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Apr 23 20:48:36 2008 +0900
libata: make WARN_ON conditions in ata_sff_hsm_move() more strict
WARN_ON()'s in ata_hsm_move() was too liberal and got triggerred when
it shouldn't (e.g. hotplug events at the right moment). As the HSM
only deals with device errors and state machine violations, make it
check only against them.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Mark Lord <liml at rtr.ca>
Cc: Albert Lee <albertcc at tw.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 458622fcdc5b316de8d74efd7e610803f0308c14
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri Apr 18 13:41:57 2008 -0700
ATA/IDE: fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias
is prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable
ATA and IDE platform drivers, to re-enable auto loading.
NOTE: both ata/pata_platform.c and ide/legacy/ide_platform.c claim
to provide "the" platform_pata driver, and there's no build-time
mutual exclusion mechanism. This means that configs which enable
both drivers will make some trouble when hotplugging...
[dbrownell at users.sourceforge.net: more drivers, registration fixes]
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Tejun Heo <htejun at gmail.com>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1a98d05f59704d60be85b03f727964e15c77224c
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Thu Apr 24 21:30:38 2008 -0700
ipv6 RAW: Disallow IPPROTO_IPV6-level IPV6_CHECKSUM socket option on ICMPv6 sockets.
RFC3542 tells that IPV6_CHECKSUM socket option in the IPPROTO_IPV6
level is not allowed on ICMPv6 sockets. IPPROTO_RAW level
IPV6_CHECKSUM socket option (a Linux extension) is still allowed.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4953d141dc5db748475001cfbfdcc42e66cf900e
Author: David Vrabel <david.vrabel at csr.com>
Date: Tue Apr 8 13:24:46 2008 -0700
usb: don't update devnum for wusb devices
For WUSB devices, usb_dev.devnum is a device index and not the real
device address (which is managed by wusbcore). Therefore, only set
devnum once (in choose_address()) and never change it.
Signed-off-by: David Vrabel <david.vrabel at csr.com>
Cc: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit fc721f5194dc98c8108fb155a4fbae1cd746cf41
Author: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Date: Tue Apr 8 13:24:46 2008 -0700
wusb: make ep0_reinit available for modules
We need to be able to call ep0_reinit() [renamed to usb_ep0_reinit()]
from the WUSB security code. The reason is that when we authenticate
the device, it's address changes (from having bit 7 set to having it
cleared). Thus, we need to signal the USB stack to reinitialize EP0,
so the status with the previous address kept at the HCD layer is
cleared and properly reinitialized.
Signed-off-by: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6c529cdca914ba2a08a4bba54f11dedc2d3a7c17
Author: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Date: Tue Apr 8 13:24:46 2008 -0700
wusb: devices dont use a set address
A WUSB device gets his address during the connection phase; later on,
during the authenthication phase (driven from user space) we assign
the final address. So we need to skip in hub_port_init() the actual
setting of the address for WUSB devices.
Signed-off-by: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 8af548dc8e36f845943ffcba07fafaa56c844221
Author: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Date: Tue Apr 8 13:24:46 2008 -0700
wusb: teach choose_address() about wireless devices
Modify choose_address() so it knows about our special scheme of
addressing WUSB devices (1:1 w/ port number).
Signed-off-by: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b1d8dfb0e548543b1645362e80e1fff522645299
Author: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Date: Tue Apr 8 13:24:46 2008 -0700
wusb: add link wusb-usb device
We need to tie the WUSB and USB devices; the USB stack doesn't need to
know the details about the WUSB device, but needs to have a link to
it. This is needed so that the notify call back for Remove Device can
tie both and undo the device setup (sysfs files).
We connect the devices together at the Add Device notifier callback
(the wusb_dev references the usb_dev and stores it, the usb_dev
references the wusb_dev and stores it); then we do create the WUSB
sysfs files at the usb_dev sysfs directory. At Remove Device, we undo
that (thus we need the usb_dev reference).
Cross reference to functions in the WUSB substack:
wusb_dev_{add,rm}_ncb().
Signed-off-by: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3b52f128aeacc4b9e5992012c39ffc9508513bcd
Author: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Date: Tue Apr 8 13:24:46 2008 -0700
wusb: add authenticathed bit to usb_dev
This bit indicates the system that the WUSB device has been crypto
authenticated and thus can operate as normal.
Signed-off-by: Inaky Perez-Gonzalez <inaky at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit cdc97792289179974af6dda781c855696358d307
Author: Ming Lei <tom.leiming at gmail.com>
Date: Sun Feb 24 18:41:47 2008 +0800
USB: remove unnecessary type casting of urb->context
urb->context code cleanup
Signed-off-by: Ming Lei <tom.leiming at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a5b6f60c5a30c494017c7a2d11c4067f90d3d0df
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Apr 8 17:16:06 2008 +0100
usb serial: more fixes and groundwork for tty changes
- If a termios change fails due to lack of memory we should copy the
old settings back over as the device has not changed
- Note various locking problems
- kl5kusb105 had various remaining tty flag handling problems
- Make safe_serial use tty_insert_flip_string not open coded loops
- set termios speed properly in usb_serial
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 441b62c1edb986827154768d89bbac0ba779984f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Mar 3 16:08:34 2008 -0800
USB: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 14722ef4acedc643f0b78b7165ceff2d300dae4d
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Thu Apr 17 10:18:11 2008 -0400
USB: usbfs: export the URB_NO_INTERRUPT flag to userspace
This patch (as1079) cleans up the way URB_* flags are exported in
usbfs.
The URB_NO_INTERRUPT flag is now exported (this is the
only behavioral change).
USBDEVFS_URB_* macros are added for URB_NO_FSBR,
URB_ZERO_PACKET, and URB_NO_INTERRUPT, making explicit the
fact that the kernel accepts them.
The flag matching takes into account that the URB_* values
may change as the kernel evolves, whereas the USBDEVFS_URB_*
values must remain fixed since they are a user API.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit aff6d18f95bb81b2d07994372c8edcc2c2b41180
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Fri Apr 18 11:11:26 2008 -0400
USB: fix compile problems in ehci-hcd
This patch (as1072) fixes some recently-introduced compile problems
that show up in ehci-hcd when CONFIG_PM is turned off.
PORT_WAKE_BITS needs to be defined always.
ehci_port_power() is called during initialization by all the
EHCI variants other than the PCI version, in which it is
"defined but not used". So add a call to it.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4f6676274fb6303a8e8100d086ea8c2c00c0d8e3
Author: David Brownell <david-b at pacbell.net>
Date: Sat Apr 12 08:32:05 2008 -0700
USB: ehci: qh_completions cleanup and bugfix
Simplify processing of completed qtds, and correct handling of short
reads, by removing two state variables:
- "qtd_status" wasn't needed. The current URB's status is either
OK (-EINPROGRESS) or some fault status. Once a fault appears,
the queue halts and any later QTDs are immediately removed, so
no temporary status is needed. (Or for typical short reads,
it's not treated as a fault, so no queue halt is needed.)
- "do_status" was erroneous. Because of how the queue is set up,
short control reads can (and should!) be treated like full size
reads, and cleaned up the usual way. The status stage will be
executed transparently, and usbcore handles the choice of whether
to report this status as unexected.
The "do_status" problem caused a rather perplexing timing-dependent
problem with usbtest case 10. Sometimes it would make the controller
skip a dozen transactions while (wrongly) trying to clean up after a
short transfer. Fortunately, removing a dcache contention issue made
this become trivial to reproduce (on one test rig), so enough clues
finally presented themselves ... I think this has been around for a
very long time, but was worsened by recent urb->status changes.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c6dbf554bc8a79c9caab3dbf891a33c19068f646
Author: David Brownell <david-b at pacbell.net>
Date: Sun Apr 13 14:00:44 2008 -0700
USB: cdc-acm: signedness fix
Fix bogus assignment of "unsigned char *" to "char *": preserve
unsignedness. These values are used directly as descriptor lengths
when iterating through the buffer, so this *could* cause oddness
that potentially includes oopsing. (IMO not likely, except as
part of a malicious device...)
Fix the bogus warning in CDC ACM which highlighted this problem
(by showing a negative descriptor type). It uses the undesirable
legacy err() for something that's not even an error; switch to
use dev_dbg, and show descriptor types in hex notation to match
the convention for such codes.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 08177e12b7b4c3d59060f829e5c151d06f9a08d6
Author: Oliver Neukum <oliver at neukum.org>
Date: Wed Apr 16 15:46:37 2008 +0200
USB: add documentation about callbacks
Add Documentation about callbacks in USB.
Signed-off-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e872154921a6b5256a3c412dd69158ac0b135176
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Apr 14 12:17:56 2008 -0400
USB: don't explicitly reenable root-hub status interrupts
This patch (as1069b) changes the way OHCI root-hub status-change
interrupts are enabled. Currently a special HCD method,
hub_irq_enable(), is called when the hub driver is finished using a
root hub. This approach turns out to be subject to races, resulting
in unnecessary polling.
The patch does away with the method entirely. Instead, the driver
automatically enables the RHSC interrupt when no more status changes
are present. This scheme is safe with controllers using
level-triggered semantics for their interrupt flags.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 5f47493cdf90b8afe5353e59de30e449e775ea8b
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Apr 14 12:17:49 2008 -0400
USB: OHCI: turn off RD when remote wakeup is disabled
This patch (as1068b) disables the RD interrupt flag when an OHCI root
hub is suspended with remote wakeup disabled. Although the spec
clearly states that this flag permits the controller to issue an
interrupt when a resume request from downstream is detected and not
when a local status change occurs, some controllers mistakenly use it
for both types of event.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 58a97ffeb2297f154659f339d77eb3f32c4d8b3e
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Apr 14 12:17:10 2008 -0400
USB: HCDs use the do_remote_wakeup flag
When a USB device is suspended, whether or not it is enabled for
remote wakeup depends on the device_may_wakeup() setting. The setting
is then saved in the do_remote_wakeup flag.
Later on, however, the device_may_wakeup() value can change because of
user activity. So when testing whether a suspended device is or
should be enabled for remote wakeup, we should always test
do_remote_wakeup instead of device_may_wakeup(). This patch (as1076)
makes that change for root hubs in several places.
The patch also adjusts uhci-hcd so that when an autostopped controller
is suspended, the remote wakeup setting agrees with the value recorded
in the root hub's do_remote_wakeup flag.
And the patch adjusts ehci-hcd so that wakeup events on selectively
suspended ports (i.e., the bus itself isn't suspended) don't turn on
the PME# wakeup signal.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b950bdbc67041412cb042e404938667204c7902c
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Apr 14 11:45:29 2008 -0400
USB: g_file_storage: ignore bulk-out data after invalid CBW
This patch (as1061) makes g_file_storage more compliant with the
Bulk-Only Transport specification. After an invalid CBW is received,
the gadget must ignore any further bulk-OUT data until it is reset.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9aebfd6bda789891e6d296bb49b5fb32d1057f18
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Apr 16 09:17:38 2008 -0700
USB: serial: remove endpoints setting checks from core and header
Remove the unused check for num_interrupt and friends as well as remove
them from the header file because no usb-serial drivers no longer
reference them.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 0ba4034e20abf372dae6c6cabeeeab600acb5889
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Apr 16 09:17:38 2008 -0700
USB: serial: remove unneeded number endpoints settings
The usb-serial core no longer checks these fields so remove them from
all of the individual drivers. They will be removed from the usb-serial
core in a patch later in the series.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 5f760040bcb4cc0498d4c662c4ea305290198ef3
Author: Chris Collins <chris at ursys.com.au>
Date: Thu Apr 10 10:15:53 2008 +0200
USB: option.c: correct DTR behaviour
Setting DTR et al. should work for all interfaces
if you actually pass the interface number. :-P
This should help with devices that have important pseudo-serial ports
that aren't on the first interface in the device.
Signed-off-by: Chris Collins <chris at ursys.com.au>
Signed-off-by: Matthias Urlichs <matthias at urlichs.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e6a79f1f07fc88a2efd6d0e8f0ccf591cb93cd34
Author: Oliver Neukum <oliver at neukum.org>
Date: Wed Apr 9 15:37:34 2008 +0200
USB: add Documentation about usb_anchor
This adds documentation about the new usb anchor infrastructure.
Signed-off-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a082b5c7882bdbd8a86ace8470ca2ecda796d5a7
Author: David Brownell <david-b at pacbell.net>
Date: Thu Apr 10 14:21:06 2008 -0700
USB: ehci: qh/qtd cleanup comments
Provide better comments about qh_completions() and QTD handling.
That code can be *VERY* confusing, since it's evolved over a few
years to cope with both hardware races and silicon quirks.
Remove two unlikely() annotations that match the GCC defaults
(and are thus pointless); add an "else" to highlight code flow.
This patch doesn't change driver behavior.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6427f7995338387ddded92f98adec19ddbf0ae5e
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Thu Apr 10 12:45:34 2008 -0400
USB: log an error message when USB enumeration fails
This patch (as1077) logs an error message whenever the kernel is
unable to enumerate a new USB device.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Cc: stable <stable at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7ef4f0600df3dc2beff838b3f03652677ed28311
Author: Oliver Neukum <oliver at neukum.org>
Date: Thu Apr 10 15:15:37 2008 +0200
USB: update comments about usb driver's header
Comments here are so outdated that they are plain wrong. We cannot expect
people to write correct drivers if the headers have incorrect comments.
Signed-off-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 51c159e7a8310f7272154fdd096315ae86bd36c2
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sun Apr 6 08:00:30 2008 -0400
USB: Remove superfluous "depends on USB_SERIAL" from Kconfig.
Given that most of drivers/usb/serial/Kconfig is wrapped inside:
if USB_SERIAL
...
endif # USB_SERIAL
remove the consequently redundant dependencies on USB_SERIAL.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit eda769593bbae8aee4e336b0732f6016353301a3
Author: Oliver Neukum <oliver at neukum.org>
Date: Thu Apr 10 14:07:37 2008 +0200
USB: add extension of anchor API, usb_unlink_anchored_urbs
This adds the ability to trigger asynchronous unlinks of anchored URBs. This
is needed for error handling in the comntext of completion handlers, which
cannot sleep.
Signed-off-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9424ea29658ce5bcdcf527ddf9617b9507ddf1aa
Author: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Date: Thu Apr 10 21:05:58 2008 +0900
USB: r8a66597-hcd: Add support for SH7366 USB host
R8A66597 is similar to SH7366 USB 2.0 Host/Function module. It can
support SH7366 USB host by changing several R8A66597 code.
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 29fab0cd897519be9009ba8c898410ab83b378e9
Author: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Date: Thu Apr 10 21:05:55 2008 +0900
USB: r8a66597-hcd: fix usb device connection timing
Fix the problem that enumeration of a USB device was slow.
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6d8791076c7742c65dd796ae0ac260ab22e85517
Author: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Date: Thu Apr 10 21:05:47 2008 +0900
USB: r8a66597-hcd: fix interrupt transfer interval
This driver ignored the value of bInterval and revised the problem
that performed interrupt transfer.
ASIX USB Ethernet adapter comes to work with this host controller
by applying this patch.
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 97af0a911bfb1e798c395c6ebabb4731f821736f
Author: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Date: Thu Apr 10 14:20:08 2008 +0300
USB: oti6858: fix TCFLSH ioctl handling
Removes unimplemented TCFLSH handling from oti6858, because it was
preventing TCFLSH handling by upper layer (line discipline) drivers (see
drivers/char/tty_io.c line 3450).
Signed-off-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 21da84a89312dd8d014ca3352d1ab5c2279ec548
Author: Sarah Sharp <sarah.a.sharp at intel.com>
Date: Tue Apr 8 14:30:18 2008 -0700
USB: ehci shutdown refactored
This patch refactors some shutdown code so it can be shared between
ehci_stop() and ehci_shutdown().
This also fixes a couple potential bugs:
- ehci_shutdown() was not locking ehci->lock before halting the HC.
- ehci_shutdown() didn't disable the watchdog and IAA timers.
- ehci_stop() was resetting the host controller when it may have been
running, which the EHCI spec says "may result in undefined behavior".
ehci_stop() was calling port_power() to turn off the ports, which waited
20ms after applying the port change. The msleep was for the case where
the HC might take 20ms to turn the ports on; since we're shutting them
off, we can avoid the msleep and just use ehci_turn_off_ports().
ehci_stop() doesn't need to clear the intr_enable register or revert
ownership of the companion controllers to the BIOS, because the host
controller reset should have done that. There might be a buggy host
controller that doesn't follow the reset rules, but for now we assume
it's redundant code and remove it.
[ A subsequent patch will cancel the timers later ... this version
carries forward existing bugs where timers could get re-armed
after they're canceled. ]
Signed-off-by: Sarah Sharp <sarah.a.sharp at intel.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3cf2723432dd27402a4a4941ad2d04eae5dd639c
Author: David Brownell <david-b at pacbell.net>
Date: Sun Apr 6 23:32:55 2008 -0700
USB: at91_udc can prefetch data
The at91sam9 chip are ARMv5 so they support preload instructions.
Use preloading to load the FIFO a bit faster.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a89a2cd396b20c46a37fa8db4b652fb00f29d0a4
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Apr 7 15:03:25 2008 -0400
USB: dummy-hcd: use dynamic allocation for platform_devices
This patch (as1075) changes dummy-hcd to dynamically allocate its
platform_device structures, using the core platform_device_alloc()
interface. This is what it should have done all along, because the
dynamically-allocated structures have a release method in the driver
core and are therefore immune to being released after the module has
been unloaded.
Thanks to Richard Purdie for pointing out the need for this change.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Cc: Richard Purdie <rpurdie at rpsys.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 0e530b45783f75a29bde20bbf9e287c915a4f68b
Author: David Brownell <david-b at pacbell.net>
Date: Sat Apr 5 14:17:14 2008 -0700
USB: gadget section fixes
Restore some section annotations: they were switched to "__devinit"
while they should have been "__init", because of bogus warnings. The
warnings are now fixed, so the runtime footprint of various drivers
can now shrink a bit. On ARMv5, it's about 600 bytes except for the
Ethernet gadget, where it can save a bit more.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 61a5c657892a43653d6189972159590751a0673e
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Fri Apr 4 23:46:59 2008 -0400
USB: rework sysfs removal of interface files
Removing an interface's sysfs files before unregistering the interface
doesn't work properly, because usb_unbind_interface() will reinstall
altsetting 0 and thereby create new sysfs files. This patch (as1074)
removes the files after the unregistration is finished. It's not
quite as clean, but at least it works.
Also, there's no need to check if an interface has been registered
before removing its sysfs files. If it hasn't been registered then
the files won't have been created, so usb_remove_sysfs_intf_files()
will simply do nothing.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Tested-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 96e12fced365262e185a8e935db23973337b8a2a
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 4 14:28:01 2008 -0700
usb: replace remaining __PRETTY_FUNCTION__ occurrences
The kernel is written in C, not C++, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 43bbb7e015c4380064796c5868b536437b165615
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Thu Apr 3 18:03:17 2008 -0400
USB: OHCI: host-controller resumes leave root hub suspended
Drivers in the ohci-hcd family should perform certain tasks whenever
their controller device is resumed. These include checking for loss
of power during suspend, turning on port power, and enabling interrupt
requests.
Until now these jobs have been carried out when the root hub is
resumed, not when the controller is. Many drivers work around the
resulting awkwardness by automatically resuming their root hub
whenever the controller is resumed. But this is wasteful and
unnecessary.
To simplify the situation, this patch (as1066) adds a new core
routine, ohci_finish_controller_resume(), which can be used by all the
OHCI-variant drivers. They can call the new routine instead of
resuming their root hubs. And ohci-pci.c can call it instead of using
its own special-purpose handler.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7be7d7418776a41badce7ca00246e270d408e4b9
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Thu Apr 3 18:03:06 2008 -0400
USB: clarify usage of hcd->suspend/resume methods
The .suspend and .resume method pointers in struct usb_hcd have not
been fully understood by host-controller driver writers. They are
meant for use with PCI controllers; other platform-specific drivers
generally should not refer to them.
To try and clarify matters, this patch (as1065) renames those methods
to .pci_suspend and .pci_resume. It eliminates corresponding dead code
and bogus references in the ohci-ssb and u132-hcd drivers.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7329e211b987a493cbcfca0e98c60eb108ab42df
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Thu Apr 3 18:02:56 2008 -0400
USB: root hubs don't lie about their number of TTs
Currently EHCI root hubs enumerate with a bDeviceProtocol code
indicating that they possess a Transaction Translator. However the
vast majority of controllers do not; they rely on a companion
controller to handle full- and low-speed communications. This patch
(as1064) changes the root-hub device descriptor to match the actual
situation.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6fc88f53aaa4ff8ee621353ac27269b4a656d721
Author: Oliver Neukum <oliver at neukum.org>
Date: Thu Apr 3 21:40:59 2008 +0200
USB: convert away from urb->status in xpad driver
USB is moving to transfering status as a parameter. To ease the transition
urb->status is to be touched only once in a function. The xpad driver has
been overlooked. Dmitry wants this to go through the USB tree.
Signed-off-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 0d22f65515307c878ddd20b1305cce925ca9516c
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Thu Apr 3 11:35:26 2008 -0400
USB: OHCI: fix bug in controller resume
This patch (as1063) fixes a bug in the way ohci-hcd resumes its
controllers. It leaves the Master Interrupt Enable bit turned off.
If the root hub is resumed immediately this won't matter. But if the
root hub is suspended (say because no devices are plugged in), it won't
ever wake up by itself.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
CC: David Brownell <david-b at pacbell.net>
Cc: stable <stable at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9063ff44f081a0297085952f6760dfe1f8ca840e
Author: Ingo van Lil <inguin at gmx.de>
Date: Fri Mar 28 14:50:26 2008 -0700
USB: gadget: dummy_hcd.c: fix nested switch statements
Fix a messed up combination of two nested switch statements in
drivers/usb/gadget/dummy_hcd.c.
According to the USB spec (section 5.8.3) the maximum packet size for bulk
endpoints can be 512 for high-speed devices and 8, 16, 32 or 64 for full-speed
devices. Low-speed devices must not have bulk endpoints.
Signed-off-by: Ingo van Lil <inguin at gmx.de>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 73d79aaba9ee21aaa1a6676f568ef7b3bdf993ea
Author: Jesper Juhl <jesper.juhl at gmail.com>
Date: Fri Mar 28 14:50:27 2008 -0700
USB: mem leak fixes for AMD 5536 UDC high/full speed USB device controller driver
In drivers/usb/gadget/amd5536udc.c::udc_pci_probe(), sizeof(struct udc)
storage is allocated for 'dev'.
There are many exit points from the function where 'dev' is not free'd but has
also not yet been used for anything. The following patch free's 'dev' at the
return points where it has not yet been used.
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
Cc: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 148d9fe4c91a6356dae1b05b76b8133586c26be4
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Thu Mar 27 14:52:57 2008 -0400
USB: usb-storage: use adaptive DMA mask
This patch (as1060) makes usb-storage set the DMA alignment mask for
SCSI slaves to match the maxpacket size of the bulk-IN endpoint,
rather than always setting it to 511. For full-speed devices that
mask is too restrictive, and wireless USB devices can have maxpacket
sizes larger than 512.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit cc901bbb2e2a4e4f96da3d70dae332882c10054b
Author: Craig W. Nadler <craig at nadler.us>
Date: Thu Mar 20 14:46:26 2008 -0700
USB: g_printer bugfixes
G_PRINTER: Bug fix for blocking reads and a fix for a memory leak.
This fixes bugs in blocking IO calls. When the poll() entry point
is called receive transfers will be setup if they have not already
been. Another bug fix is that the poll() entry point now checks the
current receive buffer for data when reporting if any data had been
received. A memory leak was fixed that could have occurred when a
USB reset happened.
Signed-off-by: Craig W. Nadler <craig at nadler.us>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 119fc8c9acde650fb92b44c34ea6fc84feb0f6dd
Author: Jesper Juhl <jesper.juhl at gmail.com>
Date: Fri Mar 21 22:55:45 2008 +0100
USB: test for NULL return from platform_get_resource() in ohci_hcd_sm501_drv_remove()
platform_get_resource() may return null, so although it seems it will never
do so here unless there's a bug elsewhere, it does no harm to be defensive
and test.
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Magnus Damm <magnus.damm at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e04d80b03d2a116ddd6eb9140c8c83760c315b94
Author: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Date: Sun Mar 23 04:08:01 2008 -0700
USB: serial: Remove obsolete contact addresses
Remove obsolete contact addresses.
Signed-off-by: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 44a29fd715a017183e83377b297ab3f792995467
Author: Ming Lei <tom.leiming at gmail.com>
Date: Sun Mar 23 20:58:28 2008 +0800
USB: fix comments of 2 functions in hcd.c
Remove useless @type note for rh_string() and @r note for usb_hcd_irq()
since this two parameters were removed.
Signed-off-by: Ming Lei <tom.leiming at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 50d8ca9b5624bf50cc3ff624fe9ababf0c789bd2
Author: Daniel Walker <dwalker at mvista.com>
Date: Sun Mar 23 00:00:02 2008 -0700
usb: u132-hcd driver: semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b40f8d3980d3eef26b3bd77da5314728a5b30aea
Author: Daniel Walker <dwalker at mvista.com>
Date: Sun Mar 23 00:00:01 2008 -0700
usb: u132-hcd driver style clean up
I was converting a semaphore in this file to a mutex when I noticed that
this file has some fairly rampant style problems. Practically every line
has spaces instead of tabs .. Once I cleared that up, checkpatch.pl showed
a number of other problem.. I think this file might be a good one to review
for new style checks that could be added..
Below are the only two remaining which I didn't remove.
#5083: FILE: drivers/usb/host/u132-hcd.c:2907:
+ error:
WARNING: labels should not be indented
#5087: FILE: drivers/usb/host/u132-hcd.c:2911:
+ stall:
These labels are actually inside a switch statement, and they are right
under "default:". "default:" appears to be exempt and these other label
should be too, or default shouldn't be exempt.
I also deleted a few lines due to single statements inside { } ,
if (is_error()) {
return;
}
becomes,
if (is_error())
return;
with one line deleted.
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 619a6f1d1423d08e74ed2b8a2113f12ef18e4373
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Thu Feb 7 23:59:03 2008 +0100
USB: add usb-serial spcp8x5 driver
Original version of the driver done by Linxb, changes by Harald, and
lots of cleanups by me in order to get it into a mergable state.
Cc: Linxb <xubin.lin at worldplus.com.cn>
Cc: Harald Klein <hari at vt100.at>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7106967ecc0a33a7d7e2e04798eb9f45377f448b
Author: Kevin Lloyd <klloyd at sierrawireless.com>
Date: Wed Apr 2 11:24:56 2008 -0700
usb/usb-serial-sierra-add-new-dev-group
This patch is for the sierra driver and adds support for a new group of
devices that have a new USB configuration.
This targets kernel 2.6.25-rc7
Signed-off-by: Kevin Lloyd <klloyd at sierrawireless.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 69a90f8189960f37cc73f5da6c331b23227e2197
Author: Kevin Lloyd <klloyd at sierrawireless.com>
Date: Mon Mar 31 10:20:54 2008 -0700
USB: Serial: Sierra: C597 fix
This patch is for the sierra driver and fixes a Compass 597 bug that
allows users to access the SD-Card.
This targets kernel 2.6.25-rc7
Signed-off-by: Kevin Lloyd <klloyd at sierrawireless.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit f3564de4f5ee3e205227691401d875a57b76906d
Author: Kevin Lloyd <klloyd at sierrawireless.com>
Date: Fri Mar 28 10:05:08 2008 -0700
USB: Serial: Sierra: Clean up
This patch cleans up some of the sierra driver code. Please package this
with the other patches in this group as I would like the driver version
to reflect their changes as well.
Signed-off-by: Kevin Lloyd <klloyd at sierrawireless.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e4cf3aa8f9cd6ee4d583b5d445b5c152acefcde4
Author: David Engraf <david.engraf at netcom.eu>
Date: Thu Mar 20 10:01:34 2008 +0100
USB: increase cdc-acm write throughput
the following patch uses 16 write urbs and a writsize of wMaxPacketSize
* 20. With this patch I get the maximum througput from my linux system
with 20MB/sec read and 15 MB/sec write (full speed 1 MB/sec both)
I also deleted the flag URB_NO_FSBR for the writeurbs, because this
makes my full speed devices significant slower.
Signed-off-by: David Engraf <david.engraf at netcom.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 28d1dfadd3ca07e7ec1c3de4f82ac2b8ece4be91
Author: David Engraf <david.engraf at netcom.eu>
Date: Thu Mar 20 10:53:52 2008 +0100
USB: cdc-acm tell tty layer not to split things up.
It ensures that the tty level do not split
the send buffer into 2KB blocks.
Signed-off-by: David Engraf <david.engraf at netcom.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 454459b02ea9c8e850fd0b4e770037daf9a7b758
Author: Pete Zaitcev <zaitcev at redhat.com>
Date: Wed Mar 19 22:29:51 2008 -0700
usbmon: restore mmap
Paolo asked to enable the mmap. I kept it off because I'm do not
entirely understand how it workse these days after ->nopage etc.
But it seems like working somewhat at least.
Signed-Off-By: Pete Zaitcev <zaitcev at gmail.com>
Cc: Paolo Abeni <paolo.abeni at email.it>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d43a05fdc2b5675efc45c32d427ff987a10b617a
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sun Mar 9 13:55:01 2008 -0400
USB: Fix "cut and paste" booboo in usbmon Makefile.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9ec249a658e85fbb3e510c6208fb0c1a1d19c059
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sat Mar 8 03:27:44 2008 -0500
USB: Remove EXPERIMENTAL designation from USB_EHCI_ROOT_HUB_TT.
According to David Brownell, this feature doesn't require an
experimental designation any longer.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b67199967c777cf1aa42949f2bda00a7b937243e
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sat Mar 8 03:12:44 2008 -0500
USB: Remove EXPERIMENTAL from dynamic USB minor allocation.
Since this USB feature seems non-experimental, remove that dependency.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 528e4c12a7c141ce46641537fe7e3d7c29f68b8c
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sat Mar 8 03:04:05 2008 -0500
USB: Remove EXPERIMENTAL designation from USB MDC800 support.
Since support for the USB Mustek MDC800 Digital Camera has apparently
been around since the beginning of the git repository, it's safe to
assume it's no longer experimental.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 1b75dc4de94e4e11ab22e284fc0853e21d1ac07a
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sat Mar 8 03:00:04 2008 -0500
USB: Remove EXPERIMENTAL designation from USB serial/ Kconfig entries
Since nothing under the USB serial/ directory seems to be obviously
experimental, remove the EXPERIMENTAL dependency from all of those
Kconfig entries.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit bce62c263ab3742365dc1ac919cef732379e354a
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sat Mar 8 02:46:57 2008 -0500
USB: Remove EXPERIMENTAL designation from USB misc/ Kconfig entries
Since nothing under the USB misc/ seems to be obviously experimental,
remove the EXPERIMENTAL dependency from those Kconfig entries.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit afd0e0f2d499a832c3ef17a6872d6244d65cbe17
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Mar 10 15:09:51 2008 -0400
USB: Remove EXPERIMENTAL tags from some USB gadget Kconfig entries.
Based on a recent discussion on the Linux USB mailing list, remove the
designation of EXPERIMENTAL from some USB gadget entries, and tag some
of them as DEVELOPMENT.
just for fun, i added a bit of help for gadgetfs, explaining the
race condition.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
commit 726627f341beeedba948643c766a6786d75bbf9d
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sat Mar 8 02:17:55 2008 -0500
USB: Remove EXPERIMENTAL designation from USB storage Kconfig entries.
Since there seems to be little reason to mark the current USB storage
features as "EXPERIMENTAL," remove that dependency.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d277064e7e16d02e0078a6bc1820764ae00dea87
Author: matthieu castet <castet.matthieu at free.fr>
Date: Wed Mar 19 19:40:52 2008 +0100
USB: mass storage: emulation of sat scsi_pass_thru with ATACB
I have got a cypress usb-ide bridge and I would like to tune or monitor
my disk with tools like hdparm, hddtemp or smartctl.
My controller support a way to send raw ATA command to the disk with
something call atacb (see
http://download.cypress.com.edgesuite.net/design_resources/datasheets/contents/cy7c68300c_8.pdf).
Atacb support can be added for each application, but there is some disadvantages :
- all application need to be patched
- A race is possible if there other accesses, because the emulation can
be split in 2 atacb scsi transactions. One for sending the command, one
for reading the register (if ck_cond is set).
I have implemented the emulation in usb-storage with a special proto_handler,
and an unsual entry.
Signed-off-by: Matthieu CASTET <castet.matthieu at free.fr>
Signed-off-by: Matthew Dharm <mdharm-usb at one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit dda43a0e03a33dd716fb34f812b1af614f74daff
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Fri Mar 7 13:45:32 2008 -0500
USB: Standardize inclusion protection and add where missing.
For the header files in include/linux/usb, add missing multiple
inclusion protection and standardize what's already there. The
apparent standards:
* macro name of __LINUX_USB_headerfile_H
* inclusion protection placed after leading comment block
* macro name added as a comment on the final #endif
* any obvious trivial whitespace cleanup associated with the above
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit f66396b55d4016bdc7a5298db7a681c63b649bf4
Author: Tilman Schmidt <tilman at imap.cc>
Date: Thu Mar 13 19:51:42 2008 +0100
USB: usb.h: reduce syslog clutter [v3]
The the err() / info() / warn() macros in usb.h inserted __FILE__ at
the beginning of the message, which expands to the complete pathname
of the source file within the kernel tree, frequently taking up half
of an 80 character screen line before the actual message even begins.
Use the module name instead.
Signed-off-by: Tilman Schmidt <tilman at imap.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit ff66e3ce3524125106be3ff18104ecde0849b85c
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed Mar 12 13:32:24 2008 -0700
drivers/usb/core/devio.c: suppress warning with 64k PAGE_SIZE
drivers/usb/core/devio.c: In function 'proc_control':
drivers/usb/core/devio.c:657: warning: comparison is always false due to limited range of data type
Cc: Alan Stern <stern at rowland.harvard.edu>
Cc: Pete Zaitcev <zaitcev at redhat.com>
Cc: Oliver Neukum <oliver at neukum.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 8873aaa6e574d85c020a1c472d6d159cd1ec8aef
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Mon Mar 10 21:59:28 2008 +0000
USB: cypress_m8: Speed handling
The recent changes to this driver cleaned it up a lot, follow that up
by sorting the speed side of things out as well
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 25b70a8665e9854504b9196c3098dadd37c721aa
Author: David Brownell <david-b at pacbell.net>
Date: Tue Mar 4 15:11:07 2008 -0800
USB: ehci: paranoia, reject large control transfers
Some EHCI fault paths with large control transfers aren't coded. Avoid
problems by rejecting transfers that may need two qTDs (16+ KB). This is
mostly paranoia; even 4 KB transfers are rare, and most HCDs use lower
limits (so it's unlikely anyone would ever try such a thing).
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 70a1c9e086c2e267fbc4533cb870f34999b531d6
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Thu Mar 6 17:00:58 2008 -0500
USB: remove dev->power.power_state
power.power_state is scheduled for removal. This patch (as1053)
removes all uses of that field from drivers/usb. Almost all of them
were write-only, the most significant exceptions being sl811-hcd.c and
u132-hcd.c.
Part of this patch was written by Pavel Machek.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Cc: David Brownell <david-b at pacbell.net>
Acked-by: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e1879b19b0abdb387e4aeb0b935a486cc75042fb
Author: Matthias Geissert <matthias.geissert at web.de>
Date: Thu Mar 6 22:00:33 2008 +0100
USB: ipaq: fix devices having more than one endpoint
The ipaq module supports devices with one endpoint only. Some devices,
e.g. Yakumo Delta 300, have more than one endpoint.
This patch fixes support for devices having up to 2 endpoints which used
to work on older kernel versions.
Signed-off-by: Matthias Geissert <matthias.geissert at web.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d1b1842c393cf322712b669ec887397b89ed2312
Author: David Brownell <david-b at pacbell.net>
Date: Wed Mar 5 23:37:52 2008 -0800
USB: ehci: remove obsolete workaround for bogus IRQs
It was pointed out that we found and fixed the cause of the "bogus"
fatal IRQ reports some time ago ... this patch removes the code
which was working around that bug ("status" got clobbered), and a
comment which needlessly confused folk reading this code.
This also includes a minor cleanup to the code which fixed that bug.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 22552b286b44b8988e08fb74379507a9b32521b0
Author: Robin Getz <rgetz at blackfin.uclinux.org>
Date: Wed Mar 5 23:17:38 2008 -0800
USB: partial USB embedded host support
This provides better support for USB "Embedded Host" functionality, which
is a subset of the USB OTG options:
* External hub support can be disabled;
* USB peripherals not whitelisted in "otg_whitelist.h" will be rejected
during enumeration.
These options can allow some savings in software and support.
Signed-off-by: Robin Getz <rgetz at blackfin.uclinux.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b56394bf325820e9f338eaef2941f18b17b98098
Author: Ray Lee <ray-lk at madrabbit.org>
Date: Tue Mar 4 15:25:12 2008 -0800
USB: io_ti.c: remove unneeded null tty check
The Coverity checker (and Adrian Bunk) spotted an inconsistent NULL check of
port->tty (it's blindly dereferenced later without the check).
Alan Cox confirmed the check can go.
Signed-off-by: Ray Lee <ray-lk at madrabbit.org>
Cc: Adrian Bunk <bunk at kernel.org>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit dfa5ec79d28300b0d1fdeafbeebf0a6b721edc38
Author: Julia Lawall <julia at diku.dk>
Date: Tue Mar 4 15:25:11 2008 -0800
USB: use DIV_ROUND_UP
The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /
(d)) but is perhaps more readable.
An extract of the semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@haskernel@
@@
#include <linux/kernel.h>
@depends on haskernel@
expression n,d;
@@
(
- (n + d - 1) / d
+ DIV_ROUND_UP(n,d)
|
- (n + (d - 1)) / d
+ DIV_ROUND_UP(n,d)
)
@depends on haskernel@
expression n,d;
@@
- DIV_ROUND_UP((n),d)
+ DIV_ROUND_UP(n,d)
@depends on haskernel@
expression n,d;
@@
- DIV_ROUND_UP(n,(d))
+ DIV_ROUND_UP(n,d)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3d71fe0bb29a3fbffdbe69dd0696927b6a23dd4e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Feb 20 21:38:32 2008 +0000
USB: io_ti: lock mcr and msr shadows properly
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 04ca89d4948ad4b6ec3b33e9588ae1885643148c
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Feb 20 21:41:40 2008 +0000
USB: ti_usb_3410_5052: Extend locking to msr and shadow mcr
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a40d8540f4b7874ef674428cf757e8f466d271ca
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Feb 20 21:40:34 2008 +0000
USB: kobil_sct: Get rid of unneeded priv->line_state
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7b1fc8bc6d6881ff7f8876cbe665b3ad5271bc03
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Feb 20 21:39:25 2008 +0000
USB: iuu_phoenix: lock priv->tiostatus properly
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e298449401463dd18f24a87c48f9b0ec62bad936
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Feb 20 20:51:45 2008 +0000
USB: serial: Note mos7480 and option don't lock modem status
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9b0f2582d57d4c9081307c86e11afc9169de7d3e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Feb 20 20:49:53 2008 +0000
USB: ftdi_sio: Note missing locking
The ftdi_sio driver has no internal locking on the dtr/rts state. Flag
that up for someone to fix.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 2097890c43a8fe90763f31b0010fd6963f5512c8
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Feb 20 20:47:56 2008 +0000
USB: usb-serial: Prepare for BKL push down
Take the lock in usb-serial instead. As it relies on the BKL internally
we can't push it any deeper yet.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3d01f0fe6b66dd34511eaf35e06764b8997187bc
Author: Karsten Wiese <fzu at wemgehoertderstaat.de>
Date: Tue Feb 19 12:31:49 2008 -0800
USB: minor ehci xITD simplifications
Remove two (or one) conditional tests in per-urb isochronous
transfer setup code paths.
Signed-off-by: Karsten Wiese <fzu at wemgehoertderstaat.de>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit fadec78bd93ede132c34ab94dce0e65a5ae56054
Author: matthias at kaehlcke.net <matthias at kaehlcke.net>
Date: Mon Feb 18 20:45:36 2008 +0100
USB: auerswald: Convert ccp->mutex in a mutex
The semaphore ccp->mutex is used as mutex, convert it to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias at kaehlcke.net>
Cc: Wolfgang Mües <wolfgang at iksw-muees.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 8a0f46b92fcab6652b8e62c006d015d562302d08
Author: matthias at kaehlcke.net <matthias at kaehlcke.net>
Date: Mon Feb 18 20:45:35 2008 +0100
USB: auerswald: Convert ccp->readmutex in a mutex
The semaphore ccp->readmutex is used as mutex, convert it to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias at kaehlcke.net>
Cc: Wolfgang Mües <wolfgang at iksw-muees.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b994d7f70ae59b874843fa2bc9a28b17b41febd5
Author: matthias at kaehlcke.net <matthias at kaehlcke.net>
Date: Mon Feb 18 20:45:34 2008 +0100
USB: auerswald: Convert stats_sem in a mutex
The semaphore cp->mutex is used as mutex, convert it to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias at kaehlcke.net>
Cc: Wolfgang Mües <wolfgang at iksw-muees.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 92983c2121fb46f234add1c36b5e596779899d56
Author: Mike Isely <isely at pobox.com>
Date: Sun Feb 10 20:23:32 2008 -0600
USB: cypress_m8: Limit baud rate to <=4800 for USB low speed devices
The cypress app note for the M8 states that for the USB low speed
version of the part, throughput is effectively limited to 800
bytes/sec. So if we were to try a faster baud rate in such cases then
we risk overrun errors on receive. Best to just identify this case
and limit the rate to 4800 baud or less (by ignoring any request to
set a faster rate). The old baud rate setting code was somewhat
fragile; this change also hopefully makes it easier in the future to
better checking / limiting.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6768306c3d9568bc66dc22f8b863bfbda3e7c4d2
Author: Mike Isely <isely at pobox.com>
Date: Sun Feb 10 20:23:28 2008 -0600
USB: cypress_m8: Get rid of pointless NULL check
Remove a NULL check in cypress_m8; the check is useless in this
context because it is referenced earlier in the same code path thus
the kernel would be oops'ed before reaching this point anyway. (And
it's really pointless here anyway; if this pointer somehow is NULL the
driver is going to have serious problems in many other places.)
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3d6aa3206540e1e68bda9e8ea11ec71444f1ac71
Author: Mike Isely <isely at pobox.com>
Date: Sun Feb 10 20:23:24 2008 -0600
USB: cypress_m8: Don't issue GET_CONFIG for certain devices
Earthmate LT-20 devices (both "old" and "new" versions) can't tolerate
a GET_CONFIG command. The original Earthmate has no trouble with
this. Presumably other non-Earthmate devices are still OK as well.
This change disables the use of GET_CONFIG for cases where it is known
not to work.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3416eaa1f8f8d516b77de514e14cf8da256d28fb
Author: Mike Isely <isely at pobox.com>
Date: Sun Feb 10 20:23:19 2008 -0600
USB: cypress_m8: Packet format is separate from characteristic size
cypress_m8: Packet format is separate from characteristic size
The Cypress app note states that when using an 8 byte packet buffer
size that the packet format is modified (to be more compact). However
I have since discovered that newer DeLorme Earthmate LT-20 devices
(those that are low speed USB with 8 byte packet size) STILL use the
format that is really supposed to correspond to 32 byte packets.
Further confusing things is the subsequent discovery that there are
actually two different types of LT-20 - older LT-20's use 32 byte
packets which is probably why this issue wasn't originally
encountered. The solution here is to flag the packet format
separately from the buffer size. Then at initialization time,
identify the correct combination and set it up. This is a critical
fix for anyone with a newer LT-20. Older devices and non-Earthmate
devices should remain unaffected by this change. (If other devices
behave in this, uh, unexpected manner, it's now just a simple 1 line
change to fix them as well (change the pkt_fmt member for that
device). Default behavior with this patch is still to drive the
format as per the app-note; of course for Earthmate devices this is
overridden.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 93075544d6c6e9aaa14c44edb6eb3f71144bdeeb
Author: Mike Isely <isely at isely.net>
Date: Sun Feb 10 20:23:14 2008 -0600
USB: cypress_m8: Feature buffer fixes
cypress_m8: Feature buffer fixes
From: Mike Isely <isely at pobox.com>
Don't hardcode the feature buffer size; use sizeof() instead. That
way we can easily specify the size in a single spot. Speaking of the
feature buffer size, the Cypress app note (and further testing with a
DeLorme Earthmate) suggests that this size should be 5 not 8 bytes.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9544e833f977d1d3e102a070718d613cd234ce8d
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Feb 4 23:57:50 2008 -0800
USB: io_ti.c: remove pointless eye-candy in debug statements
These strings always come up as false positives whenever I'm doing
git-conflict fixups (ie: about 1000 times/day).
I don't think the zillion "<" and ">" characters are very useful and removing
them makes my life that little bit easier.
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4208978ec4f0d6001facf95be9defccf1a0bf313
Author: Savin Zlobec <savin at epiko.si>
Date: Fri Feb 15 13:42:01 2008 +0100
USB: gadget: Hangup tty on g_serial disconnect
On USB cable disconnect g_serial doesn't hangup the port tty,
which results in an endless read on the tty device. With the
following patch the read and select behave correctly when
the cable is unplugged.
Tested on at91rm9200
Signed-off-by: Savin Zlobec <savin at epiko.si>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c765d4cad977f7e454a53d5bca5a942156b2d94c
Author: Karsten Wiese <fzu at wemgehoertderstaat.de>
Date: Sat Feb 16 13:44:42 2008 -0800
USB: EHCI: Refactor "if (handshake()) state = HC_STATE_HALT"
Refactor the EHCI "if (handshake()) state = HC_STATE_HALT" idiom,
which appears 4 times, by replacing it with calls to a new function
called handshake_on_error_set_halt(). Saves a few bytes too.
Signed-off-by: Karsten Wiese <fzu at wemgehoertderstaat.de>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 96f9bc373c83a67922dc32f358e8a3b3dd4e18a0
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Feb 13 17:02:33 2008 +0900
USB: m66592-udc: reduce size of data structure.
Poking around with pahole, we see that m66592 handily shoves a u16 in
between larger types on 2 separate occasions leaving us with 2 2-byte
holes:
struct m66592 {
...
/* size: 1196, cachelines: 38 */
/* sum members: 1192, holes: 2, sum holes: 4 */
/* last cacheline: 12 bytes */
}; /* definitions: 1 */
Pairing them gets back 4-bytes:
struct m66592 {
...
/* size: 1192, cachelines: 38 */
/* last cacheline: 8 bytes */
}; /* definitions: 1 */
Unfortunately it's not enough to save a cacheline with this massive
structure, but every byte helps.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 135db0485cdfa808d69420889ca4a2fad8aed9df
Author: David Brownell <david-b at pacbell.net>
Date: Mon Feb 11 18:40:46 2008 -0800
USB: ehci minor SOC bus glue fixes
Various minor fixes to some SOC bus glue for EHCI:
- Remove a bogus copyright (by "me"!) which someone added to the FSL
driver, and an irrelevant comment.
- Un-break MODULE_ALIAS() directives after platform_bus hotplugging
acquired a backwards-incompatible change. (Which didn't fix ANY
of the in-tree drivers it prevented from hotplugging -- sigh.)
- Remove some bogus assignments of platform_bus_type; that's done by
the platform_bus code.
- Add some FIXMEs for drivers with that pointless two-level idiom for
probe() and remove() routines. ("Obfuscation" is a non-goal.)
That should help avoid future bus glue which copies that idiom.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit caa9ef672a045ba0b19184cd3f872b583f066771
Author: David Brownell <david-b at pacbell.net>
Date: Fri Feb 8 15:08:44 2008 -0800
USB: ehci tolerates some buggy devices
This teaches EHCI how to to work around bugs in certain high speed
devices, by accomodating "bulk" packets that exceed the 512 byte
constant value required by the USB 2.0 specification. (Have a
look at section 5.8.3, paragraphs 1 and 3.)
It also makes the descriptor parsing code warn when it encounters
such bugs. (We've had reports of maybe two or three such devices,
all pretty recent.)
Such devices are nonconformant. The proper fix is have the vendors
of those devices do the simple, obvious, and correct thing ... which
will let them be used with USB hosts that don't have workarounds for
this particular vendor bug. But unless/until they do, we can at least
have one of the high speed HCDs work with such buggy devices.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e01e7fe3886715f083313da409c5850472455d06
Author: David Brownell <david-b at pacbell.net>
Date: Sat Feb 2 02:42:52 2008 -0800
USB: ohci: port reset paranoia timeout
This limits how long the OHCI port reset loop waits for the hardware
to do its job, if the controller either (a) dies, or (b) can't finish
the reset. Such limits are always a good idea.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9776afc8b3dc487557f3f576002520f59be334e6
Author: David Brownell <david-b at pacbell.net>
Date: Fri Feb 1 11:42:05 2008 -0800
USB: ehci: minor cleanups
Minor cleanups to the EHCI code: revision history is what source
code repositories should have. Switch to a more standard way to
kick in verbose debugging -- don't be EHCI-specific.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit dbe0dbb7dfda52140d3469d7035a08dfa874fca2
Author: David Brownell <david-b at pacbell.net>
Date: Sun Feb 10 12:24:00 2008 -0800
USB: defines for USB "Link Power Management" (LPM) ECN
There's a new PM-related change notice for the USB 2.0 specification
called "Link Power Management" (LPM). It defines a new "L1 Suspend"
state which resembles the current (L2) suspend state, except that it
can be entered and exited much more quickly. It should thus be more
useful for runtime PM, even though it doesn't mandate reduced power
draw from VBUS.
This patch provides the relevant #defines for usbcore. Actually
implementing these mechanisms requires host silicon that can generate
new USB packets, plus hubs handling some new requests and peripherals
which understand the new packets.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c4504a7eb9c4c491e6f31b28169dd49e9bacc8ec
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Mon Feb 11 15:26:09 2008 +0300
USB: usbatm: convert heavy init dances to kthread API
This is an attempt to kill two birds with one stone.
First, we kill one more user of kernel_thread, which is scheduled
for removal. Second - we kill one of the last users of kill_proc -
the function which is also to be removed, because it uses a pid_t
which is not safe now.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Duncan Sands <baldrick at free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 1409e8e0e4dae15735727d7e2814b62aff609d31
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Feb 4 23:57:48 2008 -0800
USB: usb-ohci-sm501-driver: use the conventional convention for suspend and resume
Cc: Alan Stern <stern at rowland.harvard.edu>
Cc: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 5ddeac117f869c0da85e41e89dd5ed1199dab7dd
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Feb 4 23:57:45 2008 -0800
USB: make USB_STORAGE_ONETOUCH available with PM
As Torsten Kaiser pointed out, it seems the dependency of
USB_STORAGE_ONETOUCH on !PM should have been removed in commit
7931e1c6f8007d5fef8a0bb2dc71bd97315eeae9.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Matthew Dharm <mdharm-usb at one-eyed-alien.net>
Cc: Alan Stern <stern at rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Torsten Kaiser <just.for.lkml at googlemail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 75c43b6ec6eb114e875e43fb151987c1a558e4f4
Author: Daniel Walker <dwalker at mvista.com>
Date: Mon Feb 4 23:57:42 2008 -0800
USB: libusual: locking cleanup
I converted the usu_init_notify semaphore to normal mutex usage, and it
should still prevent the request_module before the init routine is
complete. Before it acted more like a complete, now the mutex protects two
distinct section from running at the same time.
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Cc: Pete Zaitcev <zaitcev at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d99388aa0a504f69532db353a976ec133361bb4f
Author: Daniel Walker <dwalker at mvista.com>
Date: Mon Feb 4 23:57:42 2008 -0800
USB: microtek: remove unused semaphore
No current references, so removing it.
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit f476fbaba7b2051bafdb527eea1a8bed649187d4
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Feb 13 18:33:15 2008 -0800
USB: convert usb.h struct usb_device to kernel-doc
Convert struct usb_device to use kernel-doc notation.
Please especially check the @filelist and @usb_classdev descriptions.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c27a4b717cfb597e2e383350c152ed0781041052
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Tue Apr 8 13:24:46 2008 -0700
USB: add USB_DT_CS_RADIO_CONTROL define to ch9.h
This is needed by the wireless usb developers, and is part of the USB spec.
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez at intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c2010a3b9e5e98efb7f70d4d73ce4f15508ffa7b
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Mon Apr 14 14:17:29 2008 -0700
checkpatch: usb_free_urb() can take NULL
usb_free_urb() can take a NULL, so let's check and warn about that.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9214d1d80c19016172e685ce7bde0ea757c49097
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Thu Mar 6 11:04:13 2008 -0500
USB: enable USB-PERSIST by default
This patch (as1052) enables USB-PERSIST for all devices by default.
The user won't have to remember to enable it explicitly for devices
containing mounted filesystems.
Eventually userspace tools like hal may be able to set the persist
attribute automatically when a filesystem is mounted on a USB device.
When that time comes this patch can be reverted, if people think it
matters.
This approach has the advantage of giving the user the ability to turn
off USB-PERSIST for devices with mounted filesystems, rather than
making the kernel always assume it should be on.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit eb764c4be1e5db3ee34df5745e98cf2f148c7320
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Mar 3 15:16:04 2008 -0500
USB: check serial-number string after device reset
This patch (as1048) extends the descriptor checking after a device is
reset. Now the SerialNumber string descriptor is compared to its old
value, in addition to the device and configuration descriptors.
As a consequence, the kmalloc() call in usb_string() is now on the
error-handling pathway for usb-storage. Hence its allocation type is
changed to GFO_NOIO.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit feccc30d90155bcbc937f87643182a43d25873eb
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Mar 3 15:15:59 2008 -0500
USB: remove CONFIG_USB_PERSIST setting
This patch (as1047) removes the USB_PERSIST Kconfig option, enabling
it permanently. It also prevents the power/persist attribute from
being created for hub devices; there's no point in having it since
USB-PERSIST is always turned on for hubs.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 5e6effaed6da94e727cd45f945ad2489af8570b3
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Mar 3 15:15:51 2008 -0500
USB: make USB-PERSIST work after every system sleep
This patch (as1046) makes USB-PERSIST work more in accordance with
the documentation. Currently it takes effect only in cases where the
root hub has lost power or been reset, but it is supposed to operate
whenever a power session was dropped during a system sleep.
A new hub_restart() routine carries out the duties required during a
reset or a reset-resume. It checks to see whether occupied ports are
still enabled, and if they aren't then it clears the enable-change and
connect-change features (to prevent interference by khubd) and sets
the child device's reset_resume flag. It also checks ports that are
supposed to be unoccupied to verify that the firmware hasn't left the
port in an enabled state.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3eb14915a300f539f271e3716f2421bb0697ed48
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Mar 3 15:15:43 2008 -0500
USB: reorganize code in hub.c
This patch (as1045) reorganizes some code in the hub driver.
hub_port_status() is moved earlier in the file, and a new hub_stop()
routine is created to do the work currently in hub_preset() (i.e.,
disconnect all child devices and quiesce the hub).
There are no functional changes.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3bb1af5243d41af9518728445e9c9bd30dd47237
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Mon Mar 3 15:15:36 2008 -0500
USB: EHCI: carry out port handover during each root-hub resume
This patch (as1044) causes EHCI port handover for non-high-speed
devices to occur during every root-hub resume, not just in cases where
the controller lost power or was reset. This is necessary because:
When some machines go into suspend, they remove power from
on-board USB devices while retaining suspend current for USB
controllers.
The user might well unplug a USB device while the system is
suspended and then plug it back in before resuming.
A corresponding change is made to the core resume routine; now
high-speed root hubs will always be resumed when the system wakes up,
even if they were suspended before the system went to sleep. If this
weren't done then EHCI port handover wouldn't work, since it is called
when the EHCI root hub is resumed.
Finally, a comment is added to the hub driver explaining the khubd has
to be freezable; if it weren't frozen then it could interfere with
port handover.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 8f7f85e9f9561507b009d26395c53e70758695ec
Author: Stefan Seyfried <seife at suse.de>
Date: Thu Apr 17 07:47:34 2008 +0200
USB: Add HP hs2300 Broadband Wireless Module to sierra.c
Add the HP hs2300 Broadband Wireless Module (relabeled MC8775) USB IDs
Signed-off-by: Stefan Seyfried <seife at suse.de>
Cc: stable <stable at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d4062fcb9e6164cbbcef773f6b6602e30c4b6007
Author: Ming Lei <tom.leiming at gmail.com>
Date: Mon Apr 14 21:27:00 2008 +0800
USB: Fix memory leak in mon_stat_release
Fix the leak of the snap structure allocated in mon_stat_open().
Signed-off-by: Ming Lei <tom.leiming at gmail.com>
Acked-by: Pete Zaitcev <zaitcev at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 59fba744daadaaa85e07a5db96ac3618bc45a9ad
Author: Craig Shelley <craig at microtron.org.uk>
Date: Sat Apr 12 16:15:54 2008 +0100
USB: CP2101 Add new device IDs
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 8d390efd903485923419584275fd0c2aa4c94183
Author: Tom Quetchenbach <virtualphtn at gmail.com>
Date: Thu Apr 24 21:11:58 2008 -0700
tcp: tcp_probe buffer overflow and incorrect return value
tcp_probe has a bounds-checking bug that causes many programs (less,
python) to crash reading /proc/net/tcp_probe. When it outputs a log
line to the reader, it only checks if that line alone will fit in the
reader's buffer, rather than that line and all the previous lines it
has already written.
tcpprobe_read also returns the wrong value if copy_to_user fails--it
just passes on the return value of copy_to_user (number of bytes not
copied), which makes a failure look like a success.
This patch fixes the buffer overflow and sets the return value to
-EFAULT if copy_to_user fails.
Patch is against latest net-2.6; tested briefly and seems to fix the
crashes in less and python.
Signed-off-by: Tom Quetchenbach <virtualphtn at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a5d6ab56daa439d681aab29955498486e452224d
Author: Matheos Worku <matheos.worku at sun.com>
Date: Thu Apr 24 21:09:20 2008 -0700
niu: Add support for Neptune FEM/NEM cards for C10 server blades
[ Minor coding style and whitespace corrections, also bump
driver version and release date. -DaveM ]
Signed-off-by: Matheos Worku <matheos.worku at sun.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7f7c4072ea552f97a0898331322f71986a97299c
Author: Matheos Worku <matheos.worku at sun.com>
Date: Thu Apr 24 21:02:37 2008 -0700
niu: Determine the # of ports from the card's VPD data
[ Fix minor whitespace and coding style stuff... -DaveM ]
Signed-off-by: Matheos Worku <matheos.worku at sun.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c5835df9716bdb1af8e25e9a452f717e54e02ed0
Author: Mandeep Singh Baines <msb at google.com>
Date: Thu Apr 24 20:55:56 2008 -0700
ethtool: EEPROM dump no longer works for tg3 and natsemi
In the ethtool user-space application, tg3 and natsemi over-ride the
default implementation of dump_eeprom(). In both tg3_dump_eeprom() and
natsemi_dump_eeprom(), there is a magic number check which is not
present in the default implementation.
Commit b131dd5d ("[ETHTOOL]: Add support for large eeproms") snipped
the code which copied the ethtool_eeprom structure back to
user-space. tg3 and natsemi are over-writing the magic number field
and then checking it in user-space. With the ethtool_eeprom copy
removed, the check is failing.
The fix is simple. Add the ethtool_eeprom copy back.
Signed-off-by: Mandeep Singh Baines <msb at google.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8e5443a09851d99084098ecc4066805aa2610d92
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Apr 24 10:52:44 2008 +0900
sata_sis: SCR accessors return -EINVAL when requested SCR isn't available
sis_scr_cfg_read() can't access SError and was incorrectly returning
-1 instead of -EINVAL. This went unnoticed because SError used to be
cleared in @postreset() and it didn't care about how scr_read() failed
but commit ac371987 moved SError clearing into sata_link_resume() and
SCR access failure other than -EINVAL is considered an error condition
and exposes the incorrect return value bug as detection failure. Fix
it.
Also, scsi_scr_cfg_write() was incorrectly returning 0 after it
ignored the request to write to SError. Make it also return -EINVAL.
This was bisected and reported by Patrick McHardy.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Patrick McHardy <kaber at trash.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 2b4221bb545899b05872e7b51f55567c10b3894b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Apr 24 18:37:34 2008 -0700
libata: functions with definition should not be extern
Noticed by sparse
drivers/ata/libata-core.c:3380:12: warning: function 'ata_wait_after_reset' with external linkage has definition
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 2db3e47e7080fde2a43d6312190d8229826b8e42
Author: Brian Haley <brian.haley at hp.com>
Date: Thu Apr 24 20:38:31 2008 -0700
af_key: Fix af_key.c compiler warning
net/key/af_key.c: In function ‘pfkey_spddelete’:
net/key/af_key.c:2359: warning: ‘pol_ctx’ may be used uninitialized in
this function
When CONFIG_SECURITY_NETWORK_XFRM isn't set,
security_xfrm_policy_alloc() is an inline that doesn't set pol_ctx, so
this seemed like the easiest fix short of using *uninitialized_var(pol_ctx).
Signed-off-by: Brian Haley <brian.haley at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 308f0a5898033691d050374a949bbfe173987a16
Merge: 0035a1dc8f56f2c92f4246b0c8b5f6d1ee10c76b b345dc7da026016b65162b1ca7cfcd2c7212a285
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Thu Apr 24 23:37:52 2008 -0400
Merge branch 'master' into for-linus
commit b345dc7da026016b65162b1ca7cfcd2c7212a285
Author: Ping Cheng <pingc at wacom.com>
Date: Thu Apr 24 23:34:05 2008 -0400
Input: wacom - add support for Cintiq 20WSX
Signed-off-by: Ping Cheng <pingc at wacom.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 0fda6b403f0eca66ad8a7c946b3996e359100443
Author: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Date: Wed Apr 9 21:31:46 2008 -0400
2.6.25 regression: powertop says 120K wakeups/sec
Patch to fix huge number of wakeups reported due to recent changes in
processor_idle.c. The problem was that the entry_method determination was
broken due to one of the recent commits (bc71bec91f987) causing
C1 entry to not to go to halt.
http://lkml.org/lkml/2008/3/22/124
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 204470272c3b055b352d5f127d5d5c7dce5fa597
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Tue Mar 11 17:17:08 2008 -0400
ACPI: GPE enabling should happen after EC installation
GPE could try to access EC region, so should not be enabled before
EC is installed
http://bugzilla.kernel.org/show_bug.cgi?id=9916
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit f360bf0015e5b3e82be61c68e0863b3f98852ee2
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Fri Apr 25 02:39:22 2008 +1000
[POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 060856c799191ffc360105cac49f3f9e68d526b7
Author: Nick Forbes <Nick.Forbes at huntsworth.com>
Date: Fri Apr 25 00:06:52 2008 +0100
leds: Add default-on trigger
Add a trigger which allows LEDs to default to the full
brightness state.
Signed-off-by: Nick Forbes <Nick.Forbes at huntsworth.com>
Signed-off-by: Richard Purdie <rpurdie at rpsys.net>
commit 2e214e0fa21465cf2749ca7d5a072cf8591f3213
Author: Richard Purdie <rpurdie at rpsys.net>
Date: Thu Apr 24 23:49:30 2008 +0100
leds: Document the context brightness_set needs
Make sure there is no confusion about the contexts brightness_set
can be called under by documenting it.
Signed-off-by: Richard Purdie <rpurdie at rpsys.net>
commit 3b2e46f8c4a5f2d7856c490ab5f0c46b65e2cb99
Author: Rod Whitby <rod at whitby.id.au>
Date: Thu Apr 24 23:43:09 2008 +0100
leds: Add new driver for the LEDs on the Freecom FSG-3
The LEDs on the Freecom FSG-3 are connected to an external
memory-mapped latch on the ixp4xx expansion bus, and therefore cannot
be supported by any of the existing LEDs drivers.
Signed-off-by: Rod Whitby <rod at whitby.id.au>
Signed-off-by: Richard Purdie <rpurdie at rpsys.net>
commit 29d76dfa29fe22583aefddccda0bc56aa81035dc
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Tue Mar 18 09:47:48 2008 +0000
leds: Add support to leds with readable status
Some led hardware allows drivers to query the led state, and this patch
adds a hook to let the led class take advantage of that information when
available.
Without this functionality, when access to the led hardware is not
exclusive (i.e. firmware or hardware might change its state behind the
kernel's back), reality goes out of sync with the led class' idea of what
the led is doing, which is annoying at best.
Behaviour for drivers that do not or cannot read the led status is
unchanged.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Richard Purdie <rpurdie at rpsys.net>
commit ca3259b3603539e72faacc6821050ee889a52103
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Sun Mar 9 23:48:25 2008 +0000
leds: enable support for blink_set() platform hook in leds-gpio
Enhance leds-gpio to provide hardware-based led flashing by passing
through the blink_set() call to a optionally set platform-specific
function pointer.
Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>
Signed-off-by: Richard Purdie <rpurdie at rpsys.net>
commit 4d404fd5c51772720e9c72aa3185bd5119bc6e69
Author: Németh Márton <nm127 at freemail.hu>
Date: Sun Mar 9 20:59:57 2008 +0000
leds: Cleanup various whitespace and code style issues
Break the lines which were more than 80 characters into more
lines; replace SPACEs with TABs; correct ident at switch-case;
change character encoding from ISO-8859-2 to UTF-8.
The order of the functions in led-triggers.c changed in order
the similar functions can still be together under titles
"Used by LED Class", "LED Trigger Interface" and "Simple
LED Tigger Interface" as was grouped before when exported
with EXPORT_SYMBOL.
Signed-off-by: Márton Németh <nm127 at freemail.hu>
Signed-off-by: Richard Purdie <rpurdie at rpsys.net>
commit 0013b23d66a2768f5babbb0ea9f03ab067a990d8
Author: Németh Márton <nm127 at freemail.hu>
Date: Sun Mar 9 20:54:37 2008 +0000
leds: disable triggers on brightness set
Disable any active triggers when the brightness attribute is
set to zero.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Márton Németh <nm127 at freemail.hu>
Signed-off-by: Richard Purdie <rpurdie at rpsys.net>
commit b3ba31f84ea041c0945b5904d4c407ce14b2b72c
Author: Mrton Nmeth <nm127 at freemail.hu>
Date: Sun Mar 9 20:47:59 2008 +0000
leds: Add mail LED support for "Clevo D400P"
The leds-clevo-mail module also works with model "Clevo D400P",
add this model to the white list.
Signed-off-by: Mrton Nmeth <nm127 at freemail.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Richard Purdie <rpurdie at rpsys.net>
commit 3f5087a2bae5d1ce10a3d698dec8f879a96f5419
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Fri Apr 25 00:25:08 2008 +0200
sched: fix share (re)distribution
fix __aggregate_redistribute_shares() related lockup reported by
David S. Miller.
The problem this code tries to solve is 'accurately' calculating the 'fair'
share of the group weight for each cpu. The current code falls back to a global
group rebalance in case the sched_domain's span it looks at has no shares, but
does have tasks.
The reason it gets stuck here, is because its inherently racy - if someone
steals the last task after we compute the agg->rq_weight, but before we
rebalance, we'll never get out of the loop.
We could of course go fix that, but while looking at this issue I found that
this 'fallback' wasn't nearly as rare as I'd hoped it to be. In fact its quite
common - and given it walks the whole machine, thats very bad.
The new approach is simple (why didn't I think of it before?), we set the
aggregate shares to the full task group weight, and each larger sched domain
that encounters an aggregate shares larger than the weight, clips it (it
already re-distributes anyway).
This nicely converges to the desired global picture where the sum of all
shares equals the task group weight.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 126e01bf92dfc5f0ba91e88be02c473e1506d7d9
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Apr 25 00:25:08 2008 +0200
softlockup: fix NOHZ wakeup
David Miller reported:
|--------------->
the following commit:
| commit 27ec4407790d075c325e1f4da0a19c56953cce23
| Author: Ingo Molnar <mingo at elte.hu>
| Date: Thu Feb 28 21:00:21 2008 +0100
|
| sched: make cpu_clock() globally synchronous
|
| Alexey Zaytsev reported (and bisected) that the introduction of
| cpu_clock() in printk made the timestamps jump back and forth.
|
| Make cpu_clock() more reliable while still keeping it fast when it's
| called frequently.
|
| Signed-off-by: Ingo Molnar <mingo at elte.hu>
causes watchdog triggers when a cpu exits NOHZ state when it has been
there for >= the soft lockup threshold, for example here are some
messages from a 128 cpu Niagara2 box:
[ 168.106406] BUG: soft lockup - CPU#11 stuck for 128s! [dd:3239]
[ 168.989592] BUG: soft lockup - CPU#21 stuck for 86s! [swapper:0]
[ 168.999587] BUG: soft lockup - CPU#29 stuck for 91s! [make:4511]
[ 168.999615] BUG: soft lockup - CPU#2 stuck for 85s! [swapper:0]
[ 169.020514] BUG: soft lockup - CPU#37 stuck for 91s! [swapper:0]
[ 169.020514] BUG: soft lockup - CPU#45 stuck for 91s! [sh:4515]
[ 169.020515] BUG: soft lockup - CPU#69 stuck for 92s! [swapper:0]
[ 169.020515] BUG: soft lockup - CPU#77 stuck for 92s! [swapper:0]
[ 169.020515] BUG: soft lockup - CPU#61 stuck for 92s! [swapper:0]
[ 169.112554] BUG: soft lockup - CPU#85 stuck for 92s! [swapper:0]
[ 169.112554] BUG: soft lockup - CPU#101 stuck for 92s! [swapper:0]
[ 169.112554] BUG: soft lockup - CPU#109 stuck for 92s! [swapper:0]
[ 169.112554] BUG: soft lockup - CPU#117 stuck for 92s! [swapper:0]
[ 169.171483] BUG: soft lockup - CPU#40 stuck for 80s! [dd:3239]
[ 169.331483] BUG: soft lockup - CPU#13 stuck for 86s! [swapper:0]
[ 169.351500] BUG: soft lockup - CPU#43 stuck for 101s! [dd:3239]
[ 169.531482] BUG: soft lockup - CPU#9 stuck for 129s! [mkdir:4565]
[ 169.595754] BUG: soft lockup - CPU#20 stuck for 93s! [swapper:0]
[ 169.626787] BUG: soft lockup - CPU#52 stuck for 93s! [swapper:0]
[ 169.626787] BUG: soft lockup - CPU#84 stuck for 92s! [swapper:0]
[ 169.636812] BUG: soft lockup - CPU#116 stuck for 94s! [swapper:0]
It's simple enough to trigger this by doing a 10 minute sleep after a
fresh bootup then starting a parallel kernel build.
I suspect this might be reintroducing a problem we've had and fixed
before, see the thread:
http://marc.info/?l=linux-kernel&m=119546414004065&w=2
<---------------|
touch the softlockup watchdog when exiting NOHZ state - we are
obviously not locked up.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 88a411c07b6fedcfc97b8dc51ae18540bd2beda0
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu Apr 3 09:06:13 2008 +0200
seqlock: livelock fix
Thomas Gleixner debugged a particularly ugly seqlock related livelock:
do not process the seq-read section if we know it beforehand that the
test at the end of the section will fail ...
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 1775826ceec51187aa868406585799b7e76ffa7d
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Wed Apr 2 10:54:13 2008 -0700
xen: add balloon driver
The balloon driver allows memory to be dynamically added or removed from the domain,
in order to allow host memory to be balanced between multiple domains.
This patch introduces the Xen balloon driver, though it currently only
allows a domain to be shrunk from its initial size (and re-grown back to
that size). A later patch will add the ability to grow a domain beyond
its initial size.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit af7ae3b9c4a4c1337903f31131d58e3c0d2b6d55
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Wed Apr 2 10:54:12 2008 -0700
xen: allow compilation with non-flat memory
There's no real reason we can't support sparsemem/discontigmem, so do so.
This is mostly useful to support hotplug memory.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b77797fb2bf31bf076e6b69736119bc6a077525b
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Wed Apr 2 10:54:11 2008 -0700
xen: fold xen_sysexit into xen_iret
xen_sysexit and xen_iret were doing essentially the same thing. Rather
than having a separate implementation for xen_sysexit, we can just strip
the stack back to an iret frame and jump into xen_iret. This removes
a lot of code and complexity - specifically, another critical region.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2bd50036b5dfc929390ddc48be7f6314447b2be3
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Wed Apr 2 10:54:10 2008 -0700
xen: allow set_pte_at on init_mm to be lockless
The usual pagetable locking protocol doesn't seem to apply to updates
to init_mm, so don't rely on preemption being disabled in xen_set_pte_at
on init_mm.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 41e332b2a2dfe514cd441ed0ce1096ed1863e378
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Wed Apr 2 10:54:09 2008 -0700
xen: disable preemption during tlb flush
Various places in the kernel flush the tlb even though preemption doens't
guarantee the tlb flush is happening on any particular CPU. In many cases
this doesn't seem to matter, so don't make a fuss about it.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4ee36dc08e5c4d16d078f59acd6d9d536f9718dd
Author: Markus Armbruster <armbru at redhat.com>
Date: Wed Apr 2 10:54:07 2008 -0700
xen pvfb: Para-virtual framebuffer, keyboard and pointer driver
This is a pair of Xen para-virtual frontend device drivers:
drivers/video/xen-fbfront.c provides a framebuffer, and
drivers/input/xen-kbdfront provides keyboard and mouse.
The backends run in dom0 user space.
The two drivers are not in two separate patches, because the
intermediate step (one driver, not the other) is somewhat problematic:
the backend in dom0 needs both drivers, and will refuse to complete
device initialization unless they're both present.
Signed-off-by: Markus Armbruster <armbru at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4f93f09b72d6ff47b2399b79ed6d1cbc7dbf991b
Author: Mark McLoughlin <markmc at redhat.com>
Date: Wed Apr 2 10:54:06 2008 -0700
xen: Add compatibility aliases for frontend drivers
Before getting merged, xen-blkfront was xenblk and
xen-netfront was xennet.
Temporarily adding compatibility module aliases
eases upgrades from older versions by e.g. allowing
mkinitrd to find the new version of the module.
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit d2f0c52bec954460e72dee48f3a29c6f310d76be
Author: Mark McLoughlin <markmc at redhat.com>
Date: Wed Apr 2 10:54:05 2008 -0700
xen: Module autoprobing support for frontend drivers
Add module aliases to support autoprobing modules
for xen frontend devices.
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 1d78d7055629e3f6300d6b8d7028259ee2bffc0e
Author: Christian Limpach <Christian.Limpach at xensource.com>
Date: Wed Apr 2 10:54:04 2008 -0700
xen blkfront: Delay wait for block devices until after the disk is added
When the xen block frontend driver is built as a module the module load
is only synchronous up to the point where the frontend and the backend
become connected rather than when the disk is added.
This means that there can be a race on boot between loading the module and
loading the dm-* modules and doing the scan for LVM physical volumes (all
in the initrd). In the failure case the disk is not present until after the
scan for physical volumes is complete.
Taken from:
http://xenbits.xensource.com/linux-2.6.18-xen.hg?rev/11483a00c017
Signed-off-by: Christian Limpach <Christian.Limpach at xensource.com>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 53f0e8afcb0d57cfaff06b89eb8b5302f167577e
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Wed Apr 2 10:54:03 2008 -0700
xen/blkfront: use bdget_disk
info->dev is never initialized to anything, so bdget(info->dev) is
meaningless. Get rid of info->dev, and use bdget_disk on the gendisk.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Cc: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 22c36d18c668db1a8d92a9a47e09857974f6a49b
Author: Jonathan Corbet <corbet at lwn.net>
Date: Wed Apr 23 10:34:52 2008 -0600
Document SEQ_SKIP
2.6.26 adds a SEQ_SKIP return value for the seq_file show() function;
update the documentation to match.
Signed-off-by: Jonathan Corbet <corbet at lwn.net>
commit 3e334239d89d4a71610be5a3e8432464d421d9ec
Author: Markus Armbruster <armbru at redhat.com>
Date: Wed Apr 2 10:54:02 2008 -0700
xen: Make xen-blkfront write its protocol ABI to xenstore
Frontends are expected to write their protocol ABI to xenstore. Since
the protocol ABI defaults to the backend's native ABI, things work
fine without that as long as the frontend's native ABI is identical to
the backend's native ABI. This is not the case for xen-blkfront
running 32-on-64, because its ABI differs between 32 and 64 bit, and
thus needs this fix.
Based on http://xenbits.xensource.com/xen-unstable.hg?rev/c545932a18f3
and http://xenbits.xensource.com/xen-unstable.hg?rev/ffe52263b430 by
Gerd Hoffmann <kraxel at suse.de>
Signed-off-by: Markus Armbruster <armbru at redhat.com>
Signed-off-by: Jeremy Fitzhardinge <Jeremy.Fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b15993fcc1bf15f717fb4414b32e4a11534dfdc4
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:54:01 2008 -0700
xen: import arch generic part of xencomm
On xen/ia64 and xen/powerpc hypercall arguments are passed by pseudo
physical address (guest physical address) so that it's necessary to
convert from virtual address into pseudo physical address. The frame
work is called xencomm.
Import arch generic part of xencomm.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8d3d2106c19f4e69f208f59fe484ca113fbb48b3
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:54:00 2008 -0700
xen: make grant table arch portable
split out x86 specific part from grant-table.c and
allow ia64/xen specific initialization.
ia64/xen grant table is based on pseudo physical address
(guest physical address) unlike x86/xen. On ia64 init_mm
doesn't map identity straight mapped area.
ia64/xen specific grant table initialization is necessary.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5f0ababbf49f12330effab932a18055a50f4c0a1
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:59 2008 -0700
xen: replace callers of alloc_vm_area()/free_vm_area() with xen_ prefixed one
Don't use alloc_vm_area()/free_vm_area() directly, instead define
xen_alloc_vm_area()/xen_free_vm_area() and use them.
alloc_vm_area()/free_vm_area() are used to allocate/free area which
are for grant table mapping. Xen/x86 grant table is based on virtual
address so that alloc_vm_area()/free_vm_area() are suitable.
On the other hand Xen/ia64 (and Xen/powerpc) grant table is based on
pseudo physical address (guest physical address) so that allocation
should be done differently.
The original version of xenified Linux/IA64 have its own
allocate_vm_area()/free_vm_area() definitions which don't allocate vm area
contradictory to those names.
Now vanilla Linux already has its definitions so that it's impossible
to have IA64 definitions of allocate_vm_area()/free_vm_area().
Instead introduce xen_allocate_vm_area()/xen_free_vm_area() and use them.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 20e71f2edb5991de8f2a70902b4aa5982f67c69c
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:58 2008 -0700
xen: make include/xen/page.h portable moving those definitions under asm dir
The definitions in include/asm/xen/page.h are arch specific.
ia64/xen wants to define its own version. So move them to arch specific
directory and keep include/xen/page.h in order not to break compilation.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 642e0c882cd5369429c833d97e4804c8be473e8a
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:57 2008 -0700
xen: add resend_irq_on_evtchn() definition into events.c
Define resend_irq_on_evtchn() which ia64/xen uses.
Although it isn't used by current x86/xen code, it's arch generic
so that put it into common code.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit e849c3e9e0b786619c451d89ef0c47ac9a28fbc1
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:56 2008 -0700
Xen: make events.c portable for ia64/xen support
Remove x86 dependency in drivers/xen/events.c for ia64/xen support
introducing include/asm/xen/events.h.
Introduce xen_irqs_disabled() to hide regs->flags
Introduce xen_do_IRQ() to hide regs->orig_ax.
make enum ipi_vector definition arch specific. ia64/xen needs four vectors.
Add one rmb() because on ia64 xchg() isn't barrier.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit e04d0d0767a9c272d3c7300fb7a5221c5e3a71eb
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:55 2008 -0700
xen: move events.c to drivers/xen for IA64/Xen support
move arch/x86/xen/events.c undedr drivers/xen to share codes
with x86 and ia64. And minor adjustment to compile.
ia64/xen also uses events.c
Signed-off-by: Yaozu (Eddie) Dong <eddie.dong at intel.com>
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit af711cda4f94b5fddcdc5eb4134387ae026e3171
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:54 2008 -0700
xen: move features.c from arch/x86/xen/features.c to drivers/xen
ia64/xen also uses it too. Move it into common place so that
ia64/xen can share the code.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2724426924a471dc9fd8989dae56ab4d79519e34
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:53 2008 -0700
xen: add missing definitions in include/xen/interface/vcpu.h which ia64/xen needs
Add xen handles realted definitions for xen vcpu which ia64/xen needs.
Pointer argumsnts for ia64/xen hypercall are passed in pseudo physical
address (guest physical address) so that it is required to convert
guest kernel virtual address into pseudo physical address.
The xen guest handle represents such arguments.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 87e27cf6288c6bf089ed34a72213d9ad16e82d84
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:52 2008 -0700
xen: add missing definitions for xen grant table which ia64/xen needs
Add xen handles realted definitions for grant table which ia64/xen
needs.
Pointer argumsnts for ia64/xen hypercall are passed in pseudo physical
address (guest physical address) so that it is required to convert
guest kernel virtual address into pseudo physical address right before
issuing hypercall.
The xen guest handle represents such arguments.
Define necessary handles and helper functions.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2eb6d5eb48fd6aedf5787b30e5c41693e8c91fa3
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:51 2008 -0700
xen: definitions which ia64/xen needs
Add xen VIRQ numbers defined for arch specific use.
ia64/xen domU uses VIRQ_ARCH_0 for virtual itc timer.
Although all those constants aren't used yet by ia64
at this moment, add all arch specific VIRQ numbers.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 9a9db275b02e91fba837750ccfc82411ada834b8
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Wed Apr 2 10:53:50 2008 -0700
xen: definisions which ia64 needs
Add xen hypercall numbers defined for arch specific use.
ia64/xen domU uses __HYPERVISOR_arch_1 to manipulate paravirtualized
IOSAPIC. Although all those constants aren't used yet by IA64 at this
moment, add all arch specific hypercall numbers.
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 0f2c87695219b1129ccf93e0f58acdcdd49724b9
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:22 2008 -0700
xen: jump to iret fixup
Use jmp rather than call for the iret fixup, so its consistent with
the sysexit fixup, and it simplifies the stack (which is already
complex).
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit dbe9e994c99ac9ac12d2b66ea42f44558f54fa52
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:21 2008 -0700
xen: no need for domU to worry about MCE/MCA
Mask MCE/MCA out of cpu caps. Its harmless to leave them there, but
it does prevent the kernel from starting an unnecessary thread.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 229664bee6126e01f8662976a5fe2e79813b77c8
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:20 2008 -0700
xen: short-cut for recursive event handling
If an event comes in while events are currently being processed, then
just increment the counter and have the outer event loop reprocess the
pending events. This prevents unbounded recursion on heavy event
loads (of course massive event storms will cause infinite loops).
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit ee8fa1c67f0b873a324960f0ca9fa1d7e49aa86b
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:19 2008 -0700
xen: make sure retriggered events are set pending
retrigger_dynirq() was incomplete, and didn't properly set the event
to be pending again. It doesn't seem to actually get used.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit ee523ca1e456d754d66be6deab910131e4e1dbf8
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:18 2008 -0700
xen: implement a debug-interrupt handler
Xen supports the notion of a debug interrupt which can be triggered
from the console. For now this is implemented to show pending events,
masks and each CPU's pending event set.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit e2a81baf6604a2e08e10c7405b0349106f77c8af
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:17 2008 -0700
xen: support sysenter/sysexit if hypervisor does
64-bit Xen supports sysenter for 32-bit guests, so support its
use. (sysenter is faster than int $0x80 in 32-on-64.)
sysexit is still not supported, so we fake it up using iret.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit aa380c82b83252754a8c11bfc92359bd87cbf710
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:15 2008 -0700
xen: add support for callbackops hypercall
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 85958b465c2e0de315575b1d3d7e7c2ce7126880
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:14 2008 -0700
x86: unify pgd ctor/dtor
All pagetables need fundamentally the same setup and destruction, so
just use the same code for everything.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 68db065c845bd9d0eb96946ab104b4c82d0ae9da
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:13 2008 -0700
x86: unify KERNEL_PGD_PTRS
Make KERNEL_PGD_PTRS common, as previously it was only being defined
for 32-bit.
There are a couple of follow-on changes from this:
- KERNEL_PGD_PTRS was being defined in terms of USER_PGD_PTRS. The
definition of USER_PGD_PTRS doesn't really make much sense on x86-64,
since it can have two different user address-space configurations.
I renamed USER_PGD_PTRS to KERNEL_PGD_BOUNDARY, which is meaningful
for all of 32/32, 32/64 and 64/64 process configurations.
- USER_PTRS_PER_PGD was also defined and was being used for similar
purposes. Converting its users to KERNEL_PGD_BOUNDARY left it
completely unused, and so I removed it.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Cc: Andi Kleen <ak at suse.de>
Cc: Zach Amsden <zach at vmware.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 90e9f53662826db3cdd6d99bd394d727b05160c1
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:12 2008 -0700
xen: make sure iret faults are trapped
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 9666e9d44b83755c53615fb89c0787b6846786a1
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:11 2008 -0700
xen: unify pte operations on machine frames
Xen's pte operations on mfns can be unified like the kernel's pfn operations.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 3b4724b0e60cdfdc2679ee7135f3a234c74c2b83
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:10 2008 -0700
xen: use phys_addr_t when referring to physical addresses
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 947a69c90c0d07ac7f214e46dabbe49f2a230e00
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:09 2008 -0700
xen: unify pte operations
We can fold the essentially common pte functions together now.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 430442e38e7f049841c5838f8c7027bd9e170045
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:08 2008 -0700
xen: make use of pte_t union
pte_t always contains a "pte" field for the whole pte value, so make
use of it.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit abf33038ffa65097939d86d2a90f93adc6115aa0
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:07 2008 -0700
xen: use appropriate pte types
Convert Xen pagetable handling to use appropriate *val_t types.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 286cd49456ef980c4b9904064ef34c36017b8351
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:06 2008 -0700
x86: demacro pgalloc paravirt stubs
Turn paravirt stubs into inline functions, so that the arguments are
still typechecked.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit c20311e165eb94f5ef12b15e452cc6ec24bd7813
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:05 2008 -0700
x86/pgtable.h: demacro ptep_clear_flush_young
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit f9fbf1a36a6bb6a639459802bccee01185ee3220
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:04 2008 -0700
x86/pgtable.h: demacro ptep_test_and_clear_young
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit ee5aa8d3ba65d76157f22b7afedd089d8acfe524
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:03 2008 -0700
x86/pgtable.h: demacro ptep_set_access_flags
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2761fa0920756dc471d297843646a4a9bca6656f
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:02 2008 -0700
x86: add pud_alloc for 4-level pagetables
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 6944a9c8945212a0cc1de3589736d59ec542c539
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:01 2008 -0700
x86: rename paravirt_alloc_pt etc after the pagetable structure
Rename (alloc|release)_(pt|pd) to pte/pmd to explicitly match the name
of the appropriate pagetable level structure.
[ x86.git merge work by Mark McLoughlin <markmc at redhat.com> ]
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 394158559d4c912cc58c311b6346cdea0ed2b1de
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:37:00 2008 -0700
x86: move all the pgd_list handling to one place
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5a5f8f42241cf09caec5530a7639cfa8dccc3a7b
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:36:59 2008 -0700
x86: move pgalloc pud and pgd operations into common place
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 170fdff7057d4247e3f28cca96d0db1fbc854e3b
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:36:58 2008 -0700
x86: move pmd functions into common asm/pgalloc.h
Common definitions for 3-level pagetable functions.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 397f687ab7f840dbe50353c4b60108672b653d0c
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:36:57 2008 -0700
x86: move pte functions into common asm/pgalloc.h
Common definitions for 2-level pagetable functions.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 1d262d3a4932b5ae7222c8d9900696650ee95188
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:36:56 2008 -0700
x86: put paravirt stubs into common asm/pgalloc.h
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 1ec1fe73dfb711f9ea5a0ef8a7e3af5b6ac8b653
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Mar 19 20:30:40 2008 +0100
x86: xen unify x86 add common mm pgtable c fix
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4f76cd382213b29dd3658e3e1ea47c0c2be06f3c
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:36:55 2008 -0700
x86: add common mm/pgtable.c
Add a common arch/x86/mm/pgtable.c file for common pagetable functions.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 79bf6d66abb5a20813a19dd365dfc49104f0bb88
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Mar 17 16:36:54 2008 -0700
x86: convert pgalloc_64.h from macros to inlines
Convert asm-x86/pgalloc_64.h from macros into functions (#include hell
prevents __*_free_tlb from being inline, but they're probably a bit
big to inline anyway).
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b69d3987f4360a5e7e9e55465b3cdd0cc204b79e
Merge: 57675e6e75c18f279b944dc2397cc9fd0053845e a4928cffe6435caf427ae673131a633c1329dbf3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 14:41:20 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
"make namespacecheck" fixes
x86: fix compilation error in VisWS
x86: voyager fix
x86: Drop duplicate from setup.c
intel-iommu.c: dma ops fix
commit 1526a756fba5b1f2eb5001b8e8de2a0ea1bd2c66
Author: venkatesh.pallipadi at intel.com <venkatesh.pallipadi at intel.com>
Date: Tue Mar 18 17:00:24 2008 -0700
generic: add ioremap_wc() interface wrapper
x86 has ioremap_wc for wc remap. Also introduce a generic ioremap_wc
aliased to ioremap_uc so that drivers can use this interface transparently.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 1f56cf1c58c81f7ecf16f5e99ac4a333d9dc9aea
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Apr 18 21:42:36 2008 +0200
/dev/mem: make promisc the default
default to the old semantics.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 28eb559b5b0b9b51b9165a9b8faa75b0bb91ca8d
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu Apr 3 10:14:33 2008 +0200
pat: cleanups
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e7f260a276f2c9184fe753732d834b1f6fbe9f17
Author: venkatesh.pallipadi at intel.com <venkatesh.pallipadi at intel.com>
Date: Tue Mar 18 17:00:21 2008 -0700
x86: PAT use reserve free memtype in mmap of /dev/mem
Use reserve_memtype and free_memtype wrappers for /dev/mem mmaps. The memtype
is slightly complicated here, given that we have to support existing X mappings.
We fallback on UC_MINUS for that.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f0970c13b6a5b01189aeb196ebb573cf87d95839
Author: venkatesh.pallipadi at intel.com <venkatesh.pallipadi at intel.com>
Date: Tue Mar 18 17:00:20 2008 -0700
x86: PAT phys_mem_access_prot_allowed for dev/mem mmap
Introduce phys_mem_access_prot_allowed(), which checks whether the mapping
is possible, without any conflicts and returns success or failure based on that.
phys_mem_access_prot() by itself does not allow failure case. This ability
to return error is needed for PAT where we may have aliasing conflicts.
x86 setup __HAVE_PHYS_MEM_ACCESS_PROT and move x86 specific code out of
/dev/mem into arch specific area.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e045fb2a988a9a1964059b0d33dbaf18d12f925f
Author: venkatesh.pallipadi at intel.com <venkatesh.pallipadi at intel.com>
Date: Tue Mar 18 17:00:15 2008 -0700
x86: PAT avoid aliasing in /dev/mem read/write
Add xlate and unxlate around /dev/mem read/write. This sets up the mapping
that can be used for /dev/mem read and write without aliasing worries.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e2beb3eae627211b67e456c53f946cede2ac10d7
Author: Venki Pallipadi <venkatesh.pallipadi at intel.com>
Date: Thu Mar 6 23:01:47 2008 -0800
devmem: add range_is_allowed() check to mmap of /dev/mem
Earlier patch that introduced CONFIG_NONPROMISC_DEVMEM, did the
range_is_allowed() check only for read and write. Add range_is_allowed()
check to mmap of /dev/mem as well.
Changes the paramaters of range_is_allowed() to pfn and size to handle
more than 32 bits of physical address on 32 bit arch cleanly.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ae531c26c5c2a28ca1b35a75b39b3b256850f2c8
Author: Arjan van de Ven <arjan at linux.intel.com>
Date: Thu Apr 24 23:40:47 2008 +0200
x86: introduce /dev/mem restrictions with a config option
This patch introduces a restriction on /dev/mem: Only non-memory can be
read or written unless the newly introduced config option is set.
The X server needs access to /dev/mem for the PCI space, but it doesn't need
access to memory; both the file permissions and SELinux permissions of /dev/mem
just make X effectively super-super powerful. With the exception of the
BIOS area, there's just no valid app that uses /dev/mem on actual memory.
Other popular users of /dev/mem are rootkits and the like.
(note: mmap access of memory via /dev/mem was already not allowed since
a really long time)
People who want to use /dev/mem for kernel debugging can enable the config
option.
The restrictions of this patch have been in the Fedora and RHEL kernels for
at least 4 years without any problems.
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 03970f065d9b4b156d0e879f82989440f7045396
Author: Mike Travis <travis at sgi.com>
Date: Tue Apr 22 10:04:26 2008 -0700
[PATCH] Build fix for CONFIG_NUMA=y && CONFIG_SMP=n
Regression caused by 434d53b00d6bb7be0a1d3dcc0d0d5df6c042e164
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 472613b961affef0c73f1c797993678312e7c666
Author: Russ Anderson <rja at sgi.com>
Date: Thu Apr 24 13:16:59 2008 -0500
[IA64] fix bootmem regression on Altix
A recent change prevents SGI Altix from booting.
This patch fixes the problem.
The regresson was introduced in commit 434d53b00d6bb7be0a1d3dcc0d0d5df6c042e164
Signed-off-by: Russ Anderson <rja at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit a4928cffe6435caf427ae673131a633c1329dbf3
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 23 13:20:56 2008 +0200
"make namespacecheck" fixes
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f8dc5a186c19a029f8eac0b1d2c426690e58efdb
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Mon Apr 21 13:32:01 2008 +0400
x86: fix compilation error in VisWS
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit fcbc04c0ab345f6e9cabc92a15f35031a10fde9f
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Apr 21 13:39:53 2008 +0200
x86: voyager fix
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4d33bdb7688de7a61859dafc783eb9b6bca279fc
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Mon Apr 21 13:31:55 2008 +0400
x86: Drop duplicate from setup.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 6865f0d19306daf3a3bf28cfcfe74639d1bc0df4
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue Apr 22 11:09:04 2008 +0200
intel-iommu.c: dma ops fix
Stephen Rothwell noticed that:
Commit 2be621498d461b63ca6124f86e3b9582e1a8e722 ("x86: dma-ops on highmem
fix") in Linus' tree introduced a new warning (noticed in the x86_64
allmodconfig build of linux-next):
drivers/pci/intel-iommu.c:2240: warning: initialization from incompatible pointer type
Which points at an instance of map_single that needs updating.
Fix it to the new prototype.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e12177073f28419f1f7eb8dbb93aab6b712c7c04
Author: Mark Brown <broonie at sirena.org.uk>
Date: Wed Apr 23 10:28:18 2008 +0100
[ARM] 5017/1: pxa3xx: Report unsupported wakeup sources in pxa3xx_set_wake()
pxa3xx_set_wake() silently accepts unsupported wake sources, causing
users to believe that they have succesfully configured sources that they
haven't. Fail the operation instead.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Acked-by: eric miao <eric.y.miao at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit e03e0590b2b29b62f0480524090e469baa13d5f5
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Thu Apr 24 18:10:46 2008 +0100
[ARM] 5020/1: magician: remove __devinit marker from pasic3_leds_info
Platform data must not be marked with __devinit. Even __devinitdata
would be wrong as the platform driver can be compiled as a module.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 57675e6e75c18f279b944dc2397cc9fd0053845e
Merge: 02f370506822cbff60bbf5b685053fa2e8640811 a7f796a60bb5dcdc154c3ae04d484a395a60809f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 13:47:31 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Fix typo in previous commit
[CIFS] Fix define for new proxy cap to match documentation
[CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash
[CIFS] Reserve new proxy cap for WAFS
[CIFS] Add various missing flags and defintions
[CIFS] make cifs_dfs_automount_list_static
[CIFS] Fix oops when slow oplock process races with unmount
[CIFS] Fix acl length when very short ACL being modified by chmod
[CIFS] Fix looping on reconnect to Samba when unexpected tree connect fail on reconnect
[CIFS] minor update to change log
commit 02f370506822cbff60bbf5b685053fa2e8640811
Author: David Howells <dhowells at redhat.com>
Date: Thu Apr 24 20:38:56 2008 +0100
RxRPC: Fix a regression in the RXKAD security module
Fix a regression in the RXKAD security module introduced in:
commit 91e916cffec7c0153c5cbaa447151862a7a9a047
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Mar 29 03:08:38 2008 +0000
net/rxrpc trivial annotations
A variable was declared as a 16-bit type rather than a 32-bit type.
Signed-off-by: David Howells <dhowells at redhat.com>
Acked-with-apologies-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-of-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f764e51421d66fa0b58cba6a75355fa6e60f3a37
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Thu Apr 24 21:32:28 2008 +0200
Remove -numa from EXTRAVERSION
This snuck in through 919ee677b656c52c5f86d3d916786891220d5452
("[SPARC64]: Add NUMA support")
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Cc: David S. Miller <davem at davemloft.net>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 563307b2fa15d687abc54bd980b9847ebf0e3231
Merge: 10c993a6b5418cb1026775765ba4c70ffb70853d 233607dbbc823caf685e778cabc49fb7f679900b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 11:46:16 2008 -0700
Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (80 commits)
SUNRPC: Invalidate the RPCSEC_GSS session if the server dropped the request
make nfs_automount_list static
NFS: remove duplicate flags assignment from nfs_validate_mount_data
NFS - fix potential NULL pointer dereference v2
SUNRPC: Don't change the RPCSEC_GSS context on a credential that is in use
SUNRPC: Fix a race in gss_refresh_upcall()
SUNRPC: Don't disconnect more than once if retransmitting NFSv4 requests
SUNRPC: Remove the unused export of xprt_force_disconnect
SUNRPC: remove XS_SENDMSG_RETRY
SUNRPC: Protect creds against early garbage collection
NFSv4: Attempt to use machine credentials in SETCLIENTID calls
NFSv4: Reintroduce machine creds
NFSv4: Don't use cred->cr_ops->cr_name in nfs4_proc_setclientid()
nfs: fix printout of multiword bitfields
nfs: return negative error value from nfs{,4}_stat_to_errno
NLM/lockd: Ensure client locking calls use correct credentials
NFS: Remove the buggy lock-if-signalled case from do_setlk()
NLM/lockd: Fix a race when cancelling a blocking lock
NLM/lockd: Ensure that nlmclnt_cancel() returns results of the CANCEL call
NLM: Remove the signal masking in nlmclnt_proc/nlmclnt_cancel
...
commit 10c993a6b5418cb1026775765ba4c70ffb70853d
Merge: c328d54cd4ad120d76284e46dcca6c6cf996154a ca456252db0521e5e88024fa2b67535e9739e030
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 11:45:00 2008 -0700
Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
* 'for-linus' of git://linux-nfs.org/~bfields/linux: (52 commits)
knfsd: clear both setuid and setgid whenever a chown is done
knfsd: get rid of imode variable in nfsd_setattr
SUNRPC: Use unsigned loop and array index in svc_init_buffer()
SUNRPC: Use unsigned index when looping over arrays
SUNRPC: Update RPC server's TCP record marker decoder
SUNRPC: RPC server still uses 2.4 method for disabling TCP Nagle
NLM: don't let lockd exit on unexpected svc_recv errors (try #2)
NFS: don't let nfs_callback_svc exit on unexpected svc_recv errors (try #2)
Use a zero sized array for raw field in struct fid
nfsd: use static memory for callback program and stats
SUNRPC: remove svc_create_thread()
nfsd: fix comment
lockd: Fix stale nlmsvc_unlink_block comment
NFSD: Strip __KERNEL__ testing from unexported header files.
sunrpc: make token header values less confusing
gss_krb5: consistently use unsigned for seqnum
NFSD: Remove NFSv4 dependency on NFSv3
SUNRPC: Remove PROC_FS dependency
NFSD: Use "depends on" for PROC_FS dependency
nfsd: move most of fh_verify to separate function
...
commit b9e4f176665d732928b92106f2041dde66e6c896
Author: Grant Likely <grant.likely at secretlab.ca>
Date: Fri Apr 25 03:33:44 2008 +1000
[POWERPC] bootwrapper: fix build error on virtex405-head.S
virtex405-head.S is an assembler file, not a C file; therefore BOOTAFLAGS
is the correct place to set the needed -mcpu=405 flag.
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit acb0142bf01c0ebe18f09e37814451ee6a873e27
Author: Stefan Roese <sr at denx.de>
Date: Sat Apr 19 19:57:33 2008 +1000
[POWERPC] 4xx: Fix 460GT support to not enable FPU
The AMCC 460GT doesn't have an FPU so let's not enable support for it.
Signed-off-by: Stefan Roese <sr at denx.de>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit 5020231bf73a30a7d9244f1675002fffcdc10ceb
Author: Stefan Roese <sr at denx.de>
Date: Sat Apr 19 19:57:18 2008 +1000
[POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
This patch adds default NOR entries to the AMCC Canyonlands (460EX)
and Glacier (460GT) dts files.
Signed-off-by: Stefan Roese <sr at denx.de>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit b912b5e2cfb35c02c9c79d3f6e31753f3be4dd83
Author: John Linn <john.linn at xilinx.com>
Date: Thu Apr 3 10:22:19 2008 +1100
[POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
The Xilinx 16550 uart core is not a standard 16550 because it uses
word-based addressing rather than byte-based addressing. With
additional properties it is compatible with the open firmware
'ns16550' compatible binding.
This code updates the of_serial driver to handle the reg-offset
and reg-shift properties to enable this core to be used.
Signed-off-by: John Linn <john.linn at xilinx.com>
Acked-by: Arnd Bergmann <arnd at arndb.de>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit 2f0b45f846735b486c0383740d3959941c4721a4
Author: John Linn <john.linn at xilinx.com>
Date: Thu Apr 3 03:52:14 2008 +1100
[POWERPC] Xilinx: boot support for Xilinx uart 16550.
The Xilinx 16550 uart core is not a standard 16550 because it uses
word-based addressing rather than byte-based adressing. With
additional properties it is compatible with the open firmware
'ns16550' compatible binding.
This code updates the ns16550 driver to use the reg-offset property
so that the Xilinx UART 16550 can be used with it. The reg-shift
was already being handled.
Signed-off-by: John Linn <john.linn at xilinx.com>
Acked-by: Grant Likely <grant.likely at secretlab.ca>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit c328d54cd4ad120d76284e46dcca6c6cf996154a
Merge: 346ad4b7fe392571f19314f153db9151dbc1d82b b0166ab3a6ae6d7af8d9a21a7836154963c69a11
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 11:21:08 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (452 commits)
V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
V4L/DVB (7719): pvrusb2: Implement input selection enforcement
V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
V4L/DVB (7716): pvrusb2: clean up global functions
V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
V4L/DVB (7714): pvrusb2: Fix hang on module removal
V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
V4L/DVB (7712): pvrusb2: Close connect/disconnect race
V4L/DVB (7711): pvrusb2: Fix race on module unload
V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
...
commit 233607dbbc823caf685e778cabc49fb7f679900b
Merge: 3dc5063786b273f1aee545844f6bd4e9651ebffe b48633bd086d21f4a2a5bea96c7e6c7ba58eb60c
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Thu Apr 24 14:01:02 2008 -0400
Merge branch 'devel'
commit b48633bd086d21f4a2a5bea96c7e6c7ba58eb60c
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Tue Apr 22 16:47:55 2008 -0400
SUNRPC: Invalidate the RPCSEC_GSS session if the server dropped the request
RFC 2203 requires the server to drop the request if it believes the
RPCSEC_GSS context is out of sequence. The problem is that we have no way
on the client to know why the server dropped the request. In order to avoid
spinning forever trying to resend the request, the safe approach is
therefore to always invalidate the RPCSEC_GSS context on every major
timeout.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 942bb7b5d67dcfb19d7340038feb7caa666830e7
Merge: 48bdce4a2e0b1d3be6ed6da14d25adfe9385d2dc 34d278534db050b93d79175d59a32a70ac25f9b5
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Thu Apr 24 13:25:42 2008 -0400
Merge branch 'wm97xx'
commit 48bdce4a2e0b1d3be6ed6da14d25adfe9385d2dc
Author: Vernon Sauder <vernoninhand at gmail.com>
Date: Mon Apr 21 12:13:21 2008 -0400
Input: ucb1400_ts - IRQ probe fix
The UCB1400 driver IRQ probe code fails to find an interrupt if all
the interrupts in the range 0-31 are nonprobe-able. This patch
removes the check of the return value so interrupts above 31 can be
detected.
Tested on InHand Fingertip4 PXA270 board.
Signed-off-by: Vernon Sauder <vsauder at inhand.com>
Acked-by: Nicolas Pitre <nico at marvell.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit a22b4b2f408f7958ffb3a9e62defc5168db1e15e
Author: Hans-Christian Egtvedt <hans-christian.egtvedt at atmel.com>
Date: Mon Apr 21 10:00:46 2008 -0400
Input: at32psif - update MODULE_AUTHOR with new email
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt at atmel.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 8fd76c4506817a93718fab0d6b3a55b9becc9f2c
Author: Peter Zijlstra <peterz at infradead.org>
Date: Fri Apr 18 00:25:38 2008 -0400
Input: mac_hid - add lockdep annotation to emumousebtn
The mouse button emulation calls input device methods from an input
device. This causes funny lock nesting which is harmless as each
device has its own locks.
Give the nesting device its own lock classes so that lockdep will not
consider them the same.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 8c6deb9c8fd29feaeae3aae500608beac777ea9e
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Fri Apr 18 00:25:18 2008 -0400
Input: i8042 - fix incorrect usage of strncpy and strncat
Fix incorrect length argument for strncpy and strncat by replacing them with
strlcpy and strlcat
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit d0478d0ad7a58f36afa03e57afe14955c2943466
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Fri Apr 18 00:25:00 2008 -0400
Input: bf54x-keys - add infrastructure for keypad wakeups
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit d7b5247bbcfba2bc96d4b3dec9086a4f1a31363b
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri Apr 18 00:24:42 2008 -0400
Input: add MODULE_ALIAS() to hotpluggable platform modules
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias
is prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable
"input" platform drivers, to re-enable auto loading.
[dbrownell at users.sourceforge.net: more drivers, registration fixes]
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit b39b04403bba4f807ee6e57ae2f4407187588fcd
Author: Julia Lawall <julia at diku.dk>
Date: Thu Apr 17 09:28:25 2008 -0400
Input: drivers/char/keyboard.c - use time_after
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 81e329cdddd63d66e2b3c3dc51d429ba074cdbb8
Author: Jiri Kosina <jkosina at suse.cz>
Date: Mon Mar 10 13:43:05 2008 +0100
Input: fix ordering in joystick Makefile
Make entries in drivers/input/joystick/Makefile properly alphabetically
ordered.
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit b0166ab3a6ae6d7af8d9a21a7836154963c69a11
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 24 11:19:55 2008 -0300
V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c21f1e2e39a1012f57c33d21af5c909cf2ae3b9a
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 24 10:56:41 2008 -0300
V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
There are different tables for MTS firmwares. This should be taken into
account while selecting the proper firmware.
While at tuner-xc2028.h, improve some comments.
Thanks to Edward J. Sheldrake <ejs1920 at yahoo.co.uk> for helping to
diagnose such troubles with PAL/I standard.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d2b213f7b76f187c4391079c7581d3a08b940133
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Sun Apr 20 11:27:36 2008 -0300
V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
Frank Bennett reported that ivtv was causing skype to crash. With help
from one of their developers he showed it was a kernel problem.
VIDIOCGCAP copies a name into a fixed length buffer - ivtv uses names
that are too long and does not truncate them so corrupts a few bytes of
the app data area.
Possibly the names also want trimming but for now this should fix the
corruption case.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 867e835f4db4eba6d49072382cc05fc210c4ed1c
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Wed Apr 23 17:27:27 2008 -0300
V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a589b66546d3d81e28dd95d3463c9e9da3d68728
Author: Steven Toth <stoth at hauppauge.com>
Date: Sun Jan 13 23:44:47 2008 -0300
V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
cx23885: Enable cx23417 support on the HVR1800
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b1b81f1db73f00e595585b16aa31293a791964c0
Author: Steven Toth <stoth at hauppauge.com>
Date: Sun Jan 13 23:42:44 2008 -0300
V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
cx23885: Add generic cx23417 hardware encoder support.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e57b1c80065f7922e3ba464f54254c7ce983a3a4
Author: Mike Isely <isely at pobox.com>
Date: Mon Apr 21 03:52:34 2008 -0300
V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
Change how list of possible pvrusb2 inputs is generated to include
only those interfaces that make sense for the interface instance.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1df59f0b908bfcdc35d1ea2319290ece272bf576
Author: Mike Isely <isely at pobox.com>
Date: Mon Apr 21 03:50:39 2008 -0300
V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 21684ba921d7758dc9264e0de64475b8a636ee95
Author: Mike Isely <isely at pobox.com>
Date: Mon Apr 21 03:49:33 2008 -0300
V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 17a7b6642da13f789471895677c98736ac85f43a
Author: Mike Isely <isely at pobox.com>
Date: Mon Apr 21 03:48:41 2008 -0300
V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1cb03b76d09d20accfa5c1664c16ba6566f539a0
Author: Mike Isely <isely at pobox.com>
Date: Mon Apr 21 03:47:43 2008 -0300
V4L/DVB (7719): pvrusb2: Implement input selection enforcement
In the pvrusb2 driver, different interfaces (e.g. V4L, DVB) have
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d3f8d8fb304a8b9a81eae16ff7b50f5379f2437e
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun Apr 20 02:42:55 2008 -0300
V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
These changes are required with the addition of digital television support
for the Hauppauge HVR1900 & HVR1950, the OnAir Creator and Sasem USB HDTV
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 95814bc2b792dced5296a710704de7d5ecec2776
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sat Apr 19 15:36:51 2008 -0300
V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f55a871241899ea2ecc85670d7c9a83e4de29637
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 18 05:38:56 2008 -0300
V4L/DVB (7716): pvrusb2: clean up global functions
This patch contains the following cleanups:
- make the following needlessly global function static:
- pvr2_hdw_set_cur_freq()
- #if 0 the following unused global functions:
- pvr2_hdw_get_state_name()
- pvr2_hdw_get_debug_info_unlocked()
- pvr2_hdw_get_debug_info_locked()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 49844c291a02a8630215f779fa44b3198d0a4f5b
Author: Mike Isely <isely at pobox.com>
Date: Wed Apr 9 05:44:57 2008 -0300
V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
Apparently the kernel developers no longer consider it proper
etiquette to use __FUNCTION__; everyone must instead use __func__
(even though it breaks with older compilers). And worse still, actual
effort is being expended to sweep this change throughout the kernel
source tree. Don't these people have better things to do? So...
Completely clean out all use of __FUNCTION__ from the pvrusb2 driver
(it was just in the sysfs interface). I'm not going to use __func__
either. So there.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 18ecbb4771eb0ecf297e996966b3c42f69cd6c02
Author: Mike Isely <isely at pobox.com>
Date: Wed Apr 9 05:14:11 2008 -0300
V4L/DVB (7714): pvrusb2: Fix hang on module removal
The pvrusb2 driver was getting had by this scenario:
1. Task A calls kthread_stop() for task B.
2. Before exiting, then Task B calls kthread_stop() for task C.
The problem is, kthread_stop() wants to allocate an internal resource
to itself (i.e. acquire a lock), which won't be released until
kthread_stop() returns. But kthread_stop() won't return until task B
is dead. But task B won't die until it finishes its call to
kthread_stop() for task C, and that will block waiting on the resource
already allocated inside task A. Deadlock.
With the pvrusb2 driver, task A is the caller to pvr_exit(), task B is
the control thread run inside of pvrusb2-context.c, and task C is any
worker thread run inside of pvrusb2-hdw.c.
This problem got introduced by the previous threading setup change,
which was itself an attempt to fix a module tear-down race (which it
actually did fix). The lesson here is that a task being waited on as
part of a kthread_stop() simply cannot be allow to also issue a
kthread_stop() - or we make sure not to issue the enclosing
kthread_stop() until we know that the inner kthread_stop() has
completed first. The solution for the pvrusb2 driver is some hackish
code which changes the main control thread tear down into a two step
process. This then makes it possible to delay issuing the
kthread_stop() on the control thread until after we know that
everything has been torn down first. (And yes, we really need that
kthread_stop() because it's the only way to safely guarantee that a
module-referencing kernel thread has safely returned back out of the
module before we finally remove the module.)
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 13e027a8bf2a507334fa0d30246ce619ff581cbb
Author: Mike Isely <isely at pobox.com>
Date: Mon Apr 7 02:57:13 2008 -0300
V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
Earlier fix to handle DVB feed thread aborts was overly-aggressive.
We can take better advantage of what kthread_stop() can do. This
change simplifies things.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 97f26ff6049a7fff5460cebe392ad1d699dc434c
Author: Mike Isely <isely at pobox.com>
Date: Mon Apr 7 02:22:43 2008 -0300
V4L/DVB (7712): pvrusb2: Close connect/disconnect race
If a disconnect happens before initialization is completed, the
pvrusb2 driver can accidentally touch dangling pointers. The whole
initialization function must be protected by the big_lock, and once
inside that lock, the initialization function should abort if it is
discovered that a disconnect has already taken place.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e5be15c63804e05b5a94197524023702a259e308
Author: Mike Isely <isely at pobox.com>
Date: Mon Apr 7 02:22:04 2008 -0300
V4L/DVB (7711): pvrusb2: Fix race on module unload
The pvrusb2 driver - for basically forever - was not enforcing a
proper module tear-down. Kernel threads are used inside the driver
and all must be gone before the module can be safely removed. This
changeset reimplements a chunk of pvrusb2-context.c to enforce this
correctly. Unfortunately this is not a simple fix. The new
implementation also cuts back on kernel thread usage; instead of there
being 1 control thread per instance now it's just 1 control thread
shared by all instances. (By dropping to a single thread then the
module exit function can block on its shutdown and the thread itself
can monitor and cleanly shut down all of the other instances first.)
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d913d6303072ca194919d851e6743ad8c3a7563d
Author: Mike Isely <isely at pobox.com>
Date: Sun Apr 6 04:04:35 2008 -0300
V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
Implement timed measurement of encoder operation for the first time it
is run. This allows the driver to note when the encoder has been run
successfully for at least 1/4 second. On top of that implement
various bits to ensure that the encoder has been run once before
digital streaming for OnAir devices. This is done via several core
state machine tweaks.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 72998b71096e364002269a8cacc0524937d479c6
Author: Mike Isely <isely at pobox.com>
Date: Thu Apr 3 04:51:19 2008 -0300
V4L/DVB (7709): pvrusb2: New device attribute for encoder usage in digital mode
Some tuners seem to not work in digital mode unless the encoder is
healthy. Implement a device attribute to represent this flag and
modify the core state machines to enforce this requirement.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 07b80264c3ede47593e83189cce82b31100053f6
Author: Mike Isely <isely at pobox.com>
Date: Sun Mar 30 20:36:31 2008 -0300
V4L/DVB (7708): pvrusb2-dvb: Fix stuck thread on streaming abort
If the device fails to stream, the feed thread will block forever
waiting for buffers. But while in this state it was not looking for
an exit condition from the driver DVB interface. This caused the
thread to jam. Implement a new stop flag (which will be set
appropriately) to tell the thread to stop.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 087886eb111fde9659d69c030ea618b3c242e39c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri Mar 28 05:49:36 2008 -0300
V4L/DVB (7707): pvrusb2-dvb: add atsc/qam support for Hauppauge pvrusb2 model 750xx
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c881284151e35479ffee26a571b6e9769c351095
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri Mar 28 05:48:44 2008 -0300
V4L/DVB (7706): pvrusb2: create a separate pvr2_device_desc structure for 751xx models
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 906a495741bf63a7448ca4c452d70f937549e9ad
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri Mar 28 05:47:47 2008 -0300
V4L/DVB (7705): pvrusb2: Enable OnAir digital operation
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1b1b8d7841684d9d6273c479abe39d517dfb8cb8
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:43:45 2008 -0300
V4L/DVB (7704): pvrusb2: Fix slop involving use of struct which might not be defined
When the DVB interface is not compiled, the pvr2_dvb_props struct is
not available - so it really should be ifdef'ed out as well. This
didn't cause an error because in this context its usage was as an
opaque pointer. But it really shouldn't be present at all if DVB is
not enabled.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 694dca2b80d5e17f5edddacf4fcdacc1091623f2
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:42:10 2008 -0300
V4L/DVB (7703): pvrusb2: Fix minor problem involving ARRAY_SIZE confusion
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bb0c2fe0c423d6501395e626501dd8747823cafb
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:41:19 2008 -0300
V4L/DVB (7702): pvrusb2: Rework USB streaming start/stop execution
The commands to start / stop USB streaming for an analog device are
fairly standard, owing to the fact that all supported devices
apparently started from the same common reference design. However
with digital mode, the commands seem to vary by vendor. This change
makes that variance more explicit. It also cleans up a related
problem for OnAir devices which prevented digital mode from working at
all.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1c9d10d4d2e791a9eacd9f919dec78c5bc6737e8
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:38:54 2008 -0300
V4L/DVB (7701): pvrusb2: Centralize handling of simple FX2 commands
Numerous places in the driver need to issue simple commands to the FX2
microcontroller (e.g. only 1 or 2 bytes, no reply needed). Previously
each place that did this, had to take lock, set up a central buffer,
and call the function to perform the handshake. This change puts
these steps into a single spot. This also has the effect of removing
the need to mess with the control lock from numerous places in the
code.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 448cb48e6e2fcd3a948cc549c5c6ab7f84440a54
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:36:25 2008 -0300
V4L/DVB (7700): pvrusb2: Make FX2 command codes unsigned constants
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ad0992e97c5416e431e19dcfd4f6c84448dc1bc2
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:34:45 2008 -0300
V4L/DVB (7699): pvrusb2: Implement statistics for USB I/O performance / tracking
Implement a mechanism in the pvrusb2 driver for gathering statistics
on the stream buffering, including bytes transferred, buffers handled,
buffers in flight, etc. This is useful for debugging certain classes
of streaming issues and for determining if the buffer pool size is
generally correct for the driver.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit be9cbb7c559eddea19604abafb89faf9c8666715
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:32:23 2008 -0300
V4L/DVB (7698): pvrusb2: Remove never-reached break statements (trivial)
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b9a37d9124dc834f2448558dbbe766eee077b954
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:31:40 2008 -0300
V4L/DVB (7697): pvrusb2: Fix misleading bit of debug output (trivial)
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 38d9a2cf2db30b37dde81ec5f8b4de0fd9843ccc
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:30:48 2008 -0300
V4L/DVB (7696): pvrusb2: state control tweak
Don't trigger a pathway state change if it's already been triggered
(eliminates some wasted processing and some debug output noise)
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 98e184d978c9fdd294c169e468ab4a3e51a8be2d
Author: Mike Isely <isely at pobox.com>
Date: Fri Mar 28 05:28:20 2008 -0300
V4L/DVB (7695): pvrusb2: Make associativity of == and && explicit (cosmetic)
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ce52f81138512dc9c4b0ab00f11806000b597a45
Author: Mike Isely <isely at pobox.com>
Date: Sun Mar 16 02:12:12 2008 -0300
V4L/DVB (7694): pvrusb2: Fix compilation goof when CONFIG_VIDEO_PVRUSB2_DVB is off
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e6d1186543784222024da9c688766effd2ca3163
Author: Mike Isely <isely at pobox.com>
Date: Sat Feb 9 19:47:52 2008 -0300
V4L/DVB (7693): pvrusb2-dvb: Change usage of 0 --> NULL
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c5317b17f6ca74531a6c707873dc5d25f1877ac3
Author: Mike Isely <isely at pobox.com>
Date: Sat Feb 9 19:47:07 2008 -0300
V4L/DVB (7692): pvrusb2-dvb: Further clean up dvb init/tear-down
Move pvr2_dvb_adapter usage out of the pvrusb2 driver core - it's
really private to the pvrusb2-dvb module and nothing outside of the
dvb implementation should care about it. Creation / destruction of
the pvr2_dvb_adapter instance is now contained entirely within
pvrusb2-dvb.c.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 129a2f5efd95959c44a2bfeea8ee8b7c17252db6
Author: Mike Isely <isely at pobox.com>
Date: Sat Feb 9 16:29:52 2008 -0300
V4L/DVB (7691): pvrusb2-dvb: Don't initialize if device lacks a digital side
In the end we'd like the dvb interface to always be present - even for
analog devices (via the mpeg encoder). However right now pvrusb2-dvb
won't operate correctly if the hardware doesn't have a digital tuner,
so don't initialize the DVB interface unless we know we have a digital
tuner.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7dcc48fb55d18258e7db039f44a031e6828e6bad
Author: Mike Isely <isely at pobox.com>
Date: Sat Feb 9 15:55:54 2008 -0300
V4L/DVB (7690): pvrusb2-dvb: Remove digital_up flag
Other pvrusb2-dvb changes have made the digital_up flag obsolete. So
kill it.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 891d99efc5be16d2762bdbb9d0486f7250990eee
Author: Mike Isely <isely at pobox.com>
Date: Sat Feb 9 15:44:30 2008 -0300
V4L/DVB (7689): pvrusb2-dvb: Rework module tear-down
Rather than making an explicit call to tear down the pvrusb2-dvb
module, use the callback in the pvr2_channel structure. This has the
advantage that now tear-down only happens when it makes sense. The
previous implementation had scenarios where it was possible for the
tear-down call to happen without a prior initialization.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a36416d0a70899d3724d2e69e378062e06252a41
Author: Mike Isely <isely at pobox.com>
Date: Wed Feb 6 06:59:48 2008 -0300
V4L/DVB (7688): pvrusb2: Clean up dvb streaming start/stop
Eliminate the need for a separate pvr2_dvb_fh; since in the DVB
context there can only ever be a single instance then there is no need
for a separate instance to handle streaming state. This simplifies
the module. Also move streaming start/stop out of the feed thread and
into the driver's main context - which makes it possible for streaming
start up failures to be detected by the DVB core.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ceb4340deb9bf5f8371d47ef906a83e6784345b0
Author: Mike Isely <isely at pobox.com>
Date: Wed Feb 6 04:24:51 2008 -0300
V4L/DVB (7687): pvrusb2: Fix oops in pvrusb2-dvb
The pvrusb2-dvb feed thread cannot be allowed to exit by itself
without first waiting for kthread_should_stop() to return true.
Otherwise the driver will have a dangling task_struct context, which
will cause a very nasty kernel oops.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e2780fb41102f9844ae6182c03908f03c3cb9163
Author: Mike Isely <isely at pobox.com>
Date: Mon Feb 4 04:22:21 2008 -0300
V4L/DVB (7686): pvrusb2: Fix broken debug interface build
Fix pvrusb2 kbuild typo introduced when pvrusb2-dvb was added.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 48e5329fe8dea9ce88074a10787b619a3fe7175f
Author: Mike Isely <isely at pobox.com>
Date: Mon Feb 4 01:00:33 2008 -0300
V4L/DVB (7685): pvrusb2: Fix really bad typo if DVB config option description
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bc4b02caa875f8e2146c724a931f32b087d7e9b0
Author: Mike Isely <isely at pobox.com>
Date: Mon Feb 4 00:12:16 2008 -0300
V4L/DVB (7684): pvrusb2: Add VIDEO_PVRUSB2_DVB config variable
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bde316a4f1094f9a3da402c44f7315e1a94fb332
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun Feb 10 05:33:37 2008 -0300
V4L/DVB (7683): pvrusb2-dvb: set to DTV mode before attaching frontend
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bb8ce9d9143c0fe2b5cdf65fa41250446805a4be
Author: Mike Isely <isely at pobox.com>
Date: Mon Feb 4 00:00:19 2008 -0300
V4L/DVB (7682): pvrusb2-dvb: finish up stream & buffer handling
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d8abe97d0063cf77e9bbbee076181e4657c7e09c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun Feb 3 23:55:07 2008 -0300
V4L/DVB (7681): pvrusb2-dvb: start working on streaming / buffer handling code
start work on streaming / buffer handling code to feed the software demux
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 99443ae04f7002530f666ba0747f7b1ecafb3002
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun Feb 3 23:48:09 2008 -0300
V4L/DVB (7680): pvrusb2-dvb: add pvr2_dvb_bus_ctrl to allow frontends to negotiate bus access
This function is just a skeleton for now -
a placeholder to remind us to fix it.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 04910bdc5c172af9bc937a8869e7f2907db4443f
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun Feb 3 23:46:16 2008 -0300
V4L/DVB (7679): pvrusb2: add DVB API framework
Add basic framework for the DVB API. This is enough to control the
tuner & demod of the digital frontend, but the stream & buffer handling
is still missing.
Additional note from Mike Isely <isely at pobox.com> - also, since these
changes are still very experimental arrange for DVB changes to be
compiled in via new CONFIG_VIDEO_PVRUSB2_DVB option, for now.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e7f677f33664200b3d75ffc625d218b84ac43875
Author: Mike Isely <isely at pobox.com>
Date: Sun Mar 16 01:13:17 2008 -0300
V4L/DVB (7678): pvrusb2: Fix stupid string typo that has been reproducing wildly
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b34dddbe4b88bf59e7607d1fc504eee43570c6a4
Author: Dmitry Belimov <d.belimov at gmail.com>
Date: Wed Apr 23 14:09:08 2008 -0300
V4L/DVB (7677): saa7134: Add/fix Beholder entries
Beholder TV/FM tuners:
Changes:
Add support Beholder Columbus PCMCIA card.
Add key map for remote control of Beholder Columbus PCMCIA card.
Fix gpiomask for all Beholder tuners.
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8fb737b7dc94e495be02c775afe1e7de0e06f3f5
Author: Dmitry Belimov <d.belimov at gmail.com>
Date: Wed Apr 23 14:07:09 2008 -0300
V4L/DVB (7676): saa7134: fix: Properly handle busy states on i2c bus
There are two conditions, reported by saa7134 that indicates that the I2C bus
is busy: TO_SCL and TO_ARB.
On both states, it needs to wait for I2C release, before using the bus.
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 548899c76e101bdf6228569d6ee6992e8c20da76
Author: Dmitry Belimov <d.belimov at gmail.com>
Date: Wed Apr 23 14:01:52 2008 -0300
V4L/DVB (7675): tea5767 autodetection is not working on some saa7134 boards
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d5b3d9ff368dee5e87d9987161ff258d87ecc7c0
Author: Steven Toth <stoth at hauppauge.com>
Date: Tue Apr 22 22:52:01 2008 -0300
V4L/DVB (7674): tda10048: Adding an SNR table
Trying to improve the SNR reporting.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6676237398d0c2e61e5a3a27e0951f60d6ef6fe3
Author: Steven Toth <stoth at hauppauge.com>
Date: Tue Apr 22 15:38:26 2008 -0300
V4L/DVB (7673): cx23885: Add support for the Hauppauge HVR1400
DVB-T mode is now supported using the DiBcom dib7000p demodulator
and the Xceive xc3028L silicon tuner. Analog mode is not supported.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Reviewed-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a38d6e37c0bc073bae5eff37c939978974ea9712
Author: Steven Toth <stoth at hauppauge.com>
Date: Tue Apr 22 15:37:01 2008 -0300
V4L/DVB (7672): dib7000p: Add output mode param to the attach struct
This allows future drivers to select the most appropriate output mode.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Reviewed-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5aa2110f3f33feb4a0c67a4996dc400dc594bc1d
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date: Tue Apr 22 10:40:23 2008 -0300
V4L/DVB (7671): pxa-camera: fix DMA sg-list coalescing for more than 2 buffers
Currently the pxa-camera driver has a bug, visible when the user requests
more than 2 video buffers. When the third buffer is queued, it is not
appended to the DMA-descriptor list of the second buffer, but is again
appended to the first buffer. Fix it.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e7c506881973d0c762d660005be54c4095219c59
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date: Tue Apr 22 10:37:49 2008 -0300
V4L/DVB (7670): pxa-camera: handle FIFO overruns
FIFO overruns are not seldom on PXA camera interface FIFOs. Handle them by
dropping the corrupted frame, waiting for the next start-of-frame, and
restarting capture.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a5462e5be3c1cec7e00e6af9985ff31bf4ef8aa0
Author: Mike Rapoport <mike at compulab.co.il>
Date: Tue Apr 22 10:36:32 2008 -0300
V4L/DVB (7669): pxa_camera: Add support for YUV modes
This patch adds support for YUV packed and planar capture for pxa_camera.
Signed-off-by: Mike Rapoport <mike at compulab.co.il>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 587df9fca6496f4236c526b2c83f068a63cfd769
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date: Tue Apr 22 10:33:39 2008 -0300
V4L/DVB (7668): soc-camera: Remove redundant return
This obviously redundant return has been in the driver from the very first
version. Remove it.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6ec6e0ced1bb9d85e29302e76f5340e3e49bd0b9
Author: Douglas Schilling Landgraf <dougsland at gmail.com>
Date: Thu Apr 10 02:07:14 2008 -0300
V4L/DVB (7666): meye: Replace meye_do_ioctl to use video_ioctl2
Convert meye to use video_ioctl2
Signed-off-by: Douglas Schilling Landgraf <dougsland at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 130ca945d83637046bde4943629f011e22831fd3
Author: Douglas Schilling Landgraf <dougsland at gmail.com>
Date: Thu Apr 10 01:18:56 2008 -0300
V4L/DVB (7665): videodev: Add default vidioc handler
Added default vidioc handler for other private ioctls
Signed-off-by: Douglas Schilling Landgraf <dougsland at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 87dd965f101bafea7c5e507f686814a0f0057417
Author: Oliver Endriss <o.endriss at gmx.de>
Date: Sun Apr 20 22:34:57 2008 -0300
V4L/DVB (7663): budget: Support for Activy budget card with BSBE1 tuner
Add support for Activy budget card with BSBE1 tuner, subsystem id 0x1131:0x4f60.
Low band and DiSEqC support should work now (BSBE1 and BSRU6 tuner).
Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit da2c7f66174d082e6b8e1b0c9c0576833abfe866
Author: Oliver Endriss <o.endriss at gmx.de>
Date: Sun Apr 20 22:13:37 2008 -0300
V4L/DVB (7662): stv0299: Fixed some typos
Fixed some typos.
Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e84b133e329ddad725907844c285efcd35dae39d
Author: Oliver Endriss <o.endriss at gmx.de>
Date: Sun Apr 20 21:57:34 2008 -0300
V4L/DVB (7661): stv0299: Add flag to turn off OP0 output
Add flag to turn off OP0 output.
Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 94ad6de7051a9eb6beda096144c5b409538eab86
Author: Oliver Endriss <o.endriss at gmx.de>
Date: Sun Apr 20 20:41:42 2008 -0300
V4L/DVB (7660): bsbe1: Use settings recommended by the manufacturer
Reworked the BSBE1 tuner support in bsbe1.h to follow
the ALPS-recommended parameters more closely.
Tested with BSBE1-based Activy cards and TT DVB-S rev 2.3.
Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a095be4b030cd7eb5ac2a7dcb86e803db149a8db
Author: Andrea Odetti <mariofutire at gmail.com>
Date: Sun Apr 20 19:14:51 2008 -0300
V4L/DVB (7659): dvb-core: Implement DMX_SET_BUFFER_SIZE for dvr
Implementation of DMX_SET_BUFFER_SIZE for dvr.
Synchronization of the code of DMX_SET_BUFFER_SIZE for demux and dvr.
Signed-off-by: Andrea Odetti <mariofutire at gmail.com>
Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 48c01a9c2d245b229f8b709040cb1776b00dc683
Author: Andrea Odetti <mariofutire at gmail.com>
Date: Sun Apr 20 18:37:45 2008 -0300
V4L/DVB (7658): dvb-core: Fix DMX_SET_BUFFER_SIZE in case the buffer shrinks
This patch fixes the bug in DMX_SET_BUFFER_SIZE for the demux.
Basically it resets read and write pointers to 0 in case they are
beyond the new size of the buffer.
Signed-off-by: Andrea Odetti <mariofutire at gmail.com>
Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3ff9a81b21c673fd91ad8456242ca68922f77ac4
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Sun Apr 13 22:41:19 2008 -0300
V4L/DVB (7656): tda826x: Calculate cut off fequency from symbol rate
This patch makes the tuner work with transonders providing higher
symbol rates.
It was contributed by Oliver Endriss.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b1c54fe2aed3e2812f5b42916894f15e84b484b5
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Sun Apr 13 21:09:11 2008 -0300
V4L/DVB (7655): tda10086 coding stlye fixes
This patch replaces the c++ style comments.
No functional changes
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9a1b04e461fc8127c902a988cd9a082ba0680b11
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Wed Apr 9 23:07:11 2008 -0300
V4L/DVB (7654): tda10086: make the xtal frequency a configuration option
Some DVB-S boards, i.e. with the SD1878 tuner, use a 4 MHz reference frequency.
This reqires a different setup of the clock PLL.
This patch adds an enum to the tda10086_config struct and sets the proper
values for the boards.
This patch also fixes the DVB-S section of the MD7134_BRIDGE_2
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b37f2d6a31fc8e80c79a0a214d83b128aa796543
Author: Devin Heitmueller <devin.heitmueller at gmail.com>
Date: Mon Apr 21 07:02:09 2008 -0300
V4L/DVB (7653): tuner-xc2028: drop the severity of version reporting
tuner-xc2028.c
- Drop the severity level of the xc3028 version reporting, since it's
only of interest to developers and user's don't need to have it show up
in their dmesg output every time they change the channel.
Signed-off-by: Devin Heitmueller <devin.heitmueller at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4269a8eed210d143298baf80185317fc1dcb25ca
Author: Devin Heitmueller <devin.heitmueller at gmail.com>
Date: Mon Apr 21 07:01:09 2008 -0300
V4L/DVB (7652): em28xx: Drop the severity level of the "urb resubmit failed"
em28xx-core.c
- Drop the severity level of the "urb resubmit failed" to debug, since it
occurs every time a stream disconnects, which fills the dmesg log
Signed-off-by: Devin Heitmueller <devin.heitmueller at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 33e5316113b1a472f54579f014739e4a4a53d704
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Mon Apr 21 06:58:48 2008 -0300
V4L/DVB (7651): tuner-xc2028: Several fixes to SCODE
This patch fixes several issues on SCODE:
1) The extracting tool weren't generating the proper tags for SCODE. This
has almost no effect, since those tags shouldn't be used;
2) DIBCOM52 were using a wrong IF. It should be 5200, instead of 5700;
3) seek_firmware were wanting an exact match for firmware type. This is
wrong. As result, no SCODE firmware were loaded;
4) A few files were including the wrong file for seeking demod firmwares;
5) XC3028_FE_DEFAULT can be used, if user doesn't want to load a firmware.
However, this weren't documentated. This feature require more testing.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d1e0b57162f45bb9c6bff25aa33b6e8424556422
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu Apr 17 22:16:31 2008 -0300
V4L/DVB (7650): git-dvb: Kconfig fix
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ce89cfb4908bcebba3fb0cd2956d676e06043ef1
Author: Steven Toth <stoth at hauppauge.com>
Date: Sat Apr 19 01:36:06 2008 -0300
V4L/DVB (7648): cx23885: Load any module dependencies accordingly
For boards that require the avcore (cx25840) to be active, ensure
it gets loaded.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a780a31cee55e01e7b479244e7907ba842c120a0
Author: Steven Toth <stoth at hauppauge.com>
Date: Sat Apr 19 01:25:52 2008 -0300
V4L/DVB (7647): Add support for the Hauppauge HVR-1700 digital mode
This adds support for DVB-T mode only, analog is not supported.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2770b7d7136f9c6a51ae7fd1d29fa58caf2bcf1c
Author: Steven Toth <stoth at hauppauge.com>
Date: Sat Apr 19 01:18:47 2008 -0300
V4L/DVB (7646): cx25840: Ensure GPIO2 is correctly set for cx23885/7/8 based products
cx25840: Ensure GPIO2 is correctly set for cx23885/7/8 based products.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b3ea01668907bdb32b0c690d28f9f2b1298bd258
Author: Steven Toth <stoth at hauppauge.com>
Date: Sat Apr 19 01:14:19 2008 -0300
V4L/DVB (7645): Add support for the Hauppauge HVR-1200
This adds support for DVB-T mode only, analog mode is not supported.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7bbb1ce4f3e517666ad27f3307d49bb2da69ffec
Author: Steven Toth <stoth at hauppauge.com>
Date: Sat Apr 19 01:06:25 2008 -0300
V4L/DVB (7644): Adding support for the NXP TDA10048HN DVB OFDM demodulator
Adding support for the NXP TDA10048HN DVB OFDM demodulator
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6b92b3bd7ac91b7e255541f4be9bfd55b12dae41
Author: Steven Toth <stoth at hauppauge.com>
Date: Sat Apr 5 16:45:57 2008 -0300
V4L/DVB (7642): cx88: enable radio GPIO correctly
cx88: enable radio GPIO correctly.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ce96d0a44a4f8d1bb3dc12b5e98cb688c1bc730d
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu Apr 17 22:55:29 2008 -0300
V4L/DVB (7641): V4L: ov511 - use usb_interface as parent, not usb_device
The current code creates a bogus DEVPATH:
/devices/pci0000:00/0000:00:1d.0/usb1/1-2/video4linux/video0
while it should be:
/devices/pci0000:00/0000:00:1d.0/usb1/1-2/1-2:1.0/video4linux/video0
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 353a2761ffb3c4f43ec0c9c99bbe64629646b347
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Fri Apr 18 22:24:01 2008 -0300
V4L/DVB (7639): au8522: fix a small bug introduced by Checkpatch cleanup
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 18d73c58b5ea7425db05b666408f6f682d837b73
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Fri Apr 18 22:12:52 2008 -0300
V4L/DVB (7638): CodingStyle fixes for au8522 and au0828
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bbdf855b0e98ba576b3577522af5e5c7503c4ed0
Author: Steven Toth <stoth at hauppauge.com>
Date: Thu Apr 17 22:30:22 2008 -0300
V4L/DVB (7637): au0828: Typo
au0828: Typo
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 805caff5a83679a6be6c90787462cb3e4b58e374
Author: Steven Toth <stoth at hauppauge.com>
Date: Thu Apr 17 21:47:11 2008 -0300
V4L/DVB (7636): au0828: Add HVR850 model number
au0828: Add HVR850 model number
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 37be1ea40e42c0de63cedbe65d35cbe6c2a81c0a
Author: Steven Toth <stoth at hauppauge.com>
Date: Thu Apr 17 21:45:08 2008 -0300
V4L/DVB (7635): au8522: Cleanup
au8522: Cleanup
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a9c36aad59a06df199cdbb365d0b05663f8008f1
Author: Steven Toth <stoth at hauppauge.com>
Date: Thu Apr 17 21:41:28 2008 -0300
V4L/DVB (7634): au0828: Cleanup
au0828: Cleanup
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0daa5de740c65de7c9554071eec84c6731370065
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Thu Apr 10 04:24:56 2008 -0300
V4L/DVB (7633): au8522: consolidate mse2snr_lookup functions
consolidate au8522_qam256_mse2snr_lookup, au8522_qam64_mse2snr_lookup and
au8522_vsb_mse2snr_lookup into a single function, au8522_mse2snr_lookup.
Pass the mse2snr table into au8522_mse2snr_lookup depending on the
modulation type.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f01699b482875bf224a907a45d58e8e3739d554b
Author: Steven Toth <stoth at hauppauge.com>
Date: Thu Apr 10 02:01:48 2008 -0300
V4L/DVB (7632): au8522: Added SNR support and basic cleanup
au8522: Added SNR support and basic cleanup
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fb8152cb01dc2bca04a6ee561920d0a02af6c73b
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sat Apr 5 23:13:05 2008 -0300
V4L/DVB (7631): au8522: add function au8522_read_mse
add function au8522_read_mse, which will be used to compute snr
TO DO: mse2snr
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8973dc4b70c5506596207da3fddab03002357178
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sat Apr 5 23:08:08 2008 -0300
V4L/DVB (7630): au8522: fix au8522_read_ucblocks for qam
ucblocks are reported in separate registers for vsb & qam
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ce1719a61c7c0ac40c6244e6b354181dde27062d
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Wed Apr 2 18:59:48 2008 -0300
V4L/DVB (7629): au8522: replace __FUNCTION__ with __func__
replace __FUNCTION__ with __func__ and clean associated checkpatch.pl warnings.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e059b0fac7d9df8bf759d7092a16221f0fd250e8
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Wed Apr 2 18:59:48 2008 -0300
V4L/DVB (7628): au8522: codingstyle cleanups
Fixed some checkpatch.pl warnings
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f07e8e4bb790f6cb462d5d5425193cad874ac0de
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri Apr 18 21:42:30 2008 -0300
V4L/DVB (7627): au0828: replace __FUNCTION__ with __func__
replace __FUNCTION__ with __func__ and clean associated checkpatch.pl
warnings.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fdfc7452f17eb65eb29a143cf992ea2b8d262c7a
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Wed Apr 2 18:59:48 2008 -0300
V4L/DVB (7626): Kconfig: VIDEO_AU0828 should select DVB_AU8522 and DVB_TUNER_XC5000
VIDEO_AU0828 should select DVB_AU8522 and DVB_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bc3c613cef903e73e7365986a1943b0124350018
Author: Steven Toth <stoth at hauppauge.com>
Date: Fri Apr 18 21:39:11 2008 -0300
V4L/DVB (7625): au0828: Cleanup
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9c26de555dd3c2cb9833b4d324150aa6b5547b91
Author: Steven Toth <stoth at hauppauge.com>
Date: Wed Apr 2 01:10:40 2008 -0300
V4L/DVB (7624): Avoid an oops if the board is not fully defined
Avoid an oops if the board is not fully defined.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c32d4d7510ae4da4e83bbd6e6471b04e9c9108ea
Author: Steven Toth <stoth at hauppauge.com>
Date: Tue Apr 1 01:27:41 2008 -0300
V4L/DVB (7623): Scripts to maintain the CARDLIST file
Scripts to maintain the CARDLIST file.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 28930fa9af9be77abe3d8bce3193908bf266efc6
Author: Steven Toth <stoth at hauppauge.com>
Date: Sat Mar 29 19:53:07 2008 -0300
V4L/DVB (7622): HVR950Q Hauppauge eeprom support
HVR950Q Hauppauge eeprom support.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 265a6510629ab39f33ece43a857089dd37978184
Author: Steven Toth <stoth at hauppauge.com>
Date: Fri Apr 18 21:34:00 2008 -0300
V4L/DVB (7621): Add support for Hauppauge HVR950Q/HVR850/FusioHDTV7-USB
Including support for the AU0828 USB Bridge.
Including support for the AU8522 ATSC/QAM Demodulator.
Including support for the AU8522 ATSC/QAM Demodulator.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c8234ea37fb8b7a904223672edf36d269ea569a2
Author: Steven Toth <stoth at hauppauge.com>
Date: Sat Mar 29 18:15:33 2008 -0300
V4L/DVB (7620): Adding support for a new i2c bridge type
Adding support for a new i2c bridge type
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e77ebdaa927a9e1b6a2e46086f6ca9a445cd0b88
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Fri Apr 18 18:37:25 2008 -0300
V4L/DVB (7619): em28xx: adds proper demod IF for HVR-900
Thanks to Aidan Thornton <makosoft at googlemail.com> for helping
to test this firmware
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e54318e5a41cfe10325ae2f817d337beb84e79aa
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Fri Apr 18 18:34:31 2008 -0300
V4L/DVB (7618): em28xx: make some symbols static
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e9888a1330402050e596b2553e7009fe371c42be
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:49:59 2008 -0300
V4L/DVB (7617): Removes a manual mode setup
The setup is already done at open().
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e3569abc1c51d24f9c64b214f85477e490b156e3
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:49:20 2008 -0300
V4L/DVB (7616): em28xx-dvb: Properly selects digital mode at the right place
The driver should be switched to digital mode, when trying to access the
frontend or when streaming.
This patch provides the correct code to support this feature.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c67ec53f8f4e90ebd482789e2f6d121f41a0bd90
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:48:00 2008 -0300
V4L/DVB (7615): em28xx: Provide the proper support for switching between analog/digital
Before this patch, HVR900/HVR950 were incorreclty going back to analog. The
result is that only digital were working.
This patch provides the proper setup for analog/digital and tuner callback.
It also properly resets analog into a sane state at open().
Thanks to Steven Toth <stoth at linuxtv.org> and Michael Krufky <mkrufky at linuxtv.org>
for helping to set the proper parameters to GPO/GPIO em2883 ports.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 82ac4f876505615ba9dc6a73cd9a584bad8fe23f
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:46:14 2008 -0300
V4L/DVB (7614): em28xx-core: fix some debug printk's that wrongly received KERN_INFO
Those printk's were adding more info to a line that were already being
printed.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 41facaa4b63cc1a0ff5a900149a29942d47e1491
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:44:58 2008 -0300
V4L/DVB (7613): em28xx: rename registers
Now, all registers will follow the same convension:
EM28XX_R<reg_number>_<reg_name>
This allows to associate a register with its value, and also with a canonical
name. Also, registers that are specific to a given chip were renamed accordingly,
as EM2800_foo (for 2800 only registers) or EM2880_foo (for registers that started
to appear on em2880).
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7e26ca8012a8392c5e53055b8ff3d9512faee6c6
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:43:38 2008 -0300
V4L/DVB (7612): em28xx-cards: use register names for GPIO/GPO
Before this patch, registers 0x04 and 0x08 were referenced by its value. This is
bad, since makes harder for someone to understand what this is doing.
This patch renames those two registers into an appropriate name.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2ba890ec0849b222a6dabb5192ccd8fd1696d6d3
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:42:58 2008 -0300
V4L/DVB (7611): em28xx: Move registers to a separate file
em28xx.h contains lots of different stuff inside. The better is to break it on
some files.
This patch removes the register names, moving them to a separate file.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 89b329ef9d7cc16ed46fc991b21b2d45e7bf452c
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:42:14 2008 -0300
V4L/DVB (7610): em28xx: Select reg wait time based on chip ID
This is more conservative than just removing the msleep() from
em28xx_write_regs_req(), since some old hardware may still need it.
So, it will remove the sleep time only for those chips where this
removal were tested.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7640ea99339c687864f6131598e2eee2ca73cb9c
Author: Devin Heitmueller <devin.heitmueller at gmail.com>
Date: Thu Apr 17 21:41:23 2008 -0300
V4L/DVB (7609): em28xx-core: speed-up firmware load
em28xx-core.c:
- Remove sleep in i2c message routine which slows down i2c by a factor
10x. Load time for BASE firmware went from 13s to .973s
Signed-off-by: Devin Heitmueller <devin.heitmueller at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 83244025e70aadd7e8baad520decf5d53d534d8f
Author: Devin Heitmueller <devin.heitmueller at gmail.com>
Date: Thu Apr 17 21:41:16 2008 -0300
V4L/DVB (7608): em28xx-dvb: Some cleanups and fixes
em28xx-dvb.c:
- Remove unneeded xc3028_ctrl structure. The driver automatically preserves
the previous value
tuner-xc2028.c:
- Make the return type for xc2028_get_reg signed, since all of the callers
are looking for "< 0" to detect errors.
Signed-off-by: Devin Heitmueller <devin.heitmueller at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6ea54d938b6f81baa0952a8b15d3e67e6c268b8f
Author: Douglas Schilling Landgraf <dougsland at gmail.com>
Date: Thu Apr 17 21:41:10 2008 -0300
V4L/DVB (7607): CodingStyle fixes
Signed-off-by: Douglas Schilling Landgraf <dougsland at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e6a353b0dc2686ae04805919e7a22430d2f1e29e
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:41:00 2008 -0300
V4L/DVB (7606): em28xx-dvb: Program GPO as well
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 92b75ab0752636802da9a63093dcbbe296ec1fef
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:40:53 2008 -0300
V4L/DVB (7605): tuner-xc3028: Avoids too much firmware reloads
xc3028_sleep function is being used with a different meaning. This
should be called only before doing S1/S3 sleep.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 102a0b0879a01a413ed5f667f7db9c2085ca8474
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:40:45 2008 -0300
V4L/DVB (7604): em28xx-dvb: Fix analog mode
The analog entries are wrong. Fix it.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3421b7787a2cf41ac5edce9b5766bddd1e1d9986
Author: Aidan Thornton <makosoft at googlemail.com>
Date: Thu Apr 17 21:40:36 2008 -0300
V4L/DVB (7603): em28xx-dvb: don't use videobuf-dvb
Modifies em28xx-dvb not to use videobuf-dvb, but instead to include the code
for registering dvb devices locally and use the URB management code in the
em28xx driver directly. DVB data streaming should now work.
Signed-off-by: Aidan Thornton <makosoft at googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 579f72e44fb1c991352f44c20b471c3001357f68
Author: Aidan Thornton <makosoft at googlemail.com>
Date: Thu Apr 17 21:40:16 2008 -0300
V4L/DVB (7602): em28xx: generalise URB setup code
Move the URB setup and management code to em28xx-core.c and generalise
it slighlty so that the DVB code can use it.
Signed-off-by: Aidan Thornton <makosoft at googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7e6388a1b97cca57a1906df6104feb4001721576
Author: Aidan Thornton <makosoft at googlemail.com>
Date: Thu Apr 17 21:40:03 2008 -0300
V4L/DVB (7601): em28xx-dvb: add support for the HVR-900
Adds the correct GPIOs and demod attach code for the HVR-900
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d2d9fbfd732f49999a2a94f2479934488fe3ea9d
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:38:53 2008 -0300
V4L/DVB (7600): em28xx: Sets frequency when changing to analog mode
This will make tuner-xc2028 to change to analog, if needed.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 52284c3e47bf502aaff72ab2ede509193b628b1b
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:38:38 2008 -0300
V4L/DVB (7599): em28xx-dvb: videobuf callbacks are waiting for em28xx_fh
Thanks to Devin Heitmueller <devin.heitmueller at gmail.com> for pointing
this issue.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bdfbf9520372daf2b4d6941474c92310848ccb27
Author: Devin Heitmueller <devin.heitmueller at gmail.com>
Date: Thu Apr 17 21:38:27 2008 -0300
V4L/DVB (7598): em28xx: several fixes on gpio programming
em28xx-cards.c:
- Fix reversed val/rst values in both analog_gpio and digital_gpio
vectors
- Fix crash that would was occurring during every analog startup
while looping over gpio_ctl
- Remove what appears to be a redundant setting of gpio_ctl->val
- Don't use OREN538 demodulation for the HVR-950 (prevents ATSC
scanning from working)
em28xx-dvb.c:
- Tuner should be in digital mode when issuing the reset
- Add copyright
- Change struct definition (corresponds to fix in em28xx-cards.c for
gpio_ctl looping)
Signed-off-by: Devin Heitmueller <devin.heitmueller at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3ca9c09379e8f3be0744c47f72769457fa46e9f3
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:37:53 2008 -0300
V4L/DVB (7597): em28xx: share the same xc3028 setup for analog and digital modes
Thanks to Devin Heitmueller <devin.heitmueller at gmail.com> and Aidan
Thornton" <makosoft at googlemail.com> for pointing some errors with the
previous scenario.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 227ad4ab9058ef2624934183e8083886cf64bf56
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:37:40 2008 -0300
V4L/DVB (7596): em28xx-dvb: Add support for HVR950
This patch adds DVB support for Hauppauge HVR950.
Thanks to Michael Krufky <mkrufky at linuxtv.org> for getting those values.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ee6e3a865a469c78daa93a1e6cdbaca3a102f9c8
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:37:31 2008 -0300
V4L/DVB (7595): Improve generic support for setting gpio values
em28xx based devices with xc3028 may require some specific gpio values.
This patch adds a generic handling for such values.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit acaa4b609fbab25e09459cd8e842e292b27f5ecb
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:37:18 2008 -0300
V4L/DVB (7594): em28xx: Fix Kconfig
Some devices have msp3400 audio decoder chip. Selects it, if em28xx.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3aefb79af8d41c85e11da7109d62038849421bb6
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Apr 17 21:36:41 2008 -0300
V4L/DVB (7593): em28xx: add a module to handle dvb
This patch adds em28xx-dvb. This driver is highly based on cx88-dvb and
saa7134-dvb.
This code currently loads and unloads successfully. However, some
changes are needed to properly support the mpeg streams and to setup
em28xx to work on DVB mode.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 168c626cb8f85df17585af99e14403904641c7ac
Author: Julia Lawall <julia at diku.dk>
Date: Wed Apr 16 16:13:15 2008 -0300
V4L/DVB (7591): drivers/media/video: use time_before, time_before_eq, etc
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ change_compare_np @
expression E;
@@
(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)
@ include depends on change_compare_np @
@@
@ no_include depends on !include && change_compare_np @
@@
#include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9e05c0f0d84c25f7f576ebc22a9a3a2cf962cc58
Author: Ivan Bobyr <brefi at yandex.ru>
Date: Wed Apr 16 16:01:55 2008 -0300
V4L/DVB (7590): ir-common: Adds 3 missing IR keys for FlyVIdeo2000
The patch extends the default keymap of FlyVIdeo2000 IR remote control so that
this remote may also serve movie & music players in a better way.
I bought a SAA7130 TV tuner with a remote control having 3 additional button
as the default layout, exactly as:
1) labeled "<<<" : key code 0x19, may be used as "backward"in MPlayer,XMMS etc
2) labeled ">>>" : key code 0x1f, may be used as "forward"...
3) not labeled : key code 0x0a, may be used as "pause"...
Once have added these code definitions to the kernel, me got all these
operations available for viewing movies & listening music.
Signed-off-by : Ivan Bobyr <brefi at yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1d3104b819979784df1da6ad76acef33cd9736e4
Author: David Hilvert <dhilvert at gmail.com>
Date: Wed Apr 16 04:27:09 2008 -0300
V4L/DVB (7589): ibmcam: improve support for the IBM PC Camera Pro
This patch modifies Dmitri's original ibmcam driver for Linux to improve
support for the IBM PC Camera Pro. It may also offer improved support for
other models classified by the driver as 'Model 3', such as the IBM PC Camera
Pro Max.
See http://auricle.dyndns.org/xvp610/
Signed-off-by: David Hilvert <dhilvert at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 17de9a4e53567912735105e189535f5d83e74a81
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 15 18:11:50 2008 -0300
V4L/DVB (7584): Fix build that occurs when CONFIG_VIDEO_PMS=y and VIDEO_V4L2_COMMON=m
This patch removes zoran checks for VIDEO_V4L2, since this API is always
present, when V4L is selected.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0b9c2b7a413c0e79254f17bbe095cee24885cd4b
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Thu Apr 10 21:34:39 2008 -0300
V4L/DVB (7582): proc: switch /proc/driver/radio-typhoon to seq_file interface
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9faa2d75822e1950b3aacc8ccbdf0cdb595e47de
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Sun Apr 13 08:48:43 2008 -0300
V4L/DVB (7580): Fix concurrent read from /proc/videocodecs
Observation one: ->write_proc and ->data assignments aren't needed. Removed.
Observation two: codecs lists are unprotected. Patch doesn't fix this.
Observation three:
/proc/videocodecs printout is done to temporary _global_ buffer which
is freed in between. Consequently, two users hitting this file can
screwup each other.
Steps to reproduce:
modprobe videocodec
while true; do cat /proc/videocodecs &>/dev/null; done &
while true; do cat /proc/videocodecs &>/dev/null; done &
The fix is switching to seq_files, this removes code, especially some
line-length "logic".
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Acked-by: Jan Kara <jack at suse.cz>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b9bc07a006ae94d7b3dd5db873bcf10ceb749253
Author: Robert Fitzsimons <robfitz at 273k.net>
Date: Thu Apr 10 09:40:31 2008 -0300
V4L/DVB (7579): bttv: Fix memory leak in radio_release
Fix the leak of the bttv_fh structure allocated in radio_open which
was introduced by commit 5cd3955cb8adfc1edf481e9e1cb2289db50ccacb.
Signed-off-by: Robert Fitzsimons <robfitz at 273k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a53a45567cb4879c46bb019757cdeb1b1ecabbd5
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:47:03 2008 -0300
V4L/DVB (7575a): Revert changeset 4c3b01f71181a52ab7735a7c52b1aa2232826075
Due to the patch order change, pvrusb2 were broken. So, changeset
4c3b01f71181a52ab7735a7c52b1aa2232826075 were applied at mainstream to fix.
After the pvrusb2 changes, this patch is no longer required and should be
reverted.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ca19aaa510b150ca358166b29eb2bb62ad971f76
Author: Patrick Boettcher <pb at linuxtv.org>
Date: Sun Apr 13 15:49:22 2008 -0300
V4L/DVB (7569): Added support for SkyStar2 rev2.7 and ITD1000 DVB-S tuner
This patches adds support for the SkyStar2 rev2.7 with the PN1010/ITD1000 Frontend.
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c9dd82c2f978e4ebac1cbb7cee8d379d1090154b
Author: Patrick Boettcher <pb at linuxtv.org>
Date: Sat Mar 29 21:28:07 2008 -0300
V4L/DVB (7471): SkyStar2: preparing support for the rev2.8
Support is prepared, but the CX24113-driver .c-file is missing. After sorting out the NDA problems, the file will be there immediatly.
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 11d3f323930ef625c1018ed13adeb04127c356e0
Author: Matthias Schwarzott <zzam at gentoo.org>
Date: Sat Apr 12 15:04:50 2008 -0300
V4L/DVB (7575): mt312: add attach-time setting to invert lnb-voltage
Add a setting to config struct for inversion of lnb-voltage.
Needed for support of Avermedia A700 cards.
Signed-off-by: Matthias Schwarzott <zzam at gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6a5cbd591c703491b62892682adc124ece67f3a9
Author: Matthias Schwarzott <zzam at gentoo.org>
Date: Sat Apr 12 15:04:49 2008 -0300
V4L/DVB (7574): mt312: Add support for zl10313 demod
Add zl10313 support to mt312 driver.
zl10313 uses 10.111MHz xtal.
Signed-off-by: Matthias Schwarzott <zzam at gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 111221fb676176dc90638d6004f1c26164ddd5ae
Author: Matthias Schwarzott <zzam at gentoo.org>
Date: Sat Apr 12 15:04:48 2008 -0300
V4L/DVB (7573): mt312: Supports different xtal frequencies
Do not hardcode xtal frequency but allow different values
for future zl10313 support.
Signed-off-by: Matthias Schwarzott <zzam at gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 82cd2dff4a5562a081c8bbf449a1ae7b9ecb5b1b
Author: Matthias Schwarzott <zzam at gentoo.org>
Date: Sat Apr 12 15:04:47 2008 -0300
V4L/DVB (7572): mt312: Fix diseqc
Correct the frequency of the emitted diseqc signal to 22kHz.
Adds sleep(100) to wait for message to be transmitted.
For now the only user of mt312 is b2c2-flexcop, and it
does overwrite all diseqc related functions with own code.
Signed-off-by: Matthias Schwarzott <zzam at gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1881ee89e0fe03ac5bba9045acb3bea1818f9466
Author: Matthias Schwarzott <zzam at gentoo.org>
Date: Sat Apr 12 15:04:46 2008 -0300
V4L/DVB (7571): mt312: Cleanup buffer variables of read/write functions
Change type of buffer variables from void* to u8* to save some casts.
Signed-off-by: Matthias Schwarzott <zzam at gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit dbad108bdcb30629c850f5606949510da010a686
Author: Patrick Boettcher <pb at linuxtv.org>
Date: Sun Apr 13 15:47:53 2008 -0300
V4L/DVB (7568): Support for DVB-S demod PN1010 (clone of S5H1420) added
This device is a clone of the PN1010 used by SkyStar2 rev2.7 .
This patch adds support for the flexcop-device and makes the driver look a little bit nicer.
It needs to be checked whether the driver is still ok for the budget-cards.
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 44dc733cd9edac53402d705cd2f720accd0b3e2c
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:11:08 2008 -0300
V4L/DVB (7567): em28xx: Some cleanups
Removes some fields from data structs.
There are some fields that are just caching some calculus for buffer
size. The calculus were moved to the places it were needed and the now
unused fields were removed.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 59d3448995a4c0ca98cbe82f6dac9460323377c1
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:10:00 2008 -0300
V4L/DVB (7566): videobuf-dvb: allow its usage with videobuf-vmalloc
videobuf-dvb were still using a function that were videobuf-dma-sg
dependent. This patch creates a generic handler for this function. This
way, videobuf-dvb can now work with all videobuf implementations.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3b5fa928a6b2971ec65571745defc5d9758b4bc1
Author: Aidan Thornton <makosoft at googlemail.com>
Date: Sun Apr 13 15:09:36 2008 -0300
V4L/DVB (7565): em28xx: fix buffer underrun handling
This patch fixes three related issues and a fourth trivial one:
- Use buffers even if no-one's currently waiting for them (fixes
underrun issues);
- Don't return incomplete/mangled frames at the start of streaming and
in the case of buffer underruns;
- Fix an issue which could cause the driver to write to a buffer that's
been freed after videobuf_queue_cancel is called (exposed by the
previous two fixes - for some reason, ignoring buffers that weren't
being waited on worked around the issue);
- Fix a bug which could cause only one field to be filled in the first
buffer (or first few buffers) after streaming is started.
Signed-off-by: Aidan Thornton <makosoft at googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b4916f8ca1da71bb97fb6dcf1e8da3f9c64cf80e
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:09:14 2008 -0300
V4L/DVB (7564): em28xx: Some fixes to display logic
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit dbecb44c11d9517d604240b53581951ac4e3b5e6
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:08:55 2008 -0300
V4L/DVB (7563): em28xx: Add missing checks
There are some cases where nobody is waiting for a buffer. Due to the
lack of check, if you try to abort the userspace app, machine were
hanging, since IRQ were trying to use a buffer that were disallocated.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0cf4daee31d88086cf3508d1d8d1f4e451c27906
Author: Brandon Philips <bphilips at suse.de>
Date: Fri Mar 28 10:18:33 2008 -0700
V4L/DVB (7562): videobuf: Require spinlocks for all videobuf users
A spinlock is necessary for queue_cancel to work with every driver in the tree.
Otherwise a race exists between IRQ handlers removing buffers from the queue
and queue_cancel invalidating the queue.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit aa9479ed508d78dcd06479dc6274c9b02d1398df
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:07:56 2008 -0300
V4L/DVB (7561): videobuf-vmalloc: stop streaming before unmap
Before the patch, there were a risk of freeing and unmapping userspace memory,
while there were pending requests.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d6849652628d3479859ca10bdd4b21024466df5f
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:07:16 2008 -0300
V4L/DVB (7560): videodev: Some printk fixes
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit cb7847249f1b2bad201e38c770ef4401c61c022a
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:06:52 2008 -0300
V4L/DVB (7559): em28xx: Fills the entire buffer, before getting another one
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5e28e00964cdc90dec5ebb4c00dfa2fc1ecf36fa
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:06:24 2008 -0300
V4L/DVB (7558): videobuf: Improve command output for debug purposes
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e9e6040df6c96678d7b776b3902e3b2c6bbfc5a3
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:05:47 2008 -0300
V4L/DVB (7557): em28xx: honour video_debug modprobe parameter
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0ea13e6e59853cab9e8ed3ac231ec5d44d8386a6
Author: Aidan Thornton <makosoft at googlemail.com>
Date: Sun Apr 13 15:02:24 2008 -0300
V4L/DVB (7556): em28xx: fix locking on vidioc_s_fmt_cap
Currently, vidioc_s_fmt_cap is allowed even if streaming is running on some
other fh. This is likely to cause issues.
Block use of vidioc_s_fmt_cap if someone else has claimed access to the device.
Signed-off-by: Aidan Thornton <makosoft at googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b957dfdc3161d00b01b52154eb2d53580c8911e5
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 15:01:12 2008 -0300
V4L/DVB (7555): em28xx: remove timeout
It seems that we don't need a timeout for em28xx.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a9dbbeb7d615761a82fcd4f00ec290a07be7d8a2
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:59:29 2008 -0300
V4L/DVB (7554): videobuf-dma-sg: Remove unused flag
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit aaea56afc31345e7b0456ebb01586ba627ecd0f8
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:58:43 2008 -0300
V4L/DVB (7553): videobuf-vmalloc: fix STREAMOFF/STREAMON
There were a small bug on videobuf-vmalloc that were preventing STREAMOFF to
work. The issue is that vmalloc'ed mmaped memory should only be freed after
being sure that there aren't any mmap usage. Otherwise, the memory remap will
stop working, and the userspace won't receive any frames.
This bug were affecting some userspace applications, like tvtime.
After this patch, tvtime started to work again with the drivers that use
videobuf-vmalloc.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 968ced78a53509a996708a14e8b9269d1dc6a61c
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:58:21 2008 -0300
V4L/DVB (7552): videbuf-vmalloc: Corrects mmap code
There were some bugs on videobuf-vmalloc.
Basically, remap were called with a wrong parameter. Due to that, a later remap
were needed, generating the need of some hacks on videobuf-vmalloc and
videobuf-core.
This patch fixes the remap and removes the hacks.
TODO:
- V4L2_MEMORY_USERPTR is not implemented yet. This method should be
properly implemented, in order to work with a few userspace applications.
- The driver also doesn't implement V4L2_MEMORY_OVERLAY. This method is used
only by a few applications, and are becaming obsolete, due to the increment
of cpu performance. So, most apps prefer to retrieve data to an internal
buffer, doing some processing like de-interlacing.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fbde31d54b729e4aac1d06375d4365318fd88675
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:57:44 2008 -0300
V4L/DVB (7551): vivi: Add a missing \n
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0561297501842b5d7e0ca8805084f4d3f97c1078
Author: Brandon Philips <bphilips at suse.de>
Date: Sun Apr 13 14:57:01 2008 -0300
V4L/DVB (7550): em28xx: Fix a possible memory leak
I did notice a possible memory leak since iolock is could possibly be
called before a buffer has been freed.
This ensure s_fmt isn't called while the queue is busy thereby avoiding
iolock on already allocated buffers.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 78bb3949a965e8a28e20988e28868429606b3639
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:56:25 2008 -0300
V4L/DVB (7549): em28xx: some small cleanups
- Remove dead code;
- Fix a few CodingStyle issues;
- Prints frame number, if debug is enabled.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e0fadfd34dda2205b296b8826acfaaf4df2e022f
Author: Aidan Thornton <makosoft at googlemail.com>
Date: Sun Apr 13 14:56:02 2008 -0300
V4L/DVB (7548): Various fixes for the em28xx videobuf code
- Aborting buffer_filled if no-one's waiting on the waitqueue probably isn't
what we want, since just because no-one's waiting for it now doesn't mean they
wouldn't dequeue it in time. (vivi gets away with this, possibly because it
can fill each buffer much faster.)
- The first BUG_ON(lencopy <= 0); really isn't worth causing a kernel panic
over, especially since there are some reasons why it could trigger in normal use.
- The top and botom frames are actually the wrong way around.
Signed-off-by: Aidan Thornton <makosoft at googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e74153d44a57d9445fb1dfad7c3accbec6d4a873
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:55:38 2008 -0300
V4L/DVB (7547): em28xx: Fix a broken lock
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f245e549f0d1fb43fd6d7759d31cd763e6d914b6
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:41:23 2008 -0300
V4L/DVB (7545): em28xx: Fix CodingStyle errors and most warnings introduced by videobuf
The last videobuf changes introduced several CodingStyle errors. Fixes all those
errors, as reported by checkpatch.pl
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ca21d2dc945c224c3f121f6b5f2436877f029eed
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:40:36 2008 -0300
V4L/DVB (7544): em28xx: Fix timeout code
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 47625da2ab5e98728cdefbd344fb1493c26769ad
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:40:10 2008 -0300
V4L/DVB (7543): Fix capture start/stop and timeout
Also removes the dead restart_video_queue() function
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ea8df7e09d2226c321c234a8f736fdb167a046cb
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:39:29 2008 -0300
V4L/DVB (7542): em28xx: Fix some warnings
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d7aa80207babe694b316a48200b096cf0336ecb3
Author: Aidan Thornton <makosoft at googlemail.com>
Date: Sun Apr 13 14:38:47 2008 -0300
V4L/DVB (7541): em28xx: Some fixes to videobuf
It fixes a couple of minor bugs, comments out a bogus BUG_ON, sets fh->type
correctly, uses dev->width and dev->height for now, and adds a missing spinlock
init (nasty - caused a system lockup). It also adds some debug code which
probably isn't all that useful. I haven't tested this version of the patch yet,
though, so I'm not sure what you can expect if you try it.
Signed-off-by: Aidan Thornton <makosoft at googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ad0ebb96c220c461386e9a765fca3daf5590d01e
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun Apr 13 14:37:52 2008 -0300
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 78e92006f410a4044f8c1760c25ac9d11d259aa2
Author: Janne Grunau <janne-dvb at grunau.be>
Date: Wed Apr 9 19:13:13 2008 -0300
V4L/DVB (7538): Adds selectable adapter numbers as per module option
The adapter_nr module options can be used to allocate static adapter
numbers on a driver level. It avoids problems with changing DVB apapter
numbers after warm/cold boot or device unplugging and repluging.
Each driver holds DVB_MAX_ADAPTER long array of the preferred order of
adapter numbers.
options dvb-usb-dib0700 adapter_nr=7,6,5,4,3,2,1,0 would result in a
reversed allocation of adapter numbers.
With adapter_nr=2,5 it tries first to get adapter number 2 and 5. If
both are already in use it will allocate the lowest free adapter number.
Signed-off-by: Janne Grunau <janne-dvb at grunau.be>
Acked-by: Hermann Pitton <hermann.pitton at arcor.de>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9950c1b5b4b86d4aae12853c2f0a0ef11d976764
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Fri Apr 11 11:29:44 2008 -0300
V4L/DVB (7537): cx88/saa7134: Fix: avoid OOPS on module unload
If frontend is not attached, both cx88-dvb and saa7134-dvb don't
register DVB. However, dvb unregister were inconditionally called.
Due to that, an OOPS is generated.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fb7b37cf913c19dbdbb9bf3e653924e126b4007e
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Wed Apr 9 06:26:17 2008 -0300
V4L/DVB (7535): saa717x: add new audio/video decoder i2c driver
Added the last remaining out-of-tree kernel driver from the ivtv project.
The saa717x is used in several Japanese cards and a Russian card. The
driver is not complete in that only NTSC is supported and no PAL/SECAM.
Hopefully this will be added in the future.
Signed-off-by: Takahiro Adachi <tadachi at tadachi-net.com>
Signed-off-by: Kyuma Ohta <whatisthis at jcom.home.ne.jp>
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b38bf410fed223a48482e499150d4b554526a13a
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Mon Apr 7 08:32:14 2008 -0300
V4L/DVB (7534): ivtv: the upd* modules have to be probed to properly autodetect some cards
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit faea4d2ab2d4710f87739fd53b5c13ca7a7d34aa
Author: Oliver Endriss <o.endriss at gmx.de>
Date: Wed Apr 9 17:49:55 2008 -0300
V4L/DVB (7532): budget: Add support for Fujitsu Siemens DVB-T Activy Budget
Implement support for Fujitsu Siemens DVB-T Activy Budget, sub-system id 0x1131:0x5f61.
Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c4e3bcb688dd561ae219a957e0d924f718335cab
Author: Christoph Pfister <pfister at linuxtv.org>
Date: Wed Apr 9 17:37:36 2008 -0300
V4L/DVB (7531): budget-av: Fix CI interface on (some) KNC1 DVBS cards
Quoting the commit introducing reinitialise_demod (3984 / by adq):
"These cards [KNC1 DVBT and DVBC] need special handling for CI - reinitialising the frontend
device when the CI module is reset."
Apparently my 1894:0010 also needs that fix, because once you initialise CI/CAM you lose lock.
Signed-off-by: Christoph Pfister <pfister at linuxtv.org>
Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8727073beff795ec0c9cb18833431d0b606f8264
Author: Christoph Pfister <pfister at linuxtv.org>
Date: Wed Apr 9 17:34:09 2008 -0300
V4L/DVB (7530): budget-av: Fix support for certain cams
The current ci implementation doesn't accept 0xff when reading data bytes (address == 0),
thus breaks cams which report a buffer size of 0x--ff like my orion one.
Remove the 0xff check altogether, because validation is really the job of a higher layer.
Signed-off-by: Christoph Pfister <pfister at linuxtv.org>
Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d5a50e498603f5fa78e0373c389e2d2c3c13d709
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7529): media/video/zc0301 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4126a8f5c209ba8138619311c1c8e73d361d9700
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7528): media/video/usbvideo replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a79d13b3aa0226630ee639e6a2e98a4bda1afd4d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7527): media/video/sn9c102 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5016381c33d63f23c43416b9c8421b1eeaa1b515
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7526): media/video/saa7134 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 645635b002311fafffd1b8f4e2e8200639fb7629
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7525): media/video/pwc replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 12aa67a63d2bf4e6500af6b2de40d18fa0bc1360
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7524): media/video/ovcamchip replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 22cc065bad19b0a19adecdc753ded7a7b0c752fa
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7523): media/video/et61x251 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d80e134dc8e7e078248f7966a6884858f7ab185f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7522): media/video/em28xx replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 32d83efc1c9e290b3d4627c6ec40529eafa89b46
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7521): media/video/cx88 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 22b4e64f0a119e94090ef45285a5c311f1f6855f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7520): media/video/cx23885 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 94205c7a48b637ae60bd69ac4cc16743a6dddd09
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7519): media/video/cpia2 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7e28adb2497f6b873516163e2d29210c11777613
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7518): media/video/ replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e9815ceea9733dfb236629f5b72f2e6486f66242
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7517): media/dvb/ttusb-dec replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fb9393b519fb27714d14625bc3042b669933e81a
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7516): media/dvb/ttusb-budget replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3ca7fc84e37c5cf446fe4137f885f74e71373d7f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7515): media/dvb/ttpci replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 271ddbf702c3a4e6b18f6464180eda0f62efd9a5
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7514): media/dvb/frontends replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 708bebdd3922c6f346b8540f93c73f006d2b947b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7513): media/dvb/dvb-usb replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 46b4f7c176a2dd4c60ddb7c80bd09ea2f3220674
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7512): media/dvb/dvb-core replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0592e8d3485c4976eaa6db8084e00b0132a34d7e
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7511): media/dvb/cinergyT2 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b2e62e7cdb8022087ae2def06f8023c9f5d3b411
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7510): media/dvb/bt8xx replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7bca4498f6ec331c2ace79824da8687ad35cd65c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7509): media/dvb/b2c2 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 536a0b119527c8af8e3a70b18f7640a21039a0a7
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 8 23:20:00 2008 -0300
V4L/DVB (7508): media/common/ replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fc9d8ed418619da915ad8a225fa974d813d0ca34
Author: Matthias Schwarzott <zzam at gentoo.org>
Date: Tue Apr 8 21:45:08 2008 -0300
V4L/DVB (7507): saa7134: add analog support for Avermedia A700 cards
Add support for composite and s-video inputs on
Avermedia DVB-S Pro and DVB-S Hybrid+FM cards
(both labled A700) to the saa7134 driver.
XC2028 support for Hybrid+FM is still missing.
Signed-off-by: Matthias Schwarzott <zzam at gentoo.org>
Reviewed-by: Hermann Pitton <hermann.pitton at arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ba928034df7e8b603152c896a2f84f9b12e8c290
Author: Dâniel Fraga <fragabr at gmail.com>
Date: Tue Apr 8 19:56:44 2008 -0300
V4L/DVB (7506): Powercolor Real Angel 330 (remote control support)
The attached patch adds complete remote control support for Powercolor Real
Angel 330.
Signed-off-by: Daniel Fraga <fragabr at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ab364983087152e53676d914141f30e83ead12ff
Author: Dâniel Fraga <fragabr at gmail.com>
Date: Tue Apr 8 19:54:49 2008 -0300
V4L/DVB (7505): Powercolor Real Angel 330 (fixes gpio references)
The attached patch fixes gpio references for Powercolor Real Angel 330.
Signed-off-by: Daniel Fraga <fragabr at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit df18c3196a1ec1db7a20997d3246a5a8cf535a77
Author: Thierry MERLE <thierry.merle at free.fr>
Date: Fri Apr 4 21:00:57 2008 -0300
V4L/DVB (7503): usbvision: rename __PRETTY_FUNCTION__ occurrences
__PRETTY_FUNCTION__ has no sense in C lang context. Rename it as __func__
Signed-off-by: Thierry MERLE <thierry.merle at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d2db42dd4eb53b86a40b96b0b12a7b2d12377bdd
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 4 20:50:07 2008 -0300
V4L/DVB (7502): v4l: video/usbvision replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Thierry MERLE <thierry.merle at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1a0063a9852380190a7172c1a1cb79e934b06cd4
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Fri Apr 4 13:46:34 2008 -0300
V4L/DVB (7501): soc-camera: use a spinlock for videobuffer queue
All drivers should provide a spinlock to be used in videobuf operations.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Reviewed-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b8d9904c3525c0a149976ffaad48fcb03e8703f7
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Fri Apr 4 13:41:25 2008 -0300
V4L/DVB (7500): soc-camera: extract function pointers from host object into operations
Function pointers and the driver owner are not expected to change
throughout soc-camera host's life. Extract them into an operations struct.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ce54093cefd64c1a2cb6b8c5ed1d68d2bd7a34ab
Author: Brandon Philips <brandon at ifup.org>
Date: Wed Apr 2 18:10:59 2008 -0300
V4L/DVB (7494): videobuf-dma-sg.c: Avoid NULL dereference and add comment about backwards compatibility
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 137d1cb19d9da163ce6cb57a6fa1e6a3468af6a4
Author: Brandon Philips <brandon at ifup.org>
Date: Wed Apr 2 18:10:59 2008 -0300
V4L/DVB (7493): videobuf: Avoid deadlock with QBUF and bring up to spec for empty queue
Add a waitqueue to wait on when there are no buffers in the buffer queue.
DQBUF waits on this queue without holding vb_lock to allow a QBUF to happen.
Once a buffer has been queued we recheck that the queue is still streaming and
wait on the new buffer's waitqueue while holding the vb_lock. The driver
should come along in a timely manner and put the buffer into its next state
finishing the DQBUF.
By implementing this waitqueue it also brings the videobuf DQBUF up to spec and
it now blocks on O_NONBLOCK even when no buffers have been queued via QBUF:
"By default VIDIOC_DQBUF blocks when no buffer is in the outgoing queue."
- V4L2 spec
Signed-off-by: Brandon Philips <bphilips at suse.de>
CC: Trent Piepho <xyzzy at speakeasy.org>
CC: Carl Karsten <carl at personnelware.com>
CC: Jonathan Corbet <corbet at lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 78718e5d44cd450431d5b16ee36d3a7de1db6dfa
Author: Brandon Philips <brandon at ifup.org>
Date: Wed Apr 2 18:10:59 2008 -0300
V4L/DVB (7492): vivi: Simplify the vivi driver and avoid deadlocks
vivi previously had a very complex queuing system and held spinlocks while
doing copy_to_user, kmalloc, etc. This caused the driver to easily deadlock
when a multi-threaded application used it and revealed bugs in videobuf too.
This replaces the copy_to_user with memcpy since we were never copying to user
space addresses. And makes the kmalloc atomic.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit aa9dbac426d263b5b86d1684993d18ae187d7588
Author: Brandon Philips <brandon at ifup.org>
Date: Wed Apr 2 18:10:59 2008 -0300
V4L/DVB (7491): vivi: make vivi openable only once
vivi currently doesn't have the infrastructure to handle being opened more than
one time and will crash if it is. So, make it openable only once.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit cbcb565f74cf01d680f83af531490bb2c5375af0
Author: Brandon Philips <brandon at ifup.org>
Date: Wed Apr 2 18:10:59 2008 -0300
V4L/DVB (7489): videobuf-vmalloc.c: Remove buf_release from videobuf_vm_close
Remove the buf_release on vm_close because it will lead to a buffer being
released multiple times since all buffers are already freed under the two
possible cases: device close or STREAMOFF.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 009a90597e177320e47154dd0817d201f52bcd46
Author: Brandon Philips <brandon at ifup.org>
Date: Wed Apr 2 18:10:59 2008 -0300
V4L/DVB (7488): videobuf: Simplify videobuf_waiton logic and possibly avoid missed wakeup
Possible missed wakeup- use kernel helpers for wait queues
http://www.mail-archive.com/linux-usb-devel@lists.sourceforge.net/msg27983.html
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b608f4323a0e0440d18fa13aea3db98351137487
Author: Brandon Philips <brandon at ifup.org>
Date: Wed Apr 2 18:10:57 2008 -0300
V4L/DVB (7487): videobuf: Wakeup queues after changing the state to ERROR
The waitqueues must be woken up every time state changes.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8eb8ff3870ede23b2328ef376023a3542efcb9a5
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun Mar 30 17:00:45 2008 -0300
V4L/DVB (7483): tuner-simple: fix broken build dependency
tuner-simple is the only module that uses tuner-types - these will be
merged to a single module in the future. For now, build both of them
if TUNER_SIMPLE is selected.
This fixes the following build warning, if tuner-simple is selected
without tuner-types:
WARNING: "tuner_count" [tuner-simple.ko] undefined!
WARNING: "tuners" [tuner-simple.ko] undefined!
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c735372f5df2dc7b67080881bdc613d199173abf
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun Mar 30 19:40:20 2008 -0300
V4L/DVB (7481): tda18271: fix standard map debug
Show IF level and rf agc top settings in standard map dumps.
Dump standard map during attach if DBG_MAP or DBG_ADV is set.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 762250f884cb927c7f1da4e24052ec43e000d53f
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun Mar 30 23:29:02 2008 -0300
V4L/DVB (7480): make sn9c102_i2c_try_write() static
This patch makes the needlessly global sn9c102_i2c_try_write() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
CC: Luca Risolia <luca.risolia at studio.unibo.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d9aedf1fe88c04500fec269557a968e3320dd4b8
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun Mar 30 23:28:59 2008 -0300
V4L/DVB (7479): proper prototype for zoran_device.c:zr36016_write()
This patch adds a proper prototype for zr36016_write() in
drivers/media/video/zoran_card.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5da4e2c645e4324f63fd87a0f93e3d0ad6619798
Author: Darryl Green <darryl.green at aanet.com.au>
Date: Sat Mar 29 21:47:43 2008 -0300
V4L/DVB (7476): New USB ID for Leadtek DVB-T USB
Detect Leadtek Winfast USB DTV Dongle with ID of 0x6f01
Signed-off-by: Darryl Green <darryl.green at aanet.com.au>
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit dc88807ed61ed0fc0d57bd80a92508b9de638f5d
Author: Alexander Simon <alexander.simon at informatik.tu-muenchen.de>
Date: Sat Mar 29 21:37:54 2008 -0300
V4L/DVB (7475): Added support for Terratec Cinergy T USB XXS
Alexander Simon found out that the Terratec Cinergy T USB XXS is just a clone of another DiB7070P-based device.
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 58e6f95e613b37372a58fd504646ae1b1964c2ed
Author: Patrick Boettcher <pb at linuxtv.org>
Date: Sat Mar 29 21:37:01 2008 -0300
V4L/DVB (7474): support key repeat with dib0700 ir receiver
This patch enables support for repeating last event when a key is holded
down with dib0700 devices. It works with rc5 and nec remotes.
It also fixes an annoying bug that floods kernel log with "Unknown key"
messages after each keypress. This happened because the driver was not
resetting infrared register after each poll so it kept polling last key
even if nothing was being pressed. Fixing this, (calling rc_setup after
each poll), permits to implement key repeat.
Signed-off-by: Filippo Argiolas <filippo.argiolas at gmail.com>
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6ca8f0b97473dcef3a754bab5239dcfcdd00b244
Author: Albert Comerma <albert.comerma at gmail.com>
Date: Sat Mar 29 21:35:57 2008 -0300
V4L/DVB (7473): PATCH for various Dibcom based devices
This patch introduces support for dvb-t for the following DiBcom based cards:
- Terratec Cinergy HT USB XE (USB-ID: 0ccd:0058)
- Terratec Cinergy HT Express (USB-ID: 0ccd:0060)
- Pinnacle 320CX (USB-ID: 2304:022e)
- Pinnacle PCTV72e (USB-ID: 2304:0236)
- Pinnacle PCTV73e (USB-ID: 2304:0237)
- Yuan EC372S (USB-ID: 1164:1edc)
Signed-off-by: Hans-Frieder Vogt <hfvogt at gmx.net>
Signed-off-by: Felix Apitzsch <F.Apitzsch at soz.uni-frankfurt.de>
Signed-off-by: Antti Palosaari <crope at iki.fi>
Signed-off-by: Albert Comerma <albert.comerma at gmail.com>
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8c899bce2a5540b19e86dd3b355e5699657da144
Author: Andre Weidemann <Andre.Weidemann at web.de>
Date: Sat Mar 29 21:30:49 2008 -0300
V4L/DVB (7472): reworked patch to support TT connect S-2400
Added support for Technotrend connect S-2400.
Signed-off-by: Andre Weidemann <Andre.Weidemann at web.de>
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ca06fa79a5babc21f0240979e5b1dd34dcc3c6e4
Author: Patrick Boettcher <pb at linuxtv.org>
Date: Sat Mar 29 21:01:12 2008 -0300
V4L/DVB (7470): CX24123: preparing support for CX24113 tuner
To support a new device based on CX24123 (using the CX24113-tuner) the following was done:
- added two parameters to de-select the internal PLL-driver (for CX24108) and a AGC-function callback.
- added a virtual i2c-adapter which allow simple access behind the i2c-gate
- cleanup up some code
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6394cf53abc0b3a2db9e8b947ef5c77b16861ec8
Author: Patrick Boettcher <pb at linuxtv.org>
Date: Sat Mar 29 20:49:57 2008 -0300
V4L/DVB (7469): Preparation for supporting new devices, cleanup and saneness
To prepare the support for new device to the flexcop-family some preparation and cleanups was done + some saneness:
- created an i2c-adapter for each i2c-port available. Easier usage for devices with several device on different i2c-busses
- initialize i2c before doing the eeprom read
- changed the way to attach the different frontends, easier to read now
- enabled support for i2c-devices having no register address (1-byte access)
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0b5afdd2ea5f52d260d1e42d43fb0fa09ec0da2f
Author: Frej Drejhammar <frej.drejhammar at gmail.com>
Date: Sun Mar 23 22:43:25 2008 -0300
V4L/DVB (7463): cx88: Enable color killer by default
An enabled color killer will not degrade picture quality for color
input signals, only suppress bogus color information on
black-and-white input. Therefore enable it by default.
Signed-off-by: Frej Drejhammar <frej.drejhammar at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d69b2e41a5f6d934d01cc62f314697a60356b466
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 1 20:30:24 2008 -0300
V4L/DVB (7462): bttv: Fix some API non-compliances for some audio/input V4L2 calls
Thanks to Cyrill Gorcunov <gorcunov at gmail.com> for pointing this
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7bf9746d936740f9797c810ad75411a6cdeb9f2f
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Thu Mar 27 23:51:05 2008 -0300
V4L/DVB (7459): Test cmd, not definition in decoder_command(), drivers/media/video/zoran_device.c
include/linux/video_decoder.h:
34:#define DECODER_SET_NORM _IOW('d', 3, int)
35:#define DECODER_SET_INPUT _IOW('d', 4, int)
untested, please confirm it's right.
Test cmd value, not definition of DECODER_SET_INPUT
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 95a2fdb6f78c020026b4fa82be506ef92961a9f6
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Fri Mar 28 17:52:44 2008 -0300
V4L/DVB (7458): saa7134: Adds analog support for Avermedia A16D
Thanks to timf <timf at iinet.net.au>, "Richard (MQ)" <osl2008 at googlemail.com> and
gian luca rasponi <lucarasp at inwind.it> for their tests.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit cf8267ff100dd8466fe631f7172969945b654e3f
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Fri Mar 28 17:45:51 2008 -0300
V4L/DVB (7456): vivi: Add 32bit compatibility to the module
Thanks to Jiri Slaby <jirislaby at gmail.com> for pointing this issue.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0b86755f57bd2cc92d05ba3a613ab6ff44f09980
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Fri Mar 28 14:21:04 2008 -0300
V4L/DVB (7455): cx88_dvb: qam doesn't apply on Kword ATSC 120
Thanks to Michael Krufky for pointing this.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1b879c43811933514130421548fff7640e84d8e5
Author: Frej Drejhammar <frej.drejhammar at gmail.com>
Date: Sun Mar 23 22:43:24 2008 -0300
V4L/DVB (7454): cx88: Add user control for color killer
The cx2388x family has a color killer. This patch implements the
V4L2_CID_COLOR_KILLER control for the cx2388x family. By default the
color killer is disabled, as in previous versions of the driver.
Signed-off-by: "Frej Drejhammar <frej.drejhammar at gmail.com>"
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a8ac688938b89ab0fa8ffe16da0facdc73a70588
Author: Frej Drejhammar <frej.drejhammar at gmail.com>
Date: Sun Mar 23 22:43:23 2008 -0300
V4L/DVB (7453): v4l2-api: Define a standard control for color killer functionality
Define a pre-defined control ID for color killer functionality.
Signed-off-by: "Frej Drejhammar <frej.drejhammar at gmail.com>"
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 87a1738919ef028d16c462437e1480fc67338cd3
Author: Frej Drejhammar <frej.drejhammar at gmail.com>
Date: Sun Mar 23 22:43:22 2008 -0300
V4L/DVB (7452): cx88: Enable chroma AGC by default for all non-SECAM modes
An enabled chroma AGC will not degrade picture quality if enabled on a
color PAL or NTSC signal with nominal signal levels. It will give a
significant color reproduction improvement if the chroma signals
diverge from nominal levels. Therefore enable chroma AGC by default
for PAL and NTSC standards.
Signed-off-by: "Frej Drejhammar <frej.drejhammar at gmail.com>"
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6d04203c7f49a4d93304b5754de5457297fa04eb
Author: Frej Drejhammar <frej.drejhammar at gmail.com>
Date: Sun Mar 23 22:43:21 2008 -0300
V4L/DVB (7451): cx88: Add user control for chroma AGC
The cx2388x family has support for chroma AGC. This patch implements a
the V4L2_CID_CHROMA_AGC control for the cx2388x family. By default
chroma AGC is disabled, as in previous versions of the driver.
Signed-off-by: "Frej Drejhammar <frej.drejhammar at gmail.com>"
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1c412d1236b98bfc59fc694238cd26e6ed7f4f4b
Author: Frej Drejhammar <frej.drejhammar at gmail.com>
Date: Sun Mar 23 22:43:20 2008 -0300
V4L/DVB (7450): v4l2-api: Define a standard control for chroma AGC
Define a pre-defined control ID for chroma automatic gain control.
Signed-off-by: "Frej Drejhammar <frej.drejhammar at gmail.com>"
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b12203d253732d282dd97909a1424016694183e9
Author: Marton Balint <cus at fazekas.hu>
Date: Wed Mar 26 02:07:35 2008 -0300
V4L/DVB (7449): cx88: fix oops on module removal caused by IR worker
If the IR worker is not stopped before the removal of the cx88xx module,
an OOPS may occur, because the worker function cx88_ir_work gets called.
So stop the ir worker.
Signed-off-by: Marton Balint <cus at fazekas.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 99e09eac25f752b25f65392da7bd747b77040fea
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Thu Mar 27 23:18:30 2008 -0300
V4L/DVB (7448): Add support for Kworld ATSC 120
This board has a s5h1409 demod, plus a xc30x8 tuner (probably, xc3018).
This patch adds proper support for radio, video, s-video, composite and ATSC.
However, support for radio and video depends on having s5h1409 i2c gate open,
otherwise, xc30x8 chip won't be visible.
For a better support, some rework is needed on cx88 driver, to allow adding
xc30x8 to i2c bus without sending i2c 0 byte reading to 0xc2 address.
Thanks to Vanessa Ezekowitz <vanessaezekowitz at gmail.com> for helping to figure
out the proper parameters for s5h1409 and the GPIO pins used by each
configuration.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a2401d9eed955d90e682b911c343d7fb4ad22436
Author: Mike Isely <isely at pobox.com>
Date: Sat Mar 8 04:02:20 2008 -0300
V4L/DVB (7447): pvrusb2: Fix compilation warning
Fix use of a non-int (size_t) being passed in a printf width field.
This benign issue has apparently been around for a long time, but went
undetected until now.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2c4963d4fb6103c0589db411fccf5e4f8531f173
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:25 2008 -0300
V4L/DVB (7441): kconfig fixes for tuner-simple
Update Kconfig for the hybrid devices recently converted
to use tuner-simple rather than dvb-pll.
dvb-bt8xx no longer uses dvb-pll at all, so remove all
references to dvb-pll within that driver.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a03402d8ad1638a0a88c5091a189be146c1ee261
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:25 2008 -0300
V4L/DVB (7440): dvb-bt8xx: fix build error
Fix the following build error:
In file included from dvb-bt8xx.c:35:
dvb-bt8xx.h:42:26: error: tuner-simple.h: No such file or directory
dvb-bt8xx.c: In function 'frontend_init':
dvb-bt8xx.c:612: error: 'simple_tuner_attach' undeclared (first use in this function)
dvb-bt8xx.c:612: error: (Each undeclared identifier is reported only once
dvb-bt8xx.c:612: error: for each function it appears in.)
dvb-bt8xx.c:612: warning: type defaults to 'int' in declaration of '__a'
dvb-bt8xx.c:612: warning: type defaults to 'int' in declaration of 'type name'
dvb-bt8xx.c:612: warning: cast from pointer to integer of different size
dvb-bt8xx.c:612: warning: type defaults to 'int' in declaration of 'type name'
dvb-bt8xx.c:612: warning: cast from pointer to integer of different size
dvb-bt8xx.c:612: error: called object '__a' is not a function
dvb-bt8xx.c:696: warning: type defaults to 'int' in declaration of '__a'
dvb-bt8xx.c:696: warning: type defaults to 'int' in declaration of 'type name'
dvb-bt8xx.c:696: warning: cast from pointer to integer of different size
dvb-bt8xx.c:696: warning: type defaults to 'int' in declaration of 'type name'
dvb-bt8xx.c:696: warning: cast from pointer to integer of different size
dvb-bt8xx.c:696: error: called object '__a' is not a function
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5c913c0571034fc08d9a27f4aa3175142352acf6
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:24 2008 -0300
V4L/DVB (7439): tuner-xc2028: Adds an option to allow forcing to load an specific firmware name
There are a number of different firmware versions and variants, shipped
together with boards.
This patch adds an extra parameter to the tuner-xc2028 to allow specifying for
an specific firmware name to be loaded. This helps to test for a firmware that
better fits some board.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5ec96b0c80eced33e7bf69a2d29c044d6dbe9bf5
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:23 2008 -0300
V4L/DVB (7437): tda18271: increment module version minor
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 868f5ccd64113d070f09ecf2827a69b81c95ed9d
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:23 2008 -0300
V4L/DVB (7436): tda18271: add basic support for slave tuner configurations
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4efb0ca5d00f2c7a8bf9632556a4b4330cf409c5
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:23 2008 -0300
V4L/DVB (7435): tda18271: add function tda18271_charge_pump_source
Force the main pll charge pump or cal pll charge pump to source current
to the main pll loop filter or cal pll loop filter, respectively.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 40194b2b1bdd01358c1e9b5a9b8dd78390cc05f7
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:22 2008 -0300
V4L/DVB (7434): tda18271: set rfagc modes during channel configuration
Set rfagc to high speed mode before setting the pll.
Set rfagc to normal speed mode at the end of the function.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e7809a07663f868f596b5f08a63db9a32240502c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:22 2008 -0300
V4L/DVB (7433): tda18271: fix comparison bug in tda18271_powerscan
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c0dc0c1122b585193dd6650c749e919542dd3e23
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:22 2008 -0300
V4L/DVB (7432): tda18271: allow device-specific configuration of rf agc top
allow device-specific configuration of rf agc rf top and if top
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 14c74b23b6b5a8259c25c8f825e3036f595518d0
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:21 2008 -0300
V4L/DVB (7431): tda18271: allow device-specific configuration of IF level
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ae07d042f626caa13d5a8a15ac7297b2873f7622
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:21 2008 -0300
V4L/DVB (7430): tda18271: fix typo in tda18271_calibrate_rf
The internal calibration signal must be set on the cal pll.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e83ebb64eff4636a5eab06a6cc493ab51e900ed0
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:21 2008 -0300
V4L/DVB (7429): tda18271: write EP3 thru MD3 for image rejection low band initialization
Both the tda18271 c1 and c2 parts only need EP3 through MD3 to be written for
the image rejection calibration's low band initialization.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0c3ea9941c4957e4a9c229878bd13a39ac4d0e4b
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:20 2008 -0300
V4L/DVB (7427): dvb-pll: remove rf input module options
The ability to select RF input was a supported feature only available on
Philips TUV1236d and Philips FCV1236d.
This feature, along with support for the tuners that used it,
was moved into the tuner-simple module.
This can now be removed from dvb-pll.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b6fd549e50e11d91057dc367fa8f9d1352b145be
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:20 2008 -0300
V4L/DVB (7426): dvb-pll: renumber remaining description id's
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5e8556de79c509ea2ff3c3be19d3930f9ab5af54
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:20 2008 -0300
V4L/DVB (7425): dvb-pll: remove dead code
remove #if 0'd support for:
Philips TUV1236D
Philips TD1316
Philips FMD1216ME
LG TDVS-H06xF
Philips FCV1236D
Thomson FE6600
Microtune 4042 FI5
Thomson dtt761x
Support for these tuners has been moved into the 'tuner-simple' module.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b7f81b2058625b6fe90c9265aabbf0d3bdc15874
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:20 2008 -0300
V4L/DVB (7424): dvb-pll: remove support for Philips TUV1236D
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ad561caafaa02b2e1dfe25f6bae03806051992eb
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:19 2008 -0300
V4L/DVB (7423): dvb-pll: remove support for Philips TD1316
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 92d1069f3cfbe4da07d9cf5b1cb29930e6277def
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:19 2008 -0300
V4L/DVB (7422): dvb-pll: remove support for Philips FMD1216ME
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 75a791925da909d489ef323e3a540ad1f1bca54f
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:19 2008 -0300
V4L/DVB (7421): dvb-pll: remove support for LG TDVS-H06xF
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 89418750f71b5b9bed7bd2bd8572fc54b049e1d5
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:18 2008 -0300
V4L/DVB (7420): dvb-pll: remove support for Philips FCV1236D
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7b844d75dcbf48f22838df41b47d7b387533170f
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:18 2008 -0300
V4L/DVB (7419): dvb-pll: remove support for Thomson FE6600
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 53f2dd33147c3040e56d4d7a99a876e07b2bc6ac
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:17 2008 -0300
V4L/DVB (7418): dvb-pll: remove support for Microtune 4042 FI5
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 15b3feb73556208aec71569a6ccf9d8147ae6147
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:17 2008 -0300
V4L/DVB (7417): dvb-pll: remove support for Thomson dtt761x
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 24d3980c3a4e073ade5e053d79864bf906c1e481
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:17 2008 -0300
V4L/DVB (7416): dvb-pll: remove support for Thomson dtt7610
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 62ff817a04a5a08074c0391bdbf7bab48bdaa80e
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:17 2008 -0300
V4L/DVB (7415): use tuner-simple for Philips TUV1236D digital tuning support
Convert cx88-dvb and saa7134-dvb to use tuner-simple instead of dvb-pll
for Philips TUV1236D
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fb147e9755055b1b73b22c3efe87bec075ad3caa
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:16 2008 -0300
V4L/DVB (7414): use tuner-simple for Philips TD1316 digital tuning support
Convert saa7134-dvb to use tuner-simple instead of dvb-pll for Philips TD1316
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit cb89cd332d2f160623c92473945f729d43a70af0
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:16 2008 -0300
V4L/DVB (7413): use tuner-simple for Philips FMD1216ME digital tuning support
Convert cxusb, cx88-dvb and saa7134-dvb to use tuner-simple instead of
dvb-pll for Philips FMD1216ME
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 827855d39761889aecc7c29385d9c4989b43d01d
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:16 2008 -0300
V4L/DVB (7412): use tuner-simple for LG TDVS-H06xF digital tuning support
Convert cx88-dvb, dvb-bt8xx, b2c2-flexcop, cxusb and cx23885 to use
tuner-simple instead of dvb-pll for LG TDVS-H06xF
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 967be9a9cd2de3f87dbf960620860143a50c1b64
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:13 2008 -0300
V4L/DVB (7411): use tuner-simple for Philips FCV1236D digital tuning support
Convert dvb-bt8xx to use tuner-simple instead of dvb-pll for Philips FCV1236D
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0efad8127ac4b32af780d722258b42cfae02cdf2
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:13 2008 -0300
V4L/DVB (7410): use tuner-simple for Thomson FE6600 digital tuning support
Convert cx88-dvb to use tuner-simple instead of dvb-pll for Thomson FE6600
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7e35c9ff1362aa4deb0b0a803d661920dcdd6f48
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:13 2008 -0300
V4L/DVB (7409): use tuner-simple for Microtune 4042 FI5 digital tuning support
Convert cx88-dvb to use tuner-simple instead of dvb-pll for Microtune 4042 FI5
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0df31f8330bdaebde5411018f0142cca06ca23a3
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:13 2008 -0300
V4L/DVB (7408): use tuner-simple for Thomson DTT 761X digital tuning support
Convert cx88-dvb to use tuner-simple instead of dvb-pll for Thomson DTT 761X
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 65511611dd0a5219b431a8a08cff6f8f7ab83aa5
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:12 2008 -0300
V4L/DVB (7407): tuner-simple: add module options to specify rf input
Add module options to tuner-simple, called "atv_input" and "dtv_input"
to specify which rf input to use on devices with multiple rf inputs.
If the module option is not specified, then the driver will autoselect
the rf input, as per previous behavior.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 26f1b942156766c6ff1a70fb2ac463c6fce31309
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Mon Mar 24 12:18:36 2008 -0300
V4L/DVB (7406): soc-camera: improve separation between soc_camera_ops and soc_camera_device
In case of muliple cameras, handled by the same driver, they can support
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8be38c815e181402c777e033f40971a7be19cf8b
Author: Douglas Schilling Landgraf <dougsland at gmail.com>
Date: Tue Apr 22 14:46:12 2008 -0300
V4L/DVB (7404): saa7134.h: Remove unnecessary validation
Removed unnecessary VIDIOC_G_PRIORITY validation.
Signed-off-by: Douglas Schilling Landgraf <dougsland at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 078ff7953448163d8779e489bd0119dd9a9b4732
Author: Douglas Schilling Landgraf <dougsland at gmail.com>
Date: Tue Apr 22 14:46:11 2008 -0300
V4L/DVB (7402): add macro validation for v4l_compat_ioctl32
Added macro CONFIG_COMPAT for v4l_compat_ioctl32.
Signed-off-by: Douglas Schilling Landgraf <dougsland at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 03dea86de2243d5b3932604b799be26efeff010d
Author: Tobias Lorenz <tobias.lorenz at gmx.net>
Date: Tue Apr 22 14:46:11 2008 -0300
V4L/DVB (7401): radio-si470x: unplugging fixed
This patch fixes several kernel oops, when unplugging device while it is in
use:
Basically the patch delays freeing of the internal variables in
si470x_usb_driver_disconnect, until the the last user closed the device in
si470x_fops_release. This was implemented a while ago with the help of Oliver
Neukum.
I tested the patch five times (unplugging while in use) without oops coming
from the radio-si470x driver anymore. A remaining oops was coming from the
usbaudio driver, but this is someone else task. Hopefully this fixed all
unplugging issues.
Signed-off-by: Tobias Lorenz <tobias.lorenz at gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b412ba781adcb484e8d9b19b30ae1d3a6b8c7d29
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:11 2008 -0300
V4L/DVB (7399): Removes video_dev from tuner-xc2028 config struct
The video_dev parameter, on tuner-xc2028 were used to pass i2c private data to
tuner_callback. Since the driver already have a pointer to i2c_adap->algo_data,
uses this instead.
This parameter were used also as a magic number to idenfity if two drivers are
trying to register the same xc3028 tuner. This occurs with boards with DVB
support, where both DVB and V4L drivers will share the same tuner.
Instead of using the algo_data as a private number, after this patch, the
driver will use i2c_adap->dev, with seems more consistent.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0be51b4671b3ae3ae544a0bb3d15b55478b55e72
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:10 2008 -0300
V4L/DVB (7398): Adds an error if priv argument of tuner_callback is NULL
Adds a consistency check to avoid OOPS, if tuner_callback priv argument is
NULL. Also, simplifies callback codes on cx88.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0fea03fbd3aeaa9b4a4de8409e5ef3aca43a6d0b
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:46:10 2008 -0300
V4L/DVB (7396): saa7134: fixed pointer in tuner callback
The pointer transferred directly points to the saa7134_dev
structure
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e9c1ac9d8d75eaf15126e38cc7d09db03d1a3fd6
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:46:10 2008 -0300
V4L/DVB (7395): saa7134: start 2nd LND supply of Medion cards only if needed
The ISL6405 LNB supply is used on several Creatix / Medion cards. But only
the MD8800 needs its second section. So don't start it unless it is needed.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a4df8e1d6ae460546dfa3b4f23a85cb5a4255109
Author: Alan McIvor <alan.mcivor at reveal.co.nz>
Date: Tue Apr 22 14:46:09 2008 -0300
V4L/DVB (7394): saa7134: add number of devices check
This patch fixes reported problems when trying to add a 9th device into a
system.
Signed-off-by: Alan McIvor <alan.mcivor at reveal.co.nz>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7bff4b4d3ad2b9ff42b4087f409076035af1d165
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:46:08 2008 -0300
V4L/DVB (7393): tda827x: fixed support of tuners with LNA
Tuner refactoring broke support of tuners with LNA configurations 1 and 2
for both, analog TV and DVB-T.
Additionally, this patch initializes the saa713x gpios defined by the gpiomask
at driver init to avoid undefined stated at dvb.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5823b3a63c7661272ea7fef7635955e2a50d17eb
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:46:08 2008 -0300
V4L/DVB (7392): saa7134: support 2nd DVB-S section of the MD8800
There are some restrictions:
- The 2nd DVB-S section will only work if the 1st is configured for DVB-S too.
so "options saa7134-dvb use_frontend=0,1" won't work.
- Currently it is not possible to set the higher LNB supply voltages, so
14V instead of 13V in the 2nd section.
- It is not possibe to turn off the 2nd LNB supply independently.
This comes from the problem that the 2nd section can't access the i2c interface
of the LNB supply chip.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 637afdb563a0801b6983650f889c64c074111776
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:46:08 2008 -0300
V4L/DVB (7391): saa7134: Add DVB-S support for the MD 1734 cards with 2 saa7134
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 867bc6cccc511ccbf40609ccb6ede2aafdeb922e
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:46:07 2008 -0300
V4L/DVB (7390): saa7134: clear audio DSP interface after access error
In the case of an access error to the high latency registers of
the audio DSP, the interface needs to be cleared, otherwise a cascade
of errors occurs.
This patch is closely modeled after a proposal by Mirek Slugen
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c1e6393e24e0fcc8047db18dce05758c3fd54515
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Apr 22 14:46:07 2008 -0300
V4L/DVB (7389): git-dvb: drivers/media/video/bt8xx/bttv-cards.c: fix warnings
drivers/media/video/bt8xx/bttv-cards.c:3030:38: warning: "/*" within comment
drivers/media/video/bt8xx/bttv-cards.c:3032:20: warning: "/*" within comment
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6e741713913fd28f8291fddb3d32d9353f1f0472
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:07 2008 -0300
V4L/DVB (7388): saa7134: fix radio entry for xc2028/3028 boards
If left in blank, the driver will use value 0 (Temic PAL)
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d9ae6dd76325d26a68068f7d8c78e0c7ec7e8f3e
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:06 2008 -0300
V4L/DVB (7387): saa7134: Fix xc3028 entries
Tuner addresses were incorrect. Fix the entries.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7f7203df3f7d056e5f3c4419c6ab3835f44b288c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:06 2008 -0300
V4L/DVB (7385): tda18271: store agc_mode configuration independently of std_bits
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c293d0a72ecb9dd09037cdf4a9089e455404cf4a
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:06 2008 -0300
V4L/DVB (7384): tda18271: store FM_RFn setting in struct tda18271_std_map_item
All standard related configuration is stored within
struct tda18271_std_map_item. Pass a pointer to this
structure rather than its individual members.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5555309c9adcf9bb7f6b449ef45b09d5c26ef4ae
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:06 2008 -0300
V4L/DVB (7383): tda18271: add attach-time parameter to limit i2c transfer size
Add attach-time parameter, "small_i2c" to limit i2c transfer size to write
at most 16 registers at a time during initialization.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ab8b870e430d3e2cfb299f81e0ae0aef7fe5bfda
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:05 2008 -0300
V4L/DVB (7381): tuner: rename TUNER_PHILIPS_ATSC to TUNER_PHILIPS_FCV1236D
TUNER_PHILIPS_ATSC is an ambiguous name for a tuner. Rename it to
TUNER_PHILIPS_FCV1236D to be more descriptive.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e827931e37295329be0bc0e6c0283bfa4807b8f9
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:05 2008 -0300
V4L/DVB (7380): tuner-simple: warn if tuner can't be probed during attach
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit cac2b0eb18e140e2f63146d0f97691e9238570b6
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:46:04 2008 -0300
V4L/DVB (7379): tuner: prevent instance sharing if i2c adapter is NULL
We currently do not have a method to enable instance staring if i2c adapter
is NULL, in the cases of dvb demods that write to the tuner directly using
calc_regs. Prevent possible wrong instance sharing for these cases until
a better solution can be found.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7daa4a8897e79911f524ddac065adea05c7e9b16
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:46:03 2008 -0300
V4L/DVB (7378): cleanup variable initialization
flags used for spinlocks don't need to be initialized, except where the
compiler has no way to see, that the spin_unlock_irqrestore is only called
if the spin_lock_irqsave has been called before. Local variable
initialization doesn't have to be protected.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Reviewed-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b2cb200f0d0d5e801b47635554519f6e1b64e847
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:03 2008 -0300
V4L/DVB (7377): radio-sf16fmr2.c: fix volume handling
As reported by Roel Kluin <12o3l at tiscali.nl>:
in drivers/media/radio/radio-sf16fmr2.c:319:
for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
if ((fmr2->card_type != 11)
&& V4L2_CID_AUDIO_VOLUME)
radio_qctrl[i].step = 65535;
...
I don't understand this '&& V4L2_CID_AUDIO_VOLUME'
While fixing this issue, I've revisited the volume control code and fixed
CodingStyle on the changed procedures.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e9bcf6675d6da1a1e9925b2bdfc21f8d2330a1c5
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:46:02 2008 -0300
V4L/DVB (7376): Improve compile-time type-checking in videobuf
Make the dev member of the struct videobuf_queue of type "struct device *"
to avoid future problems. Also change the prototype of the
videobuf_queue_core_init() function.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 50407f99a1fd7fcca74e53b1852dc70deb5114db
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:02 2008 -0300
V4L/DVB (7375): cx88/saa7134: fix magic number for xc3028 reusage detection
tuner-xc2028 needs to know when a DVB module is sharing the same analog tuner.
This is done by comparing a magic number that needs to be the same on analog
and on digital. To make easier, this magic number is a pointer to some data
struct.
With the previous code, two different pointers were using, causing a
miss-detection.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a920e42f61bdfe9974f3e2f3715d3a6d319eeaba
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:46:02 2008 -0300
V4L/DVB (7374): Fix left-overs from the videobuf-dma-sg.c conversion to generic DMA
The dev element of the struct videobuf_queue is now of type struct device
implicitly. Fix left-over casts.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Reviewed-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 33b4af918a1ad73db47efec3cd23184d58f6ab31
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Tue Apr 22 14:46:02 2008 -0300
V4L/DVB (7373): logical-bitwise & confusion in se401_init()
logical-bitwise & confusion
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7f0dd17913eda77961fc8213b64cb8af4a155d3e
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:01 2008 -0300
V4L/DVB (7372): cx88: Add IR support for Pixelview MPEG 8000GT
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ceb63a4fda646faea60e34fa4c3abf8455add013
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:01 2008 -0300
V4L/DVB (7371): cx88: Fix audio on Prolink Pixelview Mpeg 8000GT
This board works only with non-mts firmware
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2422a9b3f47c75d3915e6af78ebe25b7d2540262
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:46:00 2008 -0300
V4L/DVB (7370): Add basic support for Prolink Pixelview MPEG 8000GT
TV reception ok. S-video and Composite not tested. Audio not tested.
IR not implemented yet.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit aba360d8cc086e12c3eb832f32d9e9813514e295
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Apr 22 14:45:59 2008 -0300
V4L/DVB (7369): drivers/media/video/soc_camera.c: reads return size_t
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
CC: Guennadi Liakhovetski <kernel at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e80faad3d7a332b7fe5a72dd64a81d28dd5c2e44
Author: Mauro Lacy <mauro at lacy.com.ar>
Date: Tue Apr 22 14:45:58 2008 -0300
V4L/DVB (7368): bttv: added support for Kozumi KTV-01C card
Signed-off-by: Mauro Lacy <mauro at lacy.com.ar>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 97275ac514c7f1131f42f8b06e073b144c744e78
Author: Ernesto Hernández-Novich <emhn at usb.ve>
Date: Tue Apr 22 14:45:58 2008 -0300
V4L/DVB (7366): Support for a 16-channel bt878 card
I have what looks like a Geovision GV-600 (or 650) card. It has a large
chip in the middle labeled
CONEXANT
FUSION 878A
25878-13
E345881.1
0312 TAIWAN
It has an audio connector coming out from a chip labeled
ATMEL
0242
AT89C2051-24PI
It is identified as follows on my Debian GNU/Linux Etch (kernel 2.6.18)
...
01:0a.0 Multimedia video controller: Brooktree Corporation Bt878 Video Capture (rev 11)
01:0a.1 Multimedia controller: Brooktree Corporation Bt878 Audio Capture (rev 11)
...
01:0a.0 0400: 109e:036e (rev 11)
Subsystem: 008a:763c
Flags: bus master, medium devsel, latency 64, IRQ 58
Memory at dfffe000 (32-bit, prefetchable) [size=4K]
Capabilities: [44] Vital Product Data
Capabilities: [4c] Power Management version 2
01:0a.1 0480: 109e:0878 (rev 11)
Subsystem: 008a:763c
Flags: bus master, medium devsel, latency 64, IRQ 58
Memory at dffff000 (32-bit, prefetchable) [size=4K]
Capabilities: [44] Vital Product Data
Capabilities: [4c] Power Management version 2
It was being detected as a GENERIC UNKNOWN CARD both by the 2.6.18
kernel and the latest v4l-dvb drivers, but it did not work at all. The
card has sixteen (16) BNC video inputs, four of them on the board itself
and twelve on three daughter-cards. It has a single bt878 chip, no tuner
and what looks like and audio input. After doing some research I managed
to get only eight channels working by forcing card=125 and those DID NOT
match channels 0-7 on the card, and no audio.
Based on what was working for card=125, I added the card definition
block, added a specific muxsel routine and got the card working fully
with xawtv, where the sixteen channels show up as Composite0 to
Composite15, matching the channel labels in the card and daughter-cards.
I have made no efforts yet to get audio working, but would appreciate
any pointers.
Signed-off-by: Ernesto Hernández-Novich <emhn at usb.ve>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 76e41e4851e0c8b642e348d8489d7645b8dae21e
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Tue Apr 22 14:45:57 2008 -0300
V4L/DVB (7365): reduce stack usage of v4l1_compat_sync
poll_one allocated on stack struct poll_wqueues which is pretty big
structure (>500 bytes on x86_64). v4l1_compat_sync invokes poll_one
in a loop, so allocate struct poll_wqueues in v4l1_compat_sync (with
kmalloc) and pass it to poll_one.
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b524f7b02d70204444441e4805fb3a71981e9018
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Tue Apr 22 14:45:57 2008 -0300
V4L/DVB (7364): reduce stack usage of v4l_compat_translate_ioctl
v4l_compat_translate_ioctl used 1376 bytes of stack (x86_64),
so split this 800 lines long function into ~20 small noinline functions;
the biggest function takes now 712 bytes (v4l1_compat_sync)
fix VIDIOCSWIN handler which printked wrong errors
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8b3b90aca293418171297ae14efac5817ba02bd3
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Tue Apr 22 14:45:57 2008 -0300
V4L/DVB (7363): fix coding style violations in v4l1-compat.c
fix most coding style violations found by checkpatch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a2a7f84b7908c6dba998b43a1ed343aff1d2fd98
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:56 2008 -0300
V4L/DVB (7360): tuner-simple: fix return value of simple_dvb_configure
simple_dvb_configure returns the actual tuned frequency to its caller, so
it must be declared as a u32 rather than an int. As a result, we will
return 0 to indicate a failure.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 26cd8972fb5cf673489005bf9b7d16e6f273422b
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:56 2008 -0300
V4L/DVB (7359): tuner-simple: enable digital tuning support for Thomson FE6600
Enable digital tuning support within tuner-simple. This will allow for a
single tuner module to manage the hardware, without having dvb-pll loaded.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0e5d383b0aca78c70c46b378f6b0e9d03a28c1af
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:56 2008 -0300
V4L/DVB (7358): tuner-simple: enable digital tuning support for Philips TD1316
Enable digital tuning support within tuner-simple. This will allow for a
single tuner module to manage the hardware, without having dvb-pll loaded.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a33b42c6bbe6c5b9067489df9e5650de751b798e
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:56 2008 -0300
V4L/DVB (7357): tuner-simple: enable digital tuning support for Microtune 4042 FI5
Enable digital tuning support within tuner-simple. This will allow for a
single tuner module to manage the hardware, without having dvb-pll loaded.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0db5fd4b063e8ea746c08f8630fd6f64cb511a55
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:55 2008 -0300
V4L/DVB (7356): tuner-simple: enable digital tuning support for Thomson DTT 7610
Enable digital tuning support within tuner-simple. This will allow for a
single tuner module to manage the hardware, without having dvb-pll loaded.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 02f5f4448464fea9c19e6b5ff5c67e874c898834
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:55 2008 -0300
V4L/DVB (7355): tuner-simple: use separate inputs for vsb and qam on tuv1236d & fcv1236d
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f4173d0f75e55091d8b52145005bee11bc26c046
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:55 2008 -0300
V4L/DVB (7354): tuner-simple: enable digital tuning support for Philips FCV1236D
Enable digital tuning support within tuner-simple. This will allow for a
single tuner module to manage the hardware, without having dvb-pll loaded.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit dbe3127d72b42a81749efb48aa315bbacfbf89b8
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:54 2008 -0300
V4L/DVB (7353): tuner-simple: enable digital tuning support for Philips TUV1236D
Enable digital tuning support within tuner-simple. This will allow for a
single tuner module to manage the hardware, without having dvb-pll loaded.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 23a88108cf6d5fa8073a3b2af804fff7305e86e3
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:53 2008 -0300
V4L/DVB (7352): tuner-simple: enable digital tuning support for Philips FMD1216ME
Enable digital tuning support within tuner-simple. This will allow for a
single tuner module to manage the hardware, without having dvb-pll loaded.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6f4a57292f4f0a0fef5e4e39cb394fedcf2acf9f
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:53 2008 -0300
V4L/DVB (7351): tuner-simple: add init and sleep methods
taken from dvb-pll
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 22ef8fc945b28398d93a5d362e54915b66eba23f
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:52 2008 -0300
V4L/DVB (7350): tuner-simple: enable digital tuning support for Thomson DTT 761X
Enable digital tuning support within tuner-simple. This will allow for a
single tuner module to manage the hardware, without having dvb-pll loaded.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bed6d189b965974a13c8c13313f9ebce06c12c3c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:52 2008 -0300
V4L/DVB (7349): tuner-simple: enable digital tuning support for LG TDVS-H06xF
Enable digital tuning support within tuner-simple. This will allow for a
single tuner module to manage the hardware, without having dvb-pll loaded.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a81df363554fb6439b5eb4ada06ad546a1df5ce3
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:52 2008 -0300
V4L/DVB (7348): tuner-simple: do not send i2c commands if there is no i2c adapter
if (priv->i2c_props.adap == NULL) then exit any function that would
send commands over the i2c bus. We allow drivers to attach without an
i2c adapter for cases where the dvb demod accesses the tuner directly
via calc_regs.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 62325497db6ef3b13cae41d5038e2693997d7d3e
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:52 2008 -0300
V4L/DVB (7347): tuner-simple: add basic support for digital tuning of hybrid devices
Add entry points used for digital tuning via the dvb_frontend.
Share state data between multiple instances of the driver for hybrid
tuners.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ac8b63b30a320699e602a18af6101528b408d41d
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:51 2008 -0300
V4L/DVB (7346): tda9887: allow multiple driver instances for the same hardware to share state
Convert tda9887 to use the new hybrid_tuner_request_state and
hybrid_tuner_release_state macros to manage state sharing between
hybrid tuner instances.
Some ATSC/DVB cards need to put the analog demodulator into standby
before tuning digital. This patch allows us to attach the tda9887
driver to the digital side of the bridge driver and be able to put
it into standby without jeopardizing the analog demod driver's state.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 081b496a75fec134657f036f585738a1ca869047
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:45:51 2008 -0300
V4L/DVB (7344): cx25840: better PAL-M and NTSC-KR handling
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2fd3c14cf53c379602d1a8a1a0aed7737a48c5c6
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:45:51 2008 -0300
V4L/DVB (7343): msp3400: fix SECAM D/K handling
The 6.5 MHz carrier was interpreted as SECAM-L even if SECAM-D/K was
selected.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e0028027c6e4a8aa8b3b77001b982a97ac35bbd7
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:45:51 2008 -0300
V4L/DVB (7342): saa7115: fix PAL-Nc handling
Fsc 3.58 refers to Combination PAL-N (aka PAL-Nc), not to plain PAL-N (that
uses Fsc 4.43).
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 11305d590895f22c30545ee0ff3fb434128fefb0
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:45:50 2008 -0300
V4L/DVB (7341): ivtv: rename tunerhz to tunertype
There are two tuner types: those for M/N standards and those for all others.
However, M/N standards are not always 60 Hz (PAL-N/Nc are 50 Hz), so rename
the module option accordingly.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit cd9fa026606848b2238a56e37b2c4aa4f371e152
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:45:50 2008 -0300
V4L/DVB (7340): ivtv: fix tunerhz bug: PAL-N(c) is 50 Hz, not 60
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d00573bbe9ce97798e08e6718f3459c2c2ceacc0
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:45:50 2008 -0300
V4L/DVB (7339): ivtv: add support for Japanese variant of the Adaptec AVC-2410
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c0038ce025e1d70076894e6a206a73fd37ad493d
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:45:49 2008 -0300
V4L/DVB (7338): ivtv: improve pal/secam module options, add tunerhz module option
Allow options like pal=bgh, improve description of those options.
Add tunerhz option: 50=card has 50Hz tuner, 60=card has 60Hz tuner.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0358d7c580370c5eaf081ac42a41c6e347709051
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:45:48 2008 -0300
V4L/DVB (7337): ivtv: fix polling bug
The q_io queue was never taken into account by the poll function. Thanks to
Andy Walls for finding this bug.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ad5f2e859d76dccb7eb1aa942171b1a32211efc2
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Fri Mar 7 21:57:18 2008 -0300
V4L/DVB (7336): soc-camera: streamline hardware parameter negotiation
Improve hardware parameter negotiation between the camera host driver and
camera drivers. Parameters like horizontal and vertical synchronisation,
pixel clock polarity shall be set depending on capabilities of the
parties.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1c659689fe9959c017bfaaa8301243f7d99f1a46
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Apr 22 14:45:47 2008 -0300
V4L/DVB (7335): usb-video: checkpatch fixes
Please run checkpatch prior to sending patches
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d6f34d7adddb144c3b450e15df3749f0e0a651c6
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 22 14:45:47 2008 -0300
V4L/DVB (7332): ir-kbd-i2c: Minor optimization in ir_probe
This saves an initialization and a comparison.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2c4a07b2da61bcd33f18195ff7f355c5bb285904
Author: Sascha Sommer <saschasommer at freenet.de>
Date: Tue Apr 22 14:45:47 2008 -0300
V4L/DVB (7331): Fix em2800 altsetting selection
Signed-off-by: Sascha Sommer <saschasommer at freenet.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4a24ce3a17ee713056db0a24cf558bd595211302
Author: Andreas Oberritter <obi at linuxtv.org>
Date: Tue Apr 22 14:45:47 2008 -0300
V4L/DVB (7329): add flag to allow software demux to recognize the output type
Previously, the macro DVR_FEED, which is used to recognize and filter
out duplicate packets going to the DVR device, used the TS_PAYLOAD_ONLY
flag to identify a packet's destination.
This kind of filtering was introduced by the following two changesets:
Now, that it is possible to record TS PIDs using the demux device by
setting the output type to DMX_OUT_TSDEMUX_TAP, checking TS_PAYLOAD_ONLY
is not sufficient anymore. Therefore another flag, TS_DEMUX, is added to
specify the output type of a feed.
This allows multiple clients to filter the same TS PID on a demux device
simultaneously.
Signed-off-by: Andreas Oberritter <obi at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a9317abfba0850b006aed000e2acc4bee150410a
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:46 2008 -0300
V4L/DVB (7327): cx88: Fix memset for tuner-xc3028 control
Fix a cut-and-paste error
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 000e27a639f16e2df70a3b0bec7edfab79e5e717
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:46 2008 -0300
V4L/DVB (7326): Fix bad whitespaces
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ddd5441df4127d5af45f6b2c58c2020b60bd52de
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:46 2008 -0300
V4L/DVB (7325): cx88-dvb: fix an OOPS for xc3028 devices, when dvb_attach fails
If dvb_attach fails, dev->dvb.frontend is NULL. This will produce an OOPS, as
reported.
Thanks to Vanessa Ezekowitz <vanessaezekowitz at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f0910c744324e3e853d7a80da876784319d9a1c8
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:45 2008 -0300
V4L/DVB (7323): pvrusb2: set default video standard to NTSC for OnAir HDTV / Creator
The pvrusb2 driver normally picks up the default video standard from the
eeprom on Hauppauge devices, but the OnAir HDTV and OnAir Creator are not
Hauppauge devices, and do not store this information in any eeprom.
These devices support NTSC/ATSC, so we should use NTSC by default when in
analog mode.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ebff033039b654b7b5493499babe22c7c1b0d36e
Author: Tobias Klauser <tklauser at distanz.ch>
Date: Tue Apr 22 14:45:45 2008 -0300
V4L/DVB (7322): pvrusb2: Fix storage-class as per C99 spec
The C99 specification states in section 6.11.5:
The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 794b16072e00d0a40a8c773dd4319fb1e460a632
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:45 2008 -0300
V4L/DVB (7321): pvrusb2: Rework context handling and initialization
This change significantly rearranges pvr2_context level initialization
and operation:
1. A new kernel thread is set up for management of the context.
2. Destruction of the pvr2_context instance is moved into the kernel
thread. No other context is able to remove the instance; doing
this simplifies lock handling.
3. The callback into pvrusb2-main, which is used to trigger
initialization of each interface, is now issued from this kernel
thread. Previously it had been indirectly issued out of the work
queue thread in pvr2_hdw, which led to deadlock issues if the
interface needed to change a control setting (which in turn
requires dispatch of another work queue entry).
4. Callbacks into the interfaces (via the pvr2_channel structure) are
now issued strictly from this thread. The net result of this is
that such callback functions can now also safely operate driver
controls without deadlocking the work queue. (At the moment this
is not actually a problem, but I'm anticipating issues with this in
the future).
5. There is no longer any need for anyone to enter / exit the
pvr2_context structure. Implementation of the kernel thread here
allows this all to be internal now, simplifying other logic.
6. A very very longstanding issue involving a mutex deadlock between
the pvrusb2 driver and v4l should now be solved. The deadlock
involved the pvr2_context mutex and a globals-protecting mutex in
v4l. During initialization the driver would take the pvr2_context
mutex first then the v4l2 interface would register with v4l and
implicitly take the v4l mutex. Later when v4l would call back into
the driver, the two mutexes could possibly be taken in the opposite
order, a situation that can lead to deadlock. In practice this
really wasn't an issue unless a v4l app tried to start VERY early
after the driver appeared. However it still needed to be solved,
and with the use of the kernel thread relieving need for
pvr2_context mutex, the problem should be finally solved.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8f59100a42576c49e2170e9dc04f8b7ac922a74d
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:45 2008 -0300
V4L/DVB (7320): pvrusb2: Eliminate timer race during tear-down
The pvrusb2 tear-down logic was clearing two timers before stopping
its internal work queue. That left a tiny window open where the work
queue might run after the timers are stopped, possibly starting them
again. This could lead to dangling pointers and an oops. Solution:
Kill the work queue first, then delete the timers.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c4a8828ddbf5fb445d2679ab006d5743540fc41a
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:44 2008 -0300
V4L/DVB (7319): pvrusb2: Close potential race condition during initialization
There is a callback that is issued to into pvr2_context from pvr2_hdw
after initialization is done. There was a probability that this
callback could get missed. Fixed.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ee9ca4b24f03b4da04cae1a24ea445ceb8a1f3d2
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:43 2008 -0300
V4L/DVB (7318): pvrusb2: Remove dead code
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a00199fb3fe41c8190c38e548a178e965f582cda
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:43 2008 -0300
V4L/DVB (7317): pvrusb2: Increase buffer size for printing video standard strings
Buffer size for printing pvrusb2 video standard strings was too small
before. This is cosmetic; the printing logic is not able to overrun a
too-short buffer.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ef7c37009225776e92979f464bfbf5d796d3a5ea
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:42 2008 -0300
V4L/DVB (7316): pvrusb2: Handle ATSC video standard bits
The pvrusb2 driver dynamically generates an enumeration of support
video standard combinations based on which video standard bits are
set. ATSC modes don't fall into this since they are by nature not
analog. The pvrusb2 driver has been warning about an inability to
classify ATSC standards. This change causes the classification
algorithm to ignore any ATSC standards (such things are better handled
elsewhere anyway).
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fd1da7897999826d7491cdfd5b882ca8e9a965cb
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:42 2008 -0300
V4L/DVB (7315): pvrusb2: Add Gotview USB 2.0 DVD Deluxe to supported devices
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5fd782af71876562c098aab0b240ceef2779d888
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:42 2008 -0300
V4L/DVB (7314): pvrusb2: Make device attribute structure more compact
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 40381cb02fb7fc0b46c55e3a71325b5d930580fa
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:42 2008 -0300
V4L/DVB (7313): pvrusb2: Make LED control into a device-specific attribute
The pvrusb2 driver has used hardcoded logic to control the LED on the
device. However this is really Hauppauge-specific behavior. This
change defines a new device attribute for LED control and sets things
up appropriately for Hauppauge devices.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c55a97d7538d5f3abbee5486e37e56e896478fbd
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:41 2008 -0300
V4L/DVB (7312): pvrusb2: Indicate streaming status via LED
Most of this originates from Michael Krufky <mkrufky at linuxtv.org>;
these changes move LED control into separate functions. This is the
first step in new work to make LED control a device-specific attribute.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1b9c18c54d68cc22f090948fc47890c56d22153d
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:41 2008 -0300
V4L/DVB (7311): pvrusb2: Allow digital streaming without encoder firmware
The encoder is not a part of the pipeline when in digital mode, so
streaming is OK in this case even when the encoder's firmware is not
loaded. Modify the driver core handling of this scenario to permit
streaming.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e9db1ff23507d3e430db2bd130bd7861baa8c87e
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:41 2008 -0300
V4L/DVB (7310): pvrusb2: trace print cosmetic cleanup / improvements
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 62433e312076d4ff4f2df357b2a6fac29974344a
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:40 2008 -0300
V4L/DVB (7309): pvrusb2: Enhance core logic to also control digital streaming
This is a major pvrusb2 change. The driver core has an algorithm that
is used to cleanly sequence the changes needed to enable / disable
video streaming. The algorithm had originally been written for analog
streaming, but when in digital mode the pipeline is considerably
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e8f5bacfcf2ba9a98674f3cd51b63020920e16aa
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:40 2008 -0300
V4L/DVB (7308): pvrusb2: Define digital control scheme device attributes
Unlike analog control, control of the digital side is not nearly as
uniform among different devices. So we have to specify the correct
digital control scheme as a new device attribute.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 84147f3dd9187cd0c9810801be1282419a8ea00a
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:40 2008 -0300
V4L/DVB (7307): pvrusb2: New functions for additional FX2 digital-related commands
This code is actually part of a larger set from Mike Krufky
<mkrufky at linuxtv.org>, to support ATSC streaming from within the
pvrusb2 driver. More to come...
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 99a6acf9a7a80da49e85be964b15ffed9ab7643e
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:39 2008 -0300
V4L/DVB (7306): pvrusb2: Fix oops possible when claiming a NULL stream
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7f421fe475726f0de55588a22c870e5cf35dc4f5
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:39 2008 -0300
V4L/DVB (7305): pvrusb2: whitespace fixup
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e1edb19a001b25c0ce2e52a669cba6b6eb31883c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:39 2008 -0300
V4L/DVB (7304): pvrusb2: add function pvr2_hdw_cmd_powerdown
Call pvr2_hdw_cmd_powerdown to power down the device
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit dbc40a0e582a88d2561d13d1fea4f3496bff9650
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:39 2008 -0300
V4L/DVB (7303): pvrusb2: Ensure that default input selection is actually valid
Previously the pvrusb2 driver just started with the default input to
be "television". But if the device doesn't support an analog tuner
then this default must be different. New logic here selects a
reasonable default based on the actual valid set of available inputs.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fdf256f3374d5060e3714651b45b8450b7dc4349
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:38 2008 -0300
V4L/DVB (7302): pvrusb2: Improve control validation for enumerations
When an enumeration control is changed, the pvrusb2 driver assumed
that the enumeration values were continuous. That is no longer true;
this change allows for properly input validation even when not all
enumeration values are legal (which can happen with input selection
based on what the hardware supports).
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bedbbf8be2f28c9f8a8cf1e2ead4fda8b5f47103
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:38 2008 -0300
V4L/DVB (7301): pvrusb2: Implement addition sysfs tracing
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit beb0ecd7f02f1a2da174b450d096e00530b3e8e8
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:38 2008 -0300
V4L/DVB (7300): pvrusb2: v4l2 implementation fixes for input selection
Now that the pvrusb2 driver can dynamically choose which inputs to
make available depending on the hardware, the enumeration of input
choices is no longer a contiguous range of integers. Unfortunately
this causes a problem in the v4l2 implementation since the input
enumeration requires continuity in the API. This change implements a
mapping in order to preserve the v4l2 interface requirement.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7fb20fa38caaf5c9d1b1d60b181c99ca30122520
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:37 2008 -0300
V4L/DVB (7299): pvrusb2: Improve logic which handles input choice availability
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 895c3e8bfec9738251da9a2a8592dab15ec3a1bd
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:37 2008 -0300
V4L/DVB (7298): pvrusb2: Account for dtv choice (a bit) in v4l2 implementation
The v4l2 implementation in pvru2b2 must produce a sane answer when
asked, when the input choice is set to dtv.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 29bf5b1d754a9a64f68c37938e1a0b7b63b724ba
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:37 2008 -0300
V4L/DVB (7297): pvrusb2: Dynamically control range of input selections
This follows from defining the available inputs as device attributes.
This change causes the driver to adjust its list of inputs based on
those attributes. Now, for example, the FM radio will appear as a
choice only if the hardware supports an FM radio.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1aaac60fec0d3ba8043838c6eac86de987cfe5c1
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:36 2008 -0300
V4L/DVB (7296): pvrusb2: Define device attributes for all input modes
Different devices support different input types. Up until now we've
really been assuming that everyone has an analog tuner, an FM radio,
composite, and s-video inputs. But as we add other devices, these
assumptions are no longer true. The way to deal with this is to
define the available inputs as additional device attributes, so that
the driver can adjust its internal behavior accordingly.
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d068c6eec94c370a445a32f2f092c90798d47ca3
Author: Mike Isely <isely at pobox.com>
Date: Tue Apr 22 14:45:36 2008 -0300
V4L/DVB (7295): pvrusb2: add device attributes for fm radio and digital tuner
Signed-off-by: Mike Isely <isely at pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 27dea3eb667c058eebf2eb8a090f0e20333386e9
Author: Wojciech Migda <wojtek.golf at interia.pl>
Date: Tue Apr 22 14:45:36 2008 -0300
V4L/DVB (7294): : tuner and radio addresses are missing for the PixelView PlayTV card
The PixelView PlayTV card definition structure was missing initialization of
the tuner_addr and radio_addr fields. As a result it was impossible to have the
tuner initialized using parameters specified while loading the bttv.ko module.
This regression became visible after the v4l rearrangements introduced
somewhere around 2.6.15 kernel version.
The root cause for the tuner initialization failure is located in the
attach_inform function in the bttv-i2c.c file.
There at the very beginning the addr variable holding the tuner device address
is initialized with the value taken from the bttv_tvcards array.
For the PixelView PlayTV card the tuner address field (and the radio address as
well) was uninitialized, and thus equal 0. Later in that function execution of
the TUNER_SET_TYPE_ADDR tuner command is guarded with check for the tuner
address either equal ADDR_UNSET, or client->addr.
Since both are non-zero (the latter in case of the card owned by me at the
runtime is equal 0x61) the TUNER_SET_TYPE_ADDR command is not executed, and
consequently in the tuner_attach function in the tuner-core.c file call to
i2c_attach_client does not result in assigning the tuner type variable with the
requested value.
Providing initialization of the tuner_addr and radio_addr with ADDR_UNSET
values as it is already done for other tv cards defined in bttv-cards.c ensures
that the tuner initialization is done correctly, just as it used to be in the
2.6.14 kernel.
Signed-off-by: Wojciech Migda <wojtek.golf at interia.pl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b01cd937895ad4114a07114cfb6b8b5d2be52241
Author: Peter Hartley <pdh at utter.chaos.org.uk>
Date: Tue Apr 22 14:45:36 2008 -0300
V4L/DVB (7293): DMX_OUT_TSDEMUX_TAP: record two streams from same mux, resend
Currently (in linux-2.6.24, but linux-dvb hg looks similar), the
dmx_output_t in the dmx_pes_filter_params decides two things: whether
output is sent to demux0 or dvr0 (in dmxdev.c:dvb_dmxdev_ts_callback),
*and* whether to depacketise TS (in dmxdev.c:dvb_dmxdev_filter_start).
As it stands, those two things can't be set independently: output
destined for demux0 is depacketised, output for dvr0 isn't.
This is what you want for capturing multiple audio streams from the same
multiplex simultaneously: open demux0 several times and send
depacketised output there. And capturing a single video stream is fine
not what you want: you want multi-open (so demux0, not dvr0), but you
want the TS nature preserved (because that's what you want on output, as
you're going to re-multiplex it with the audio).
At least one existing solution -- GStreamer -- sends all its streams
simultaneously via dvr0 and demuxes again in userland, but it seems a
bit of a shame to pick out all the PIDs in kernel, stick them back
together in kernel, and send them to userland only to get unpicked
again, when the alternative is such a small API addition.
The attached patch adds a new value for dmx_output_t:
DMX_OUT_TSDEMUX_TAP, which sends TS to the demux0 device. With this
patch and a dvb-usb-dib0700 (and UK Freeview from Sandy Heath), I can
successfully capture an audio/video PID pair into a TS file that mplayer
can play back.
Signed-off-by: Peter Hartley <pdh at utter.chaos.org.uk>
Acked-by: Andreas Oberritter <obi at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3c66e4e18b250f4524f24fd5b4ccdcd12bef9cc2
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:35 2008 -0300
V4L/DVB (7289): cx88: enable IR receiver and real time clock on FusionHDTV7 Gold
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 76464d412a5a51633881078d4109212e4463e8d4
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:35 2008 -0300
V4L/DVB (7288): cx88: fix GPIO for FusionHDTV 7 Gold input selection
Fix GPIO for FusionHDTV 7 Gold tv / s-video / composite input selection.
Fix card textual name to match other FusionHDTV device names.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1117d6ba1313b8821b10403de114c38764008c45
Author: Steven Toth <stoth at hauppauge.com>
Date: Tue Apr 22 14:45:34 2008 -0300
V4L/DVB (7287): cx88: add analog support for DVICO FusionHDTV7 Gold
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a58858556deb03ea4a464f84fe888692867ce377
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Tue Apr 22 14:45:33 2008 -0300
V4L/DVB (7286): limit stack usage of ir-kbd-i2c.c
ir_probe allocated struct i2c_client on stack;
it's pretty big structure, so allocate it with kzalloc
make checkstack output without this patch:
x059d ir_probe [ir-kbd-i2c]: 1000
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1c3bf598cf794558694c8beb0c8c7056a81dbe04
Author: Douglas Schilling Landgraf <dougsland at gmail.com>
Date: Tue Apr 22 14:45:33 2008 -0300
V4L/DVB (7283): videobuf-dma-sg: Remove unused variable
Removed warning message:
- videobuf-dma-sg.c: In function 'videobuf_dma_unmap':
- videobuf-dma-sg.c:281: warning: unused variable 'dev'
Signed-off-by: Douglas Schilling Landgraf <dougsland at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e43d76b40d3fda146b9cd1192c5504a257603b70
Author: Brandon Philips <brandon at ifup.org>
Date: Tue Apr 22 14:45:32 2008 -0300
V4L/DVB (7281): v4l: Deadlock in videobuf-core for DQBUF waiting on QBUF
Avoid a deadlock where DQBUF is holding the vb_lock while waiting on a QBUF
which also needs the vb_lock. Reported by Hans Verkuil <hverkuil at xs4all.nl>.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9dc4e48fbea5412127ce2eb30d688c4fc55f5565
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:45:32 2008 -0300
V4L/DVB (7276): soc-camera: deactivate cameras when not used
Only attach cameras to the host interface for probing, then detach until
open. This allows platforms with several cameras on an interface,
physically supporting only one camera, to handle multiple cameras and
activate them selectively after initial probing. The first attach during
probe is needed to activate the host interface to be able to physically
communicate with cameras.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6f2896756c4f1d4df5bd30599e6444c9513cfe8d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 22 14:45:32 2008 -0300
V4L/DVB (7274): dabusb: fix shadowed variable warning in dabusb.c
drivers/media/video/dabusb.c:208:6: warning: symbol 'buffers' shadows an earlier one
drivers/media/video/dabusb.c:63:12: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1744a7770c27a709c464ce51617c2b31721db165
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 22 14:45:32 2008 -0300
V4L/DVB (7273): suppress compound statement warning in dvb-bt8xx.c
Prevailing kernel style seems to prefer always using braces
for do {} while ().
Add braces to dprintk to suppress the sparse warnings:
drivers/media/dvb/bt8xx/dvb-bt8xx.c:73:2: warning: do-while statement is not a compound statement
drivers/media/dvb/bt8xx/dvb-bt8xx.c:93:2: warning: do-while statement is not a compound statement
drivers/media/dvb/bt8xx/dvb-bt8xx.c:529:2: warning: do-while statement is not a compound statement
drivers/media/dvb/bt8xx/dvb-bt8xx.c:614:4: warning: do-while statement is not a compound statement
drivers/media/dvb/bt8xx/dvb-bt8xx.c:629:4: warning: do-while statement is not a compound statement
drivers/media/dvb/bt8xx/dvb-bt8xx.c:639:4: warning: do-while statement is not a compound statement
drivers/media/dvb/bt8xx/dvb-bt8xx.c:883:2: warning: do-while statement is not a compound statement
drivers/media/dvb/bt8xx/dvb-bt8xx.c:917:2: warning: do-while statement is not a compound statement
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Manu Abraham <manu at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b573ea0a936eb2a7c6c57cdacb0d02bd358495a7
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:31 2008 -0300
V4L/DVB (7271): cx88-cards: Fix powerangel gpio1
With this gpio, audio works properly.
Thanks to Daniel Fraga <fragabr at gmail.com> for helping on fixing the code for
Powerangel Real board.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c4a3ce1cd0c0ac394d1d56d8e0980b6836661341
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:31 2008 -0300
V4L/DVB (7270): cx88-dvb: Renames pci_nano callback
This callback is specific to pci_nano, since supports only dvb. Renames it
to avoid future mistakes.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8cd7bf333671196e191bda62907b3b26e21da395
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:30 2008 -0300
V4L/DVB (7269): cx88: Powercolor Angel works only with firmware version 2.5
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 23fb348d00da9c1558b4a9b234b9ac941091b0f1
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:30 2008 -0300
V4L/DVB (7266): cx88-dvb: convert attach_xc3028 into a function
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 64016330b60e44db1383122a11611073fe98f261
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:30 2008 -0300
V4L/DVB (7265): cx88: prints an info when xc2028 is set or is attached
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0f19e65bc5dcd30f1c5d72f56f6a9a2dc01698f3
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:29 2008 -0300
V4L/DVB (7264): cx88-cards: always use a level on printk messages
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c450e50e8d6a0876431a744f1df9fdd5c2732b07
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:28 2008 -0300
V4L/DVB (7263): Some cleanups at cx88 callback methods
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bc36a686a65dd9b941463ff894a3868c62851186
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:27 2008 -0300
V4L/DVB (7262): Add support for xc3028-based boards
This patch adds support for the following saa7134 xc3028 based boards:
132 -> AVerMedia Cardbus TV/Radio (E506R) [1461:f436]
133 -> AVerMedia Hybrid TV/Radio (A16D) [1461:f936]
134 -> Avermedia M115 [1461:a836]
135 -> Compro VideoMate T750 [185b:c900]
This is based on a original patch thanks to Markus Rechberger that added xc3028
gpio init code for the above boards.
This patch moves saa7134_tuner_callback to saa7134-cards, originally used only
by tda8290 DVB-S boards. The callback was made more generic to support other
tuners.
Currently, it supports both tda8290 and xc2028/xc3028 tuners. Added also the
basis for xc5000 tuner callback.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 446018d80736ab16a117ce0db5a20467c91a0f90
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:20 2008 -0300
V4L/DVB (7261): Use the same callback argument as xc3028 and xc5000
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1fe8736955515f5075bef05c366b2d145d29cd44
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:20 2008 -0300
V4L/DVB (7260): tuner-xc3028: Don't check return code for clock reset
Only tm6000 needs to be aware when a frequency is being changed. This seems
to improve channel change detection. Other bridges don't need this.
So, better to discard any errors if this fails, and proceed changing the
channels.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8765561fc88131bbc9a6246010c15b63595ec35e
Author: Chris Pascoe <c.pascoe at itee.uq.edu.au>
Date: Tue Apr 22 14:45:15 2008 -0300
V4L/DVB (7259): FusionHDTV DVB-T Pro tuning problem fixes
It seems that on this board, the demodulator provides the pullup on the I2C
bus, which means that calling i2c_gate_ctrl crashes the bus. Turn this off
and the xc3028 can talk OK. Also fix some GPIO related settings that
became more clear through working on this.
Some changes made by Mauro Chehab to allow merging it with some
other xc3028 patches.
Signed-off-by: Chris Pascoe <c.pascoe at itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b3fb91d20ca111316854a166ff88b0c8c0f2388b
Author: Chris Pascoe <c.pascoe at itee.uq.edu.au>
Date: Tue Apr 22 14:45:15 2008 -0300
V4L/DVB (7258): Support DVB-T tuning on the DViCO FusionHDTV DVB-T Pro
Add support for tuning DVB-T channels on DViCO's FusionHDTV DVB-T Pro board.
The IR remote and analog tuner are not supported at this time.
Some changes made by Mauro Chehab to allow merging it with some other xc3028
patches.
Signed-off-by: Chris Pascoe <c.pascoe at itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9507901ef329b2dd3417372c7c9b2abcfd5c1885
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:15 2008 -0300
V4L/DVB (7257): cx88: Add xc2028/3028 boards
This patch ports a patch from Markus Rechberger to work with tuner-xc2028.
It adds entries for several cx88 boards with xc2038/3028 tuners.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c2cb8fcc006ce59255de67e3fe9f65fb79db633b
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:45:14 2008 -0300
V4L/DVB (7256): cx88: Add support for tuner-xc3028
Callback gpio's based on Markus Rechberger, Christopher Pascoe and Steven Toth
patches.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8efd2e28265ca031072d8d94cdbdd53904ce9b2d
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:45:14 2008 -0300
V4L/DVB (7254): cx88: fix FusionHDTV 5 PCI nano name and enable IR support
load ir-kbd-i2c for IR remote control support on DViCO FusionHDTV 5 PCI nano
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5c00fac0bab95a378e60c1a67e3d3c5ac44df412
Author: Steven Toth <stoth at hauppauge.com>
Date: Tue Apr 22 14:45:14 2008 -0300
V4L/DVB (7252): cx88: Add support for the Dvico PCI Nano
ATSC is known to work.
SVideo / Composite should work (I have no cable to test).
Analog tuner support does not work.
Signed-off-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7102b773d538c1f064da22ae9a1fb86704747388
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 15 02:57:48 2008 -0300
V4L/DVB (7250): Clean up pxa-camera driver, remove non-functional and never tested pm-support
This patch addresses most issues pointed out by Russell and Erik, moves
recently introduced into pxa-regs.h camera-specific defines into
pxa_camera.c, removes dummy power-management functions, improves
function-naming, etc.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Acked-by: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bb55de3b0e3523469491a48c51dcf7c6738162b2
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:45:13 2008 -0300
V4L/DVB (7249): Fix advertised pixel formats in mt9m001 and mt9v022
Only advertise pixel formats, that we actually can support in the
present configuration.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b1daf7e1233845db556ace20f80c7c531143498c
Author: maximilian attems <max at stro.at>
Date: Tue Apr 22 14:45:13 2008 -0300
V4L/DVB (7248): dabfirmware.h add missing license
Received written ack from the dabusb author
that the firmware is BSD licensed.
As bonus clarify copyright holder.
Signed-off-by: maximilian attems <max at stro.at>
Acked-by: Deti Fliegl <deti at fliegl.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9b2e5c6bea4e2ddd5d66d23341f9763cbcad8de6
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:42:16 2008 -0300
V4L/DVB (7245): ivtv: start timer for each DMA transfer
The DMA timeout timer was started once for each set of DMA transfers,
but it should be started for each single DMA transfer.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c9aec06f4a6029edd84022276e2bfadab5e85ade
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:42:15 2008 -0300
V4L/DVB (7244): ivtv: CROP is not supported for video capture
CROPCAP suggests that video capture supports cropping, but this is not the
case.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 88ab075aee974f70b7b0273a964810698c8a5b95
Author: Ian Armstrong <ian at iarmst.demon.co.uk>
Date: Tue Apr 22 14:42:14 2008 -0300
V4L/DVB (7243): ivtv: yuv framebuffer tracking
The existing yuv code limits output to the display area occupied by the
framebuffer. This patch allows the yuv output to be 'detached' via
V4L2_FBUF_FLAG_OVERLAY.
By default, the yuv output window will be restricted to the framebuffer
dimensions and the output position is relative to the top left corner of the
framebuffer. This matches the behaviour of previous versions.
If V4L2_FBUF_FLAG_OVERLAY is cleared, the yuv output will no longer be linked
to the framebuffer. The maximum dimensions are either 720x576 or 720x480
depending on the current broadcast standard, with the output position
relative to the top left corner of the display. The framebuffer itself can be
resized, moved and panned without affecting the yuv output.
Signed-off-by: Ian Armstrong <ian at iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 520ebe5f72ff450d7a73e8f669190254a5836093
Author: Tyler Trafford <ttrafford at gmail.com>
Date: Tue Apr 22 14:42:14 2008 -0300
V4L/DVB (7241): cx25840: code cleanup
- Use min()
- Eliminate extraneous variables
Signed-off-by: Tyler Trafford <ttrafford at gmail.com>
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 491215d81049bfda749ebda007ecd3ae8bee19e3
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Tue Apr 22 14:42:14 2008 -0300
V4L/DVB (7240): tveeprom: remove obsolete i2c driver code
The i2c driver code was once added for the out-of-tree ivtv driver,
but the ivtv driver hasn't used that for a long time so this code can
now be removed.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4d34dccd5e8af3db8dbb594d6cd1ea74446dbf20
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 14:42:13 2008 -0300
V4L/DVB (7238): make stk_camera_{suspend,resume}() static
This patch makes the needlessly global stk_camera_{suspend,resume}()
static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Jaime Velasco Juan <jsagarribay at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0705135e59f8503e4dade4b3580fed77b1743b7c
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:42:13 2008 -0300
V4L/DVB (7237): Convert videobuf-dma-sg to generic DMA API
videobuf-dma-sg does not need to depend on PCI. Switch it to using generic
DMA API, convert all affected drivers, relax Kconfig restriction, improve
compile-time type checking, fix some Coding Style violations while at it.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f13613acfb1a71895ac886dc831d6ae4e20e241a
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Tue Apr 22 14:42:13 2008 -0300
V4L/DVB (7235): tuner-simple: fix a buffer overflow
simple_set_tv() creates a buffer with 4 elements, and calls
simple_std_setup(), passing &buffer[1]. This makes the 5th element of buffer to
be initialized to 0, overriding some area outside the buffer.
Also, simple_std_setup() receives a buffer as parameter, but the buffer is
just overriden after the call, so, it doesn't make much sense to pass it as a
parameter.
This patch removes buffer[] from the function call, creating, instead, a local
var to be used internally.
Thanks to Axel Rometsch <axel.rometsch at freenet.de> for pointing the issue.
Reviewed-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6a6179b6db401acde5798b4da0fdff32b126ee15
Author: Russell Kliese <russell at kliese.wattle.id.au>
Date: Tue Apr 22 14:42:12 2008 -0300
V4L/DVB (7230): saa7134: add support for the MSI TV at nywhere A/D v1.1 card
Signed-off-by: Russell Kliese <russell at kliese.wattle.id.au>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7b5b3f1765c9773ec9b10c3e5299ac001211a80d
Author: Hermann Pitton <hermann-pitton at arcor.de>
Date: Tue Apr 22 14:42:12 2008 -0300
V4L/DVB (7229): saa7134: add support for the Creatix CTX953_V.1.4.3 Hybrid
Signed-off-by: Hermann Pitton <hermann-pitton at arcor.de>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 1b1cee35defe792da9aab2757c28338731c46e84
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:42:12 2008 -0300
V4L/DVB (7227): saa7134: fixed DVB-S support for Medion/Creatix CTX948
The I2C bus interface of the LNB supply sits behind the i2c gate of the
tda10086, so wrappers were necessary for the set_voltage functions.
For the time being, the board will show up as MD8800
Many thanks to Hermann Pitton for his help
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6ab465a821756691009e58a51f1b4543cf1ae21a
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:42:11 2008 -0300
V4L/DVB (7226): saa7134: add support for the NXP Snake DVB-S reference design
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4b1431ca1c98e26569c9b6cd6d06265cef9495ec
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:42:09 2008 -0300
V4L/DVB (7224): Initial DVB-S support for MD8800 /CTX948
Support is not complete yet and untested.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 26ec394e7c528e6f71e53a1335846328b8453ef5
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date: Tue Apr 22 14:42:09 2008 -0300
V4L/DVB (7223): Add support for the ISL6405 dual LNB supply chip
The chip can control 2 LNBs independently.
The driver distinguishes them by evaluating the MSB of the override_set
parameter of the isl6405_attach function.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 05b207924d558935080ac08776236e42aca1708c
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Tue Apr 22 14:42:08 2008 -0300
V4L/DVB (7220): drivers/media/video/sn9c102/sn9c102_core.c Fix Unlikely(x) == y
Fix Unlikely(x) == y
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Reviewed-by: Luca Risolia <luca.risolia at studio.unibo.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ef6ad5c35ed7233e7aafcc5645a1470199b10cc7
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:42:08 2008 -0300
V4L/DVB (7218): Fix breakage in mt9m001 and mt9v022 driver if "CONFIG_GENERIC_GPIO is not set"
Both camera drivers can function without GPIO support, in which case they
will only support the 10 bit data width mode. But the two respective switch
have to depend on CONFIG_GENERIC_GPIO. Additionally remove redundant
gpio_is_valid tests - they are repeated in bus_switch_request() functions.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b4333a3baecfeee35317c03cf08952cc04bd149a
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:42:08 2008 -0300
V4L/DVB (7217): Replace NO_GPIO with gpio_is_valid()
Upon suggestion by David Brownell use a gpio_is_valid() predicate
instead of an explicit NO_GPIO macro. The respective patch to
include/asm-generic/gpio.h has been accepted upstream.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 12afe3781870cad7b6bbe83a2f8c4dd9ec7bf214
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:42:07 2008 -0300
V4L/DVB (7214): tda18271: move init functions to directly above tda18271_tune
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d1c53424f3ba9cc46bf3dbc550a916dc1b8355ee
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:42:07 2008 -0300
V4L/DVB (7213): tda18271: consolidate tune functions
combine tda18271c1_tune and tda18271c2_tune into a single function
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4d2d42bcd8c73273f22d16ef4e619ce3f07f07d0
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:42:07 2008 -0300
V4L/DVB (7212): tda18271: move rf calibration code from tda18271c1_tune into a new function
move rf calibration code from tda18271c1_tune into a new function,
tda18271c1_rf_tracking_filter_calibration
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a60b866567001e97b5bdc9811aee155ae759e48f
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:42:06 2008 -0300
V4L/DVB (7211): tda18271: remove duplicated channel configuration code from tda18271c1_tune
remove duplicated channel configuration code from tda18271c1_tune, instead
call function tda18271_channel_configuration
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e723ee00893f242cbccf5ef2faffdaa6afb8f244
Author: Brandon Philips <brandon at ifup.org>
Date: Tue Apr 22 14:42:06 2008 -0300
V4L/DVB (7204): remove V4L2_CID_SHARPNESS from meye.h and report private control as DISABLED
- Continue to support the V4L2_CID_PRIVATE_BASE + 1 control in the ABI
- Report the same control as V4L2_CID_SHARPNESS
- Report the private control disabled via QUERYCTRL
Signed-off-by: Brandon Philips <bphilips at suse.de>
Acked-by: Stelian Pop <stelian at popies.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6d43cec87f9d9679a5c4adca7935dc8cf207f6ce
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:42:06 2008 -0300
V4L/DVB (7196): Lift videobuf-dma-sg's PCI dependency, until it is fixed
videobuf-dma-sg.c should be converted to the generic DMA API to make it
also useful for non-PCI configurations. Even now it can be used thanks
to compatibility macros in include/asm-generic/pci-dma-compat.h. This
has been verified to work on PXA270 CPU with the pxa_camera.c soc-camera
driver. For this the following temporary work-around is needed.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ab6c46e24a3c89c1e2d0d3959e119583e1bc92d9
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:42:05 2008 -0300
V4L/DVB (7184): make hybrid_tuner_request_state tolerant of devices without i2c adapters
Some dvb demodulators access the tuner directly without using i2c.
In these cases, i2c_adap may be NULL. This patch fixes
hybrid_tuner_request_state to allow for NULL i2c_adapters.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit bdb0aace95d42571ea054a56ed053f868336e13a
Author: Steven Whitehouse <steve at chygwyn.com>
Date: Tue Apr 22 14:42:05 2008 -0300
V4L/DVB (7178): Add two new fourcc codes for 16bpp formats
This adds two new fourcc codes (as per info at fourcc.org)
for 16bpp mono and 16bpp Bayer formats.
Signed-off-by: Steven Whitehouse <steve at chygwyn.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7397bfbe10b52a47f1f6c69aa87192d97ffa1910
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:42:04 2008 -0300
V4L/DVB (7174): Add support for the MT9V022 camera
This driver supports Micron MT9V022 colour camera.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f523dd0da985ef618d6f986217f0dd0975072515
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:42:04 2008 -0300
V4L/DVB (7173): Add support for the MT9M001 camera
This driver supports Micron MT9M001 monochrome and colour cameras.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3bc43840c3fbffaf8216883a37b336a41050d7f7
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Sun Apr 6 21:24:56 2008 -0300
V4L/DVB (7578a): V4L: V4L2 soc_camera driver for PXA270
This patch adds a driver for the Quick Capture Interface on the PXA270.
It is based on the original driver from Intel, but has been re-worked
multiple times since then, now it also supports the V4L2 API. This patch
depends on a complementary patch, submitted to the ARM tree, providing
PXA270 camera platform bindings.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit e55222ef27a2390d8abce27a3ce2d4c719ad5f1b
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:42:03 2008 -0300
V4L/DVB (7170): soc_camera V4L2 driver for directly-connected SoC-based cameras
This driver provides an interface between platform-specific camera
busses and camera devices. It should be used if the camera is connected
not over a "proper" bus like PCI or USB, but over a special bus, like,
for example, the Quick Capture interface on PXA270 SoCs. Later it should
also be used for i.MX31 SoCs from Freescale. It can handle multiple
cameras and / or multiple busses, which can be used, e.g., in
stereo-vision applications.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a7c7402f68cf97c9a021466c04029f039f9f4f27
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Tue Apr 22 14:42:03 2008 -0300
V4L/DVB (7169): Add chip IDs for Micron mt9m001 and mt9v022 CMOS cameras
Add V4L2_IDENT chip IDs for mt9m001 and mt9v022 cameras, will be used by
future patches, primarily to implement the g_chip_ident ioctl.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f9bd5843658e18a7097fc7258c60fb840109eaa8
Author: Brandon Philips <bphilips at suse.de>
Date: Tue Apr 22 14:42:02 2008 -0300
V4L/DVB (7167): [v4l] Add camera class control definitions
Add all of the recently proposed camera class controls. These controls
should appear in the next version of the v4l2spec.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 26d507fcfef7f7d0cd2eec874a87169cc121c835
Author: Brandon Philips <bphilips at suse.de>
Date: Tue Apr 22 14:42:02 2008 -0300
V4L/DVB (7166): [v4l] Add new user class controls and deprecate others
These changes should appear in the next update of the v4l2spec.
HCENTER and VCENTER are unused in the tree so I added a _DEPRECATED
postfix so applications can remove their use.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 27a643b1a9eded6a1b54df2743a7fb4383fd0cf9
Author: Jan Engelhardt <jengelh at computergmbh.de>
Date: Tue Apr 22 14:42:01 2008 -0300
V4L/DVB (7140): constify function pointer tables
Signed-off-by: Jan Engelhardt <jengelh at computergmbh.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c1b4d92789ada9ea6b7f1156ede7022eab309eab
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:42:00 2008 -0300
V4L/DVB (7137): tuner: return number of instances remaining after hybrid_tuner_release_state
Assign the number of instances remaining as the return value of
hybrid_tuner_release_state, in case there is any extra cleanup that
the tuner driver needs to do after an instance has been destroyed.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f9e315a16a5536120bac09a6d4217b8381c73c5c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:54 2008 -0300
V4L/DVB (7136): tda18271: use hybrid_tuner_request_state to manage tuner instances
Convert tda18271 to use the new hybrid_tuner_request_state and
hybrid_tuner_release_state macros to manage state sharing between
hybrid tuner instances.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2756665c28a7d2e25d92745195b5171866e12da9
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:53 2008 -0300
V4L/DVB (7135): remove PREFIX from users of tuner_foo printk macros
Store a pointer to the device name in the name field of
struct tuner_i2c_props, so that we can remove the
printk macros defined in tuner-i2c.h
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3c2a0865d06df23f755a7d36a1076965500e1228
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:52 2008 -0300
V4L/DVB (7134): tuner: create a macro for sharing state between hybrid tuner instances
Create a macro implementing a standard method to share state amongst
multiple instances of a hybrid tuner object.
Also, prepare tuner_foo printk macros for the removal of PREFIX
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2e43c953bfd31f0104f916b2f39e6d3d8b1a3099
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:52 2008 -0300
V4L/DVB (7130): tuner: remove emacs c-basic-offset override block
I'd prefer to leave this here, but official CodingStyle
doesn't care what I think :-/
Remove the emacs format override block to comply with Kernel CodingStyle.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c7a9f3aa1e1b6c7ade5208b30683bec3553c3079
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:51 2008 -0300
V4L/DVB (7129): tuner-simple: move device-specific code into three separate functions
Move the switch..case blocks with device-specific code from functions
simple_set_tv_freq and simple_set_radio_freq
...into three new functions:
simple_std_setup, simple_post_tune and simple_radio_bandswitch
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b65aa2605683d90966a16abc68112c1fd9e3f3d8
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:51 2008 -0300
V4L/DVB (7128): tuner: properly handle failed calls to simple_tuner_attach
If simple_tuner_attach fails, set t->type to TUNER_ABSENT,
set t->mode_mask to T_UNINITIALIZED, and exit the set_type function.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 060a5bd764a1d798c20eceeaac5399c672334960
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:51 2008 -0300
V4L/DVB (7127): tuner: remove dependency of tuner-core on tuner-types
This patch fully removes the dependency of tuner-core on
tuner-types.
There is no longer any need to pass struct tunertype in attach-time
config structure - instead pass the tuner type ID.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 65e8d29f7a37faaf9c73c633447bebd4b31b2c89
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:50 2008 -0300
V4L/DVB (7126): tuner: move tuner type ID check to simple_tuner_attach
Move tuner type ID check from tuner-core::set_type to simple_tuner_attach.
Since tuner-core forwards all attach requests to tuner-simple as the
default case, unless a specific attach function is specified in
set_type, this change is an appropriate cleanup.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 82b3083d2673e5fe8ac508071038b2b4c10bbf9c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:49 2008 -0300
V4L/DVB (7125): tuner: build tuner-types independently of tuner-core
tuner-types is needed for tuner-simple, and does not need to be bound
to tuner-core. Any caller of tuner-simple, including tuner-core, needs
to pass a structure from tuner-types into tuner-simple at attach-time.
Export the two needed symbols from tuner-types for now, so that card-level
drivers can attach tuner-simple for hybrid dvb_frontend devices. We will
remove this dependency altogether as tuner refactoring phase 3 progresses.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7f8447d13d3abaeb46d0e6ae2890a843aa09561f
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:49 2008 -0300
V4L/DVB (7124): tuner-simple: display frequency in MHz
fix debug in simple_config_lookup to display frequency in MHz
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit be71f7dc73d3afe6d6998a04d5c46d415c3bc62c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:48 2008 -0300
V4L/DVB (7123): tuner-simple: create separate t_params and ranges lookup functions
Move some reuseable code out of simple_set_tv_freq into separate functions.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ff699e6bd02eb1c6d02c7c2b576c2ee6caab201c
Author: Douglas Schilling Landgraf <dougsland at gmail.com>
Date: Tue Apr 22 14:41:48 2008 -0300
V4L/DVB (7094): static memory
- Static memory is always initialized with 0.
- Replaced in some cases C99 comments for /* */
Signed-off-by: Douglas Schilling Landgraf <dougsland at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 29bec0bff50d8f8b108ed22e9981eb4635efc566
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 14:41:45 2008 -0300
V4L/DVB (7114): tuner-xc2028.c: make a function static
dump_firm_type_and_int_freq() can become static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 763896c4b4d030b71880f5cb0ea0dfa7bb5ab96f
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 14:41:45 2008 -0300
V4L/DVB (7107): frontends/xc5000.c: make a struct static
struct XC5000_Standard[] can become static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Reviewed-by: Steven Toth <stoth at hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5eedc466758b5743512d38b5d1eab6f799a39e00
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 14:41:44 2008 -0300
V4L/DVB (7105): ivtv-yuv.c: make 3 functions static
This patch makes the following needlessly global functions static:
- ivtv_yuv_next_free()
- ivtv_yuv_setup_frame()
- ivtv_yuv_udma_frame()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Reviewed-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9ba0a3c0e8147e5c8d04f2b284c44222af517307
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Tue Apr 22 14:41:44 2008 -0300
V4L/DVB (7087): tuner-simple: whitespace / comments / codingstyle cleanups
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a7f796a60bb5dcdc154c3ae04d484a395a60809f
Author: Steve French <sfrench at us.ibm.com>
Date: Thu Apr 24 16:39:07 2008 +0000
[CIFS] Fix typo in previous commit
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 346ad4b7fe392571f19314f153db9151dbc1d82b
Merge: 845199f194306dbd69ca42d3b40a5125cdb50b89 2dc63a84b2db23b9680646aff93917211613bf1a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 09:33:34 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (85 commits)
Blackfin char driver for Blackfin on-chip OTP memory (v3)
Blackfin Serial Driver: fix bug - use mod_timer to replace only add_timer.
Blackfin Serial Driver: the uart break anomaly has been given its own number, so switch to it
Blackfin Serial Driver: use BFIN_UART_NR_PORTS to help SIR driver in uart port.
Blackfin Serial Driver: Fix bug - kernel hangs when accessing uart 0 on bf537 when booting u-boot and linux on uart 1
Blackfin Serial Driver: punt unused lsr variable
Blackfin Serial Driver: Enable IR function when user application (irattach /dev/ttyBFx -s) call TIOCSETD ioctl with line discipline N_IRDA
[Blackfin] arch: add include/boot .gitignore files
[Blackfin] arch: Functional power management support: Add support for cpu frequency scaling
[Blackfin] arch: Functional power management support: Remove broken cpu frequency scaling drivers
[Blackfin] arch: Equalize include files: Add PLL_DIV Masks
[Blackfin] arch: Add a warning about the value of CLKIN.
[Blackfin] arch: take DDR DEVWD into consideration as well for BF548
[Blackfin] arch: Remove the circular buffering mechanism for exceptions
[Blackfin] arch: lose unnecessary dependency on CONFIG_BFIN_ICACHE for MPU
[Blackfin] arch: fix bug - before assign new channel to the map register, need clear the bits first.
[Blackfin] arch: add Blackfin on-chip SIR IrDA driver support
[Blackfin] arch: BF54x memsizes are in mbits, not mbytes
[Blackfin] arch: try to remove condition that causes double fault, by checking current before it gets dereferenced
[Blackfin] arch: Update anomaly list.
...
commit 2dc63a84b2db23b9680646aff93917211613bf1a
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Fri Apr 25 08:04:56 2008 +0800
Blackfin char driver for Blackfin on-chip OTP memory (v3)
initial char driver for otp memory
(only read supported atm ... needs real examples/docs for write support)
v2-v3:
- fixup __initdata with __initconst, as we are heading for 2.6.26
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Acked-by: Jiri Slaby <jirislaby at gmail.com>
commit 0a2784233785226fe5882c8af15118476f89e98e
Author: Sonic Zhang <sonic.zhang at analog.com>
Date: Fri Apr 25 04:36:47 2008 +0800
Blackfin Serial Driver: fix bug - use mod_timer to replace only add_timer.
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=4045
If adding timer in both timer handler and rx interrupt, a timer may be
added when it is till in the pending list.
Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 50e2e15afaac59c955f43d78d0a1e53cf8a76370
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Fri Apr 25 03:03:03 2008 +0800
Blackfin Serial Driver: the uart break anomaly has been given its own number, so switch to it
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 2ade972996feb8f81d7cf2deaf8321e33770c91a
Author: Graf Yang <graf.yang at analog.com>
Date: Fri Apr 25 02:55:49 2008 +0800
Blackfin Serial Driver: use BFIN_UART_NR_PORTS to help SIR driver in uart port.
Signed-off-by: Graf Yang <graf.yang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit ee4987ab5cc9d00be38cfeec90174229565211be
Author: Steve French <sfrench at us.ibm.com>
Date: Thu Apr 24 16:31:12 2008 +0000
[CIFS] Fix define for new proxy cap to match documentation
The transport encryption capability and new SetFSInfo level were missing, and the
new proxy capability (which Samba server is implementing) and proxy setfsinfo needed
to be moved down to not collide with Samba's transport encryption capability.
CC: Jeremy Allison <jra at samba.org>
CC: Sam Liddicott <sam at lidicott.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 845199f194306dbd69ca42d3b40a5125cdb50b89
Merge: 38ccc197eb85cad594eb5863ba5a408655da0062 0d626239ffe515a64a6b53c70896796f621c635c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 08:42:21 2008 -0700
Merge branch 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups
commit 38ccc197eb85cad594eb5863ba5a408655da0062
Merge: d02aacff4467806ee56f147ac8eff6911d95811a 3a841d519f91463361bbbe7addc24a0c1b2e9f99
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 08:41:44 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (250 commits)
[ALSA] ice1724 - Fix IRQ lock-up with MPU access
[ALSA] Define MPU401 registers in sound/mpu401_uart.h
[ALSA] pcsp: fix wording in DEBUG_PAGEALLOC warning
[ALSA] pcsp - Fix dependency in Kconfig
[ALSA] soc - ac97 - Clean up checkpatch warnings
[ALSA] soc - wm8750 - Clean up checkpatch warnings
[ALSA] soc - wm8731 - Clean up checkpatch warnings
[ALSA] soc - pxa2xx-pcm - Fix checkpatch warnings
[ALSA] soc - spitz - Fix checkpatch warnings
[ALSA] soc - poodle - Fix checkpatch warnings
[ALSA] soc - corgi - Fix checkpatch warnings
[ALSA] soc - s3c24xx-i2s - Add missing spaces
[ALSA] soc - s3c24xx-i2s - Fix tab/space breakage
[ALSA] soc - s3c24xx-i2s - Use linux/io.h
[ALSA] hda - Fix Thinkpad X300 digital mic
pcsp - Don't build pcspkr when snd-pcsp is enabled
[ALSA] hda - Fix model for Acer Aspire 5720z
[ALSA] soc - s3c24xx - Declare suspend and resume static
[ALSA] soc - s3c24xx - Improve diagnostic output
[ALSA] Fix possible races at free_irq in PCI drivers
...
commit d02aacff4467806ee56f147ac8eff6911d95811a
Merge: e270b51df657011983241ec61a1fc7de186e16cd 9edb74cc6ccb3a893c3d40727b7003c3c16f85a0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 08:40:34 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits)
tun: Multicast handling in tun_chr_ioctl() needs proper locking.
[NET]: Fix heavy stack usage in seq_file output routines.
[AF_UNIX] Initialise UNIX sockets before general device initcalls
[RTNETLINK]: Fix bogus ASSERT_RTNL warning
iwlwifi: Fix built-in compilation of iwlcore (part 2)
tun: Fix minor race in TUNSETLINK ioctl handling.
ppp_generic: use stats from net_device structure
iwlwifi: Don't unlock priv->mutex if it isn't locked
wireless: rndis_wlan: modparam_workaround_interval is never below 0.
prism54: prism54_get_encode() test below 0 on unsigned index
mac80211: update mesh EID values
b43: Workaround DMA quirks
mac80211: fix use before check of Qdisc length
net/mac80211/rx.c: fix off-by-one
mac80211: Fix race between ieee80211_rx_bss_put and lookup routines.
ath5k: Fix radio identification on AR5424/2424
ssb: Fix all-ones boardflags
b43: Add more btcoexist workarounds
b43: Fix HostFlags data types
b43: Workaround invalid bluetooth settings
...
commit e270b51df657011983241ec61a1fc7de186e16cd
Merge: 8fa82790fb9dfe57aeafc8de6b6a5c1df63efa06 227739bf4c110bbd02d0c0f13b272c32de406e4c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 08:37:29 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (23 commits)
sparc: sunzilog uart order
[SPARC64]: Detect trap frames in stack backtraces.
[SPARC64]: %l6 trap return handling no longer necessary.
[SPARC64]: Use trap type stored in pt_regs to handle syscall restart.
[SPARC64]: Store magic cookie and trap type in pt_regs.
[SPARC64]: PROM debug console can be CON_ANYTIME.
sparc64: cleanup after SunOS/Solaris binary emulation removal
sparc: cleanup after SunOS binary emulation removal
[SPARC64]: Add NUMA support.
[SPARC64]: Allocate TSB node-local.
[SPARC64]: NUMA device infrastructure.
[SPARC64]: Kill pci_iommu_table_init() declaration.
[SPARC64]: Once we have the boot cmdline, call parse_early_param()
[SPARC64]: Remove unused asm-sparc64/numnodes.h
[SPARC64]: Decrease SECTION_SIZE_BITS to 30.
[SPARC64]: Initialize MDESC earlier and use lmb_alloc()
[SPARC64]: Use lmb_alloc() for PROM device tree.
[SPARC64]: Call real_setup_per_cpu_areas() earlier and use lmb_alloc().
[SPARC64]: Fully use LMB information in bootmem_init().
[SPARC64]: Start using LMB information in bootmem_init().
...
commit 8fa82790fb9dfe57aeafc8de6b6a5c1df63efa06
Merge: 2444e56b0c08e6f3e3877583841a1213e3263d98 4a1fd556c1f1fbd6d9d6739efec042324732b697
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Apr 24 08:36:11 2008 -0700
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] fix 48d7927bdf071d05cf5d15b816cf06b0937cb84f
[ARM] 5010/1: htc-pasic3: remove unused defines and includes
[ARM] pxa: fix 0e623941bec7e80c97b076d346327b31ae17d84a
[ARM] fix lh7a40x/kev7a400 build
commit 2444e56b0c08e6f3e3877583841a1213e3263d98
Author: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Date: Thu Apr 24 16:54:50 2008 +0400
alpha: unbreak OSF/1 (a.out) binaries
OSF/1 brk(2) was broken by following one-liner in sys_brk()
(commit 4cc6028d4040f95cdb590a87db478b42b8be0508):
- if (brk < mm->end_code)
+ if (brk < mm->start_brk)
goto out;
The problem is that osf_set_program_attributes()
does update mm->end_code, but not mm->start_brk,
which still contains inappropriate value left from
binary loader, so brk() always fails.
Signed-off-by: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 72cff12397cd6648b8b5abfaeb00502f45b76cb8
Author: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Date: Thu Apr 24 16:51:55 2008 +0400
alpha: fix legacy mode PCI IDE controllers
Legacy IDE resources were never properly allocated on most
alpha platforms, so IDE expectedly stopped working after
commit 10f000a2fd805e8ccfe988e8615545467bb7f7df (generic
pci_enable_resources).
Always allocate "fixed" PCI resources before doing anything else;
remove Cypress IDE quirk, as it's a generic problem which is
handled in common PCI probe code.
Signed-off-by: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Acked-by: Jeff Garzik <jgarzik at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 36d99df2fb474222ab47fbe8ae7385661033223b
Merge: 076d8423a98659a92837b07aa494cb74bfefe77c 3dc5063786b273f1aee545844f6bd4e9651ebffe
Author: Steve French <sfrench at us.ibm.com>
Date: Thu Apr 24 15:26:50 2008 +0000
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
commit 8911c9e3343c647b59727b47b10feca7ee9ac9c3
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Fri Apr 18 23:39:03 2008 +0400
[SCSI] aic79xx: fix MMIO for PPC 44x platforms
The driver stores the PCI resource address into 'u_long' variable before
calling ioremap_nocache() on it. This warrants kernel oops when the registers
are accessed on PPC 44x platforms which (being 32-bit) have PCI memory space
mapped beyond 4 GB.
The arch/ppc/ kernel has a fixup in ioremap() that helps create an illusion
that the PCI memory resources are mapped below 4 GB, but arch/powerpc/ code
got rid of this trick, having instead CONFIG_RESOURCES_64BIT enabled.
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 448504130f18bc9d8d10ba045775c906abd01438
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Fri Apr 18 23:30:45 2008 +0400
[SCSI] aic7xxx: fix MMIO for PPC 44x platforms
The driver stores the PCI resource address into 'u_long' variable before
calling ioremap_nocache() on it. This warrants kernel oops when the registers
are accessed on PPC 44x platforms which (being 32-bit) have PCI memory space
mapped beyond 4 GB.
The arch/ppc/ kernel has a fixup in ioremap() that helps create an illusion
that the PCI memory resources are mapped below 4 GB, but arch/powerpc/ code
got rid of this trick, having instead CONFIG_RESOURCES_64BIT enabled.
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit be0d67680d524981dd65c661efe3c9cbd52a684f
Author: Denys Vlasenko <vda.linux at googlemail.com>
Date: Sun Mar 23 04:41:22 2008 +0100
[SCSI] aic7xxx, aic79xx: deinline functions
Deinlines and moves big functions from .h to .c files.
Adds prototypes for ahc_lookup_scb and ahd_lookup_scb to .h files.
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit d3930614e68bdf83a120d904c039a64e9f75dba1
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Mon Apr 21 11:54:13 2008 +0100
[ARM] 5014/1: Cleanup reset state before entering suspend or resetting.
The kernel should clean stale bits from reset status, so that
they won't confuse the bootloader.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 406b1ea441cb86671c5b57d2ce722d217914d524
Author: Mike Rapoport <mike at compulab.co.il>
Date: Mon Apr 21 10:56:32 2008 +0100
[ARM] 5013/1: Change ITE8152 interrupt numbers
The patch kills the use of IRQ_GPIO() and adds
#if NR_IRQS < (IT8152_LAST_IRQ+1) statement.
Signed-off-by: Mike Rapoport <mike at compulab.co.il>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 5826042d3c550522e49a8a55db64d9c47b43a8f9
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Sun Apr 20 17:42:59 2008 +0100
[ARM] 5011/1: htc-pasic3: fix bug in resource pipe-through to ds1wm
The newly created DS1WM platform device should get a copy of the PASIC3
platform devices' resources.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 0d626239ffe515a64a6b53c70896796f621c635c
Author: Jeff Garzik <jeff at garzik.org>
Date: Thu Apr 24 08:35:37 2008 -0400
arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups
The recent irq cleanups for arch/arm/mach-integrator/time.c and
drivers/char/mwave/tp3780i.c changed the request_irq() dev_id
parameter, but neglected to change the matching free_irq() parameter,
thus creating a bug upon irq de-registration.
Given that the impetus for the changes is not yet accepted upstream,
it is best to revert the irq cleanups.
Mostly. A comment is added to time.c to reduce future confusion,
of type that led to my time.c cleanup in the first place.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 884d04cd8d7bba3dc885227ad400f8aea5623cdc
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date: Thu Apr 24 20:27:39 2008 +1000
[POWERPC] celleb: Add support for PCI Express
This adds support for PCI Express port on Celleb. I/O space of this
PCI Express port is not mapped in memory space. So we use the
io-workaround mechanism to make accesses indirect.
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd at arndb.de>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit ad2c6987978d17b58204926e9be776955935f8b1
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date: Thu Apr 24 19:31:40 2008 +1000
[POWERPC] celleb: Move miscellaneous files for Beat
This moves miscellaneous files for Beat into platforms/cell/.
All files in this patch are used by celleb-beat only.
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd at arndb.de>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit c11dde85b62f9811eb2db656d9b0b4ad23d94871
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date: Thu Apr 24 19:29:50 2008 +1000
[POWERPC] celleb: Move a file for SPU on Beat
This moves SPU support code on Beat into platforms/cell/.
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd at arndb.de>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 8ae6e30d2d6b4a7a45bb0d4fa4ecd56e65d24740
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date: Thu Apr 24 19:28:48 2008 +1000
[POWERPC] celleb: Move files for Beat mmu and iommu
This moves files for mmu and iommu on Beat into platforms/cell/.
All files in this patch are used by celleb-beat only.
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd at arndb.de>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 5a96dfe84b53cc05abe8c7f4d1dfd7b03a3e314a
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date: Thu Apr 24 19:27:32 2008 +1000
[POWERPC] celleb: Move files for Beat hvcall interfaces
This moves files for Beat hvcall interfaces into platforms/cell/.
All files in this patch are used by celleb-beat only.
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd at arndb.de>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 11eef455c2834e192c6ffe9f3ffd09af70fafe81
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date: Thu Apr 24 19:26:28 2008 +1000
[POWERPC] celleb: Move the SCC related code for celleb
This moves the SCC (Super Companion Chip) related code for celleb
into platforms/cell/.
All files in this patch are used by celleb-beat and celleb-native
commonly.
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd at arndb.de>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 116bdc425c7e01e97cff2f3e6d0134511e8f13e3
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date: Thu Apr 24 19:25:16 2008 +1000
[POWERPC] celleb: Move the files for celleb base support
This moves the base code for celleb support into platforms/cell/.
All files in this patch are used by celleb-beat and celleb-native
commonly.
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 6ec859e1b21ab42bfc36bb3b51db275480165c8a
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date: Thu Apr 24 19:24:13 2008 +1000
[POWERPC] celleb: Consolidate io-workarounds code
Now, we can use generic io-workarounds mechanism and the workaround
code for spider-pci. This changes Celleb PCI code to use spider-pci
code.
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd at arndb.de>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 7cfb62a2e820b6032c08835dbd996d8518af14a3
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date: Thu Apr 24 19:21:10 2008 +1000
[POWERPC] cell: Generalize io-workarounds code
This splits cell io-workaround code into spider-pci dependent code and
a generic part, and also moves io-workarounds initialization into
cell_setup_phb.
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 36f8a2c4c61e3559a95190e457b431c6900859b4
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu Apr 24 15:13:21 2008 +1000
[POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
Add a DEBUG config setting which turns on all (most) of the debugging
under platforms/pseries.
To have this take effect we need to remove all the #undef DEBUG's, in
various files. We leave the #undef DEBUG in platforms/pseries/lpar.c,
as this enables debugging printks from the low-level hash table routines,
and tends to make your system unusable. If you want those enabled you
still have to turn them on by hand.
Also some of the RAS code has a DEBUG block which causes a functional
change, so I've keyed this off a different (non-existant) debug #define.
This is only enabled if you have PPC_EARLY_DEBUG enabled also.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f7ebf352b2e04ee89efb426e33dd450d8f1cfcd5
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu Apr 24 15:13:19 2008 +1000
[POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
In pseries/lpar.c, fix some printf specifier mismatches, and add
a newline to one printk.
In pseries/rtasd.c add "rtasd" to some messages to make it clear
where they're coming from.
In pseries/scanlog.c remove the hand-rolled runtime debugging support
in there. This file has been largely unchanged for eons, if we need to
debug it in future we can recompile.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit cb1e2ab45a92b31114dfe6e34832a084f9b0b263
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu Apr 24 15:13:17 2008 +1000
[POWERPC] Register udbg console early on pseries LPAR
On pseries LPAR we can call the udbg routines, and the udbg console very
early. So mark the udbg console as safe to call early in boot, and register
the udbg console as soon as the udbg routines are hooked up.
This allows platforms/pseries code to use printk() and pr_debug() rather
than needing to call udbg_printf() directly for early debugging. This is
nice because a) it's standard, b) it goes via the printk buffer, and c)
you can get printk time stamps.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f336632f191ebf157aeea0f1e65eb1b263655ffc
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu Apr 24 15:13:14 2008 +1000
[POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
The udbg console should be safe to call basically at any time after boot.
It does not need any per-cpu resources or for the cpu to be online, as
long as there is a udbg_putc routine hooked up it should work. So mark it
as CON_ANYTIME.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit c7afb4e22961b5ec88eb6f7b81260dafa9f287c7
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu Apr 24 15:13:13 2008 +1000
[POWERPC] Set udbg_console index to 0
Because the udbg_console has CON_ENABLED set, it's possible that when we
register it with the console code the index won't be set. This leads to
slightly confusing boot messages like:
[ 0.000000] console [udbg-1] enabled
We could remove CON_ENABLED, but we don't want to do that, we always
want the udbg console to be activated, even if the user specified some
other console on the command line.
The simplest fix seems to be just to set the index to 0 by hand. There
is no issue with duplicate udbg consoles, as we guard against registering
multiple times in register_early_udbg_console().
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 90035fe378c7459ba19c43c63d5f878284224ce4
Author: Tony Breeds <tony at bakeyournoodle.com>
Date: Thu Apr 24 13:43:49 2008 +1000
[POWERPC] Raise the upper limit of NR_CPUS and move the pacas into the BSS
This adds the required functionality to fill in all pacas at runtime.
With NR_CPUS=1024
text data bss dec hex filename
137 1704032 0 1704169 1a00e9 arch/powerpc/kernel/paca.o :Before
121 1179744 524288 1704153 1a00d9 arch/powerpc/kernel/paca.o :After
Also remove unneeded #includes from arch/powerpc/kernel/paca.c
Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 9cb82f2f4692293a27c578c3038518ce4477de72
Author: Tony Breeds <tony at bakeyournoodle.com>
Date: Thu Apr 24 13:43:49 2008 +1000
[POWERPC] Make iSeries spin on __secondary_hold_spinloop, like pSeries
Currently all iSeries secondary CPUs spin directly on the cpu_start
field in their paca. Make them spin on the global
__secondary_hold_spinloop until after the pacas have been initialised.
As Stephen Rothwell points out, this works at the moment because
__secondary_hold_spinloop is being set already, but iSeries isn't
looking at it :)
Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
Acked-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 4ae2dcb633c751cfd27deeea5a8b13db35a84d9a
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Thu Apr 24 13:20:16 2008 +1000
[POWERPC] Clean up misc_64.S
* Removed get_msr(), get_srr0(), and get_srr1() - not used anywhere
* Use STACK_FRAME_OVERHEAD instead of magic number
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 988479ebccc44e141d06ac55e4438d6b473008b5
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu Apr 24 12:08:54 2008 +1000
[POWERPC] Use of_get_next_parent() in platforms/cell/axon_msi.c
Replace two open-coded occurences of the of_get_next_parent() logic.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 5c02cd2fb83bd4a11270eeb6682e507f04897837
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu Apr 24 12:08:22 2008 +1000
[POWERPC] Discourage people from fiddling with kernel data from prom_init
As BenH said the other day, it is an "accident" that prom_init.o is
linked with the rest of the kernel. The truth is a little more
subtle, prom_init isn't truly bootloader, it does access kernel data
in a few places.
What we can do is discourage people from adding new code that accesses
data outside of prom_init. And hence this patch; from the script:
# This script checks prom_init.o to see what external symbols it
# is using, if it finds symbols not in the whitelist it returns
# an error. The point of this is to discourage people from
# intentionally or accidentally adding new code to prom_init.c
# which has side effects on other parts of the kernel.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit d9e9d82c24e55b8a0fcc89032fdf9f58f1fb56d7
Author: Timur Tabi <timur at freescale.com>
Date: Thu Apr 24 08:45:26 2008 +1000
[POWERPC] Add Timur Tabi to the MAINTAINERS file
Add Timur Tabi as the maintainer for the Freescale QE library, the
Freescale QE UART device driver, the Freescale SOC sound drivers, and
the Crystal Semiconductor CS4270 device driver.
Signed-off-by: Timur Tabi <timur at freescale.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 91120cc8e07f39078e9a60f1feac7cf665b17c2b
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Thu Apr 24 06:33:49 2008 +1000
[POWERPC] Cleanup asm-offsets.c
* Removed TI_EXECDOMAIN define as its not used anywhere
* Use STACK_INT_FRAME_SIZE to allow common define of INT_FRAME_SIZE
* Define TI_CPU on both ppc32 & ppc64 (removes an ifdef).
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f608600e74404c5c8f017af45294074282911ae9
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Thu Apr 24 06:29:36 2008 +1000
[POWERPC] Clean up access to thread_info in assembly
Use (31-THREAD_SHIFT) to get to thread_info from stack pointer. This makes
the code a bit easier to read and more robust if we ever change THREAD_SHIFT.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 885aa35c9669ce7919d203036a87a7e1a4ebd25f
Author: Christoph Hellwig <hch at lst.de>
Date: Thu Apr 24 00:32:29 2008 +1000
[POWERPC] Fix new warnings arising from stacktrace patch
Remove the inclusion of asm-offsets.h from stacktrace.c. It isn't
supposed to be included in C code and it causes problems with multiple
definitions of things.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 2c419bdeca1d958bb02228b5141695f312d8c633
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Wed Apr 23 23:05:20 2008 +1000
[POWERPC] Port fixmap from x86 and use for kmap_atomic
The fixmap code from x86 allows us to have compile time virtual addresses
that we change the physical addresses of at run time.
This is useful for applications like kmap_atomic, PCI config that is done
via direct memory map, kexec/kdump.
We got ride of CONFIG_HIGHMEM_START as we can now determine a more optimal
location for PKMAP_BASE based on where the fixmap addresses start and
working back from there.
Additionally, the kmap code in asm-powerpc/highmem.h always had debug
enabled. Moved to using CONFIG_DEBUG_HIGHMEM to determine if we should
have the extra debug checking.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 2fd53e02be9a73cc49d69e0ff8860daa7b5bf8ab
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Apr 23 19:51:38 2008 +1000
[POWERPC] char/xilinx_hwicap/ section fix
This patch fixes the following build error:
<-- snip -->
...
CC [M] drivers/char/xilinx_hwicap/xilinx_hwicap.o
...
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/char/xilinx_hwicap/xilinx_hwicap.c:806: error: hwicap_of_match causes a section type conflict
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/char/xilinx_hwicap/xilinx_hwicap.c:806: error: hwicap_of_match causes a section type conflict
make[4]: *** [drivers/char/xilinx_hwicap/xilinx_hwicap.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 138decf83f6a973951ce7faf39094d964de7853a
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Apr 23 19:51:34 2008 +1000
[POWERPC] drivers/of/of_i2c.c: Add MODULE_LICENSE
After commit 585468e5d5962660867c269e26f0a4b89a599473
([POWERPC] i2c: Fix build breakage introduced by OF helpers)
drivers/of/of_i2c.c needs a MODULE_LICENSE.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 37dd2badcfcec35f5e21a0926968d77a404f03c3
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Tue Apr 22 04:22:34 2008 +1000
[POWERPC] 85xx: Add support for relocatable kernel (and booting at non-zero)
Added support to allow an 85xx kernel to be run from a non-zero physical
address (useful for cooperative asymmetric multiprocessing situations and
kdump). The support can be configured at compile time by setting
CONFIG_PAGE_OFFSET, CONFIG_KERNEL_START, and CONFIG_PHYSICAL_START as
desired.
Alternatively, the kernel build can set CONFIG_RELOCATABLE. Setting this
config option causes the kernel to determine at runtime the physical
addresses of CONFIG_PAGE_OFFSET and CONFIG_KERNEL_START. If
CONFIG_RELOCATABLE is set, then CONFIG_PHYSICAL_START has no meaning.
However, CONFIG_PHYSICAL_START will always be used to set the LOAD program
header physical address field in the resulting ELF image.
Currently we are limited to running at a physical address that is a
multiple of 256M. This is due to how we map TLBs to cover
lowmem. This should be fixed to allow 64M or maybe even 16M alignment
in the future. It is considered an error to try and run a kernel at a
non-aligned physical address.
All the magic for this support is accomplished by proper initialization
of the kernel memory subsystem and use of ARCH_PFN_OFFSET.
The use of ARCH_PFN_OFFSET only affects normal memory and not IO mappings.
ioremap uses map_page and isn't affected by ARCH_PFN_OFFSET.
/dev/mem continues to allow access to any physical address in the system
regardless of how CONFIG_PHYSICAL_START is set.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 96f1bb8a412aec3fc16306ef07c5bdb426edb615
Author: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Date: Tue Apr 22 10:50:27 2008 +1000
[POWERPC] Add strncmp to arch/ppc
Commit 0119536cd314ef95553604208c25bc35581f7f0a added an assembly
version of strncmp to PowerPC. However, it changed a common header
file between arch/ppc and arch/powerpc without adding strncmp to
arch/ppc. This fixes that omission so that arch/ppc links again.
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit e91d7119ba8031f57cee5814e31c893487844011
Author: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Date: Tue Apr 22 10:49:34 2008 +1000
[POWERPC] 4xx: Fix duplicate phys_addr_t definition
Commit d04ceb3fc294ea2c4f538a04343f3a473953a3b0 moved phys_addr_t
definitions to include/asm-powerpc/types.h. However, arch/ppc 440
builds had a duplicate definition in include/asm-ppc/mmu.h that caused
the build to fail.
This removes the duplicate definition in arch/ppc.
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit df40a57ef16219e5dee75238559960b1dd459c65
Author: Remi Machet <rmachet at slac.stanford.edu>
Date: Tue Apr 22 07:02:56 2008 +1000
[POWERPC] Fix mv64x60 early console code to use cell-index property
The MPSC driver and prpmc2800.dts have been modified to use property
'cell-index' as the serial port number, but the early serial console
driver for the mv64x60 has not been modified to use this new property.
This fixes it.
Signed-off-by: Remi Machet (rmachet at slac.stanford.edu)
Acked-by: Dale Farnsworth <dale at farnsworth.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit ff114b669b45480688198f28d6aad1a61223335d
Author: Remi Machet <rmachet at slac.stanford.edu>
Date: Tue Apr 22 04:46:12 2008 +1000
[POWERPC] Initialize all mv64x60 devices even if one fails
If one of the devices of the mv64x60 init fails, the remaining
devices are not initialized.
This changes the code to display an error and continue the
initialization.
Signed-off-by: Remi Machet (rmachet at slac.stanford.edu)
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 21dbfd291fe704986fab63a129f89ed2de471329
Author: Remi Machet <rmachet at slac.stanford.edu>
Date: Tue Apr 22 03:36:48 2008 +1000
[POWERPC] Use default values if necessary in mv64x60 I2C initialization
I2C parameters freq_m and freq_n are assigned defaults in the code,
but if properties for those parameters are not found in the open
firmware description the init routine returns an error and doesn't
create the platform device.
This changes the code so that it doesn't return an error if the
properties are not found but instead uses the default values.
Signed-off-by: Remi Machet (rmachet at slac.stanford.edu)
Acked-by: Dale Farnsworth <dale at farnsworth.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 839ad62e75ee1968438d1b72261304cd47fc961e
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Fri Apr 18 16:56:18 2008 +1000
[POWERPC] Use __weak macro for smp_setup_processor_id
Use the __weak macro instead of the longer __attribute__ ((weak)) form
in one place in init/main.c.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Acked-by: Andrew Morton <akpm at linux-foundation.org>
--
init/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f6a616800e68b61807d0f7bb0d5dc70665ef8046
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Fri Apr 18 16:56:17 2008 +1000
[POWERPC] Fix kernel stack allocation alignment
The powerpc kernel stacks need to be naturally aligned, as they
contain the thread info at the bottom, which is obtained by
clearing the low bits of the stack pointer.
However, when using 64K pages, the stack is smaller than a page,
so we use kmalloc to allocate it, but that doesn't provide the
alignment guarantee we need.
It appeared to work so far... until one enables SLUB debugging
which then returns unaligned pointers. Ooops...
This fixes it by using a slab cache with enforced alignment. It
relies on my previous patch that adds a thread_info_cache_init()
callback.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Acked-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 8c9843e57a7d9d7a090d6467a0f1f3afb8031527
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Fri Apr 18 16:56:15 2008 +1000
[POWERPC] Add thread_info_cache_init() weak hook
Some architectures need to maintain a kmem cache for thread info
structures. The next commit adds that to powerpc to fix an alignment
problem.
There is no good arch callback to use to initialize that cache
that I can find, so this adds a new one in the form of a weak
function whose default is empty.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Acked-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 1d32e21889b96e594e8b63b193bf7d2a51ab93ec
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date: Thu Apr 10 07:01:53 2008 +1000
[POWERPC] PS3: Fix gelic net module dependency
The PS3 gelic network driver depends on the wake-on-lan support
provided by the PS3 sys manager driver. Add that dependency
to the GELIC_NET Kconfig option.
Prevents these build errors:
ps3_gelic_net.c:1277: undefined reference to `.ps3_sys_manager_get_wol'
ps3_gelic_net.c:1337: undefined reference to `.ps3_sys_manager_set_wol'
CC: Masakazu Mokuno <mokuno at sm.sony.co.jp>
CC: Jeff Garzik <jgarzik at pobox.com>
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit e988a13960c61be426feca46bbc124c4126f1edc
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu Feb 14 11:37:50 2008 +1100
[POWERPC] Add include of linux/of.h to os-area.c
os-area.c requires routines declared in linux/of.h, so should include it.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 6df1646e314de0ef8dc2a38f04eb6110b9134e65
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Thu Feb 14 11:37:49 2008 +1100
[POWERPC] Add include of linux/of.h to numa.c
numa.c requires routines declared in linux/of.h, so should include it.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 36a23fc8aa0c72ecafe7aaee0a823b03b301e1df
Merge: 23386fe572028ca0f9249fb3c71ed31b54cf1665 fc215fe7e6f0420afee0e0987fcc311929ee662f
Author: Paul Mackerras <paulus at samba.org>
Date: Thu Apr 24 20:57:20 2008 +1000
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
commit 23386fe572028ca0f9249fb3c71ed31b54cf1665
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri Apr 18 13:33:53 2008 -0700
[POWERPC] macintosh/windfarm: Fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias
is prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable
"macintosh" platform drivers, to re-enable auto loading.
[dbrownell at users.sourceforge.net: registration fixes]
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 9edb74cc6ccb3a893c3d40727b7003c3c16f85a0
Author: David S. Miller <davem at davemloft.net>
Date: Thu Apr 24 03:44:43 2008 -0700
tun: Multicast handling in tun_chr_ioctl() needs proper locking.
Since these operations don't go through the normal
device calls, we have to ensure we synchronize with
those paths.
Noticed by Alan Cox.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3a841d519f91463361bbbe7addc24a0c1b2e9f99
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Apr 23 17:47:28 2008 +0200
[ALSA] ice1724 - Fix IRQ lock-up with MPU access
The sound boards with VT1724 and compatible chips may lock up when
MPU401 is accessed together with the PCM streaming.
This patch fixes the problem.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit b415ed45f4db9f8365daac84cf2518642a174dc0
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Apr 23 17:47:28 2008 +0200
[ALSA] Define MPU401 registers in sound/mpu401_uart.h
Define some MPU401 registers in sound/mpu401_uart.h so that other
drivers can refer to them.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit efd89d9dcf75ab0a31b200db0ae4ae19cad25e48
Author: Stas Sergeev <stsp at aknet.ru>
Date: Wed Apr 23 17:16:38 2008 +0200
[ALSA] pcsp: fix wording in DEBUG_PAGEALLOC warning
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
(fixed invalid KERN_WARNING by tiwai)
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 73bdd2ad7aac70456494c4a1d93f99fe88184dba
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Apr 23 17:08:58 2008 +0200
[ALSA] pcsp - Fix dependency in Kconfig
Added the proper dependency to Kconfig for snd-pcsp driver.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 227739bf4c110bbd02d0c0f13b272c32de406e4c
Author: Robert Reif <reif at earthlink.net>
Date: Thu Apr 24 03:37:51 2008 -0700
sparc: sunzilog uart order
I have a sparcstation 20 clone with a lot of on board serial ports.
The serial core code assumes that uarts are assigned contiguously
and that may not be the case when there are multiple zs devices
present. This patch insures that uart chips are placed in front of
keyboard/mouse chips in the port table.
ffd37420: ttyS0 at MMIO 0xf1100000 (irq = 44) is a zs (ESCC)
Console: ttyS0 (SunZilog zs0)
console [ttyS0] enabled
ffd37420: ttyS1 at MMIO 0xf1100004 (irq = 44) is a zs (ESCC)
ffd37500: Keyboard at MMIO 0xf1000000 (irq = 44) is a zs
ffd37500: Mouse at MMIO 0xf1000004 (irq = 44) is a zs
ffd3c5c0: ttyS2 at MMIO 0xf1100008 (irq = 44) is a zs (ESCC)
ffd3c5c0: ttyS3 at MMIO 0xf110000c (irq = 44) is a zs (ESCC)
ffd3c6a0: ttyS4 at MMIO 0xf1100010 (irq = 44) is a zs (ESCC)
ffd3c6a0: ttyS5 at MMIO 0xf1100014 (irq = 44) is a zs (ESCC)
ffd3c780: ttyS6 at MMIO 0xf1100018 (irq = 44) is a zs (ESCC)
ffd3c780: ttyS7 at MMIO 0xf110001c (irq = 44) is a zs (ESCC)
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 77c664fa58624079f7a0fc29b46e8a32883633a5
Author: David S. Miller <davem at davemloft.net>
Date: Thu Apr 24 03:28:52 2008 -0700
[SPARC64]: Detect trap frames in stack backtraces.
Now that we have a magic cookie in the pt_regs, we can
properly detect trap frames in stack bactraces.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7697daaa894ca2bc5cd652269c316bcdc3ec441b
Author: David S. Miller <davem at davemloft.net>
Date: Thu Apr 24 03:15:22 2008 -0700
[SPARC64]: %l6 trap return handling no longer necessary.
Now that we indicate the "restart system call" in the
trap type field of pt_regs->magic, we don't need to
set the %l6 boolean in all of the trap return paths.
And we therefore don't need to pass it to do_notify_resume().
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 238468b2ac76020c192a7402c92df5097916bf4a
Author: David S. Miller <davem at davemloft.net>
Date: Thu Apr 24 03:01:48 2008 -0700
[SPARC64]: Use trap type stored in pt_regs to handle syscall restart.
Now that we can check the trap type directly, we don't need the
funny restart_syscall indication from the trap return paths.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 24c053e755f2f77d9c9d9a9250ca1132eae280e7
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:26:45 2008 +0200
[ALSA] soc - ac97 - Clean up checkpatch warnings
Also change some if (x == NULL) to if (!x).
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 42f3030f0cac474fc3232c8028b97f54b985718c
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:17:12 2008 +0200
[ALSA] soc - wm8750 - Clean up checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d454aee9be72472ee18b5397fda2c673f40a1e69
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:16:46 2008 +0200
[ALSA] soc - wm8731 - Clean up checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit b32432e3f2d386d9563669c8cfdeaa473bfd8572
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:14:18 2008 +0200
[ALSA] soc - pxa2xx-pcm - Fix checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 22cd630285b6a12a50f02dfb23c531f151be5499
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:13:33 2008 +0200
[ALSA] soc - spitz - Fix checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 29e36e49bdb7f24ca7cc0fb980fab2c407a8a2c9
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:13:04 2008 +0200
[ALSA] soc - poodle - Fix checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 1bfcd361461f25be7d6d180a8da30d02bc124046
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:12:19 2008 +0200
[ALSA] soc - corgi - Fix checkpatch warnings
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0fe564a564922465ec3c483cee0e3dc6b368d879
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:10:28 2008 +0200
[ALSA] soc - s3c24xx-i2s - Add missing spaces
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0015e7d1e2b09443ac76573a2fb886854aa1ca15
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:09:57 2008 +0200
[ALSA] soc - s3c24xx-i2s - Fix tab/space breakage
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 40efc15fc637cff22cf9c4f02c63f3f398320f83
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 23 15:09:31 2008 +0200
[ALSA] soc - s3c24xx-i2s - Use linux/io.h
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 05808ecc45802c1b533f42ed701a132d4c949034
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Apr 23 13:50:08 2008 +0200
[ALSA] hda - Fix Thinkpad X300 digital mic
TP X300 digital mic requires additional init verbs with magic COEFs.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5bae4199522c56110d33e6fd925c052bc5ae36a1
Author: Stas Sergeev <stsp at aknet.ru>
Date: Wed Apr 23 10:50:32 2008 +0200
pcsp - Don't build pcspkr when snd-pcsp is enabled
- Update CREDITS with the pc-speaker driver authors.
- Prevent pcspkr from being built together with snd-pcsp.
Both pcspkr and snd-pcsp use the same platform driver name "pcspkr".
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
commit a0b8f7d89b8de0cc79999b9fdd3a303912f3b2a3
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Apr 22 19:39:49 2008 +0200
[ALSA] hda - Fix model for Acer Aspire 5720z
Set the proper model=acer for Acer Aspire 5720z with ALC268 codec.
ALSA bug#3550:
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3550
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d8ed061a9fb2ab1f4bd90b5c30f4dc98b9c2085b
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Tue Apr 22 18:27:22 2008 +0200
[ALSA] soc - s3c24xx - Declare suspend and resume static
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 409203074e9f3c423cdc7c38f984ce24ae261556
Author: Tim Niemeyer <reddog at mastersword.de>
Date: Tue Apr 22 18:26:59 2008 +0200
[ALSA] soc - s3c24xx - Improve diagnostic output
Add some debug messages for suspend/resume and to add a clear prefix to
s3c24xx-i2s and s3c24xx-pcm.
Signed-off-by: Tim Niemeyer <reddog at mastersword.de>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ebf029da38829ede6b53ac8a5ad45b149064ea16
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Apr 22 17:28:11 2008 +0200
[ALSA] Fix possible races at free_irq in PCI drivers
The irq handler of PCI drivers must be released before releasing other
resources since the handler for a shared irq can be still called and
may access the freed resource again.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 6b9a9b329640b7e8143df7b2782884ea758650f7
Author: Tim Niemeyer <reddog at mastersword.de>
Date: Tue Apr 22 17:10:23 2008 +0200
[ALSA] soc - neo1973_wm8753 - Fix module unload
Signed-off-by: Tim Niemeyer <reddog at mastersword.de>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 815c1be320fd51e5981c007f737aca410707baf8
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Tue Apr 22 17:09:49 2008 +0200
[ALSA] pxa2xx-ac97: Support PXA3xx AC97
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7a22323b231fe5d47804f98f31a70eb34c6104a9
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Tue Apr 22 17:08:52 2008 +0200
[ALSA] soc - Support PXA3xx AC97
The PXA3xx does not support the use of interrupts during reset and access
to the GPIO status requires similar handling to that for PXA27x.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d80fd0935e2c177ae58d85cb736684ff6c00314d
Author: Peter Lienig <lienig at rheinmetall-de.com>
Date: Tue Apr 22 17:05:07 2008 +0200
[ALSA] ice1712 - Add Terrasoniq TS88 support
Added the support of Terrasonq TS88.
Signed-off-by: Peter Lienig <lienig at rheinmetall-de.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f000fd80937c0d94c67f9f3e7026f1fbc8ef8873
Author: Jeff Garzik <jgarzik at redhat.com>
Date: Tue Apr 22 13:50:34 2008 +0200
[ALSA] Fix synchronize_irq() bugs, redundancies
free_irq() calls synchronize_irq() for you, so there is no need for
drivers to manually do the same thing (again). Thus, calls where
sync-irq immediately precedes free-irq can be simplified.
However, during this audit several bugs were noticed, where free-irq is
preceded by a "irq >= 0" check... but the sync-irq call is not covered
by the same check.
So, where sync-irq could not be eliminated completely, the missing check
was added.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 8a87c9cf999542db846c3ab93c1065d446427f37
Author: Karsten Wiese <fzu at wemgehoertderstaat.de>
Date: Tue Apr 22 12:53:12 2008 +0200
[ALSA] Audiophile 192: Fix ad converter initialization
Correct some arguments in calls to snd_ice1712_gpio_write_bits() from
ap192_set_rate_val().
Signed-off-by: Karsten Wiese <fzu at wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 775c199e6af5e4212bfa7ebeadee09563c14694b
Author: Karsten Wiese <fzu at wemgehoertderstaat.de>
Date: Tue Apr 22 12:52:45 2008 +0200
[ALSA] Don't set gpio mask register in snd_ice1712_gpio_write_bits()
Some calls to snd_ice1712_gpio_write() go wrong, if
snd_ice1712_gpio_write_bits() ran before and changed the gpio mask register.
Read the actual gpio value and combine it with the to be set bits in the cpu
instead.
Signed-off-by: Karsten Wiese <fzu at wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 988f0664779674c7c06252a6d549eee8debd5d76
Author: Karsten Wiese <fzu at wemgehoertderstaat.de>
Date: Tue Apr 22 12:52:15 2008 +0200
[ALSA] ice1724.c: toggle "chip reset" and "eeprom based setup" sequence
Let "chip reset" become first. Increasement of the "chip reset" related timeout
leads to correctly read eeprom's contents here.
Signed-off-by: Karsten Wiese <fzu at wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0d52cea487c0213d6d7bca9c951210081e7b653b
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Fri Apr 18 12:25:41 2008 +0200
OSS: dmabuf: fix negative DMAbuf_get_buffer_pointer() check
Since unsigned active_offs < 0 is even true when DMAbuf_get_buffer_pointer()
returns negative
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit e34ba212225a27cdf5f974be22cc539ae7ee7ca5
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Thu Apr 17 18:58:34 2008 +0200
[ALSA] SOC: fix tests in cs4270_hw_params()
cs4270_hw_params does several times:
ret = snd_soc_write()
if (ret < 0)
...
This only works when ret is signed.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 9eb70e68f38bbc5996a2193e7b7dc0b5487a08cb
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Apr 17 12:53:26 2008 +0200
[ALSA] usb-audio - Fix race in reconnection
Fix the race at reconnection of the device.
The disconnected usb_chip[] must be cleared before the next probe
call properly.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f18638dcf0c481eca2430206ebcdc7295aec8623
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Apr 17 12:52:02 2008 +0200
[ALSA] Clean up snd_card_free*()
A little clean up of snd_card_free*().
Removed snd_card_free_prepare() since it's actually almost identical
with snd_card_disconnect().
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 73d38b13ffb105ab633bd91969c8d218b2de38d4
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Apr 17 12:50:47 2008 +0200
[ALSA] Fix the race of card instance unregistration
Move the call of device_unregister() for the card instance in
snd_card_disconnect() to avoid the race of sysfs card entry, which
can be typically found on usb-audio reconnection.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 20861fa7b20a40ca045393df634d4d51e61efa58
Author: Risto Suominen <Risto.Suominen at gmail.com>
Date: Wed Apr 16 19:45:51 2008 +0200
[ALSA] snd-powermac: style burgundy.c
Coding style corrections for burgundy.c.
Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 44deee129c9af3759d3e5e772b82012742dc57a0
Author: Risto Suominen <Risto.Suominen at gmail.com>
Date: Wed Apr 16 19:45:31 2008 +0200
[ALSA] snd-powermac: Burgundy mixers for B&W and iMac
Add mixer controls and correct headphone detection bits for PowerMac
G3 B&W and iMac G3 Tray-loading, both having Burgundy chipset.
Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7ae44cfa7ab29b277691327e8de790d7b880722f
Author: Risto Suominen <Risto.Suominen at gmail.com>
Date: Wed Apr 16 19:39:27 2008 +0200
[ALSA] snd-powermac: style awacs.s and awacs.h
Coding style corrections for awacs.c and awacs.h.
Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a8c2a6bf464d983c642c8b8b001a57aabbf76673
Author: Risto Suominen <Risto.Suominen at gmail.com>
Date: Thu Apr 17 17:55:30 2008 +0200
[ALSA] snd-powermac: AWACS and Screamer mixers for PM7500, Beige, and iMac SL
Add mixer controls and correct headphone detection bits for PowerMacs
7300/7500 (AWACS) and G3 Beige (Screamer), and iMac G3 Slot-loading
(Screamer).
Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 946cda7d64b81053beac5d31148996f3e379e89e
Author: Risto Suominen <Risto.Suominen at gmail.com>
Date: Wed Apr 16 13:16:05 2008 +0200
[ALSA] snd-powermac: style pmac.c
Coding style corrections for pmac.c.
Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 9a4f20fcbd9cd89d8e4cfcaece81802c19d467ae
Author: Risto Suominen <Risto.Suominen at gmail.com>
Date: Wed Apr 16 13:15:38 2008 +0200
[ALSA] snd-powermac: enable headphone detection
Enable port change interrupt while initialising AWACS, Screamer, and
Burgundy chipsets.
Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 369b240d6391aef41d376c9e8769fd939c7c6c4d
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Wed Apr 16 19:30:30 2008 +0200
[ALSA] sound/drivers/dummy.c: fix negative snd_pcm_format_width() check
bps is unsigned, a negative snd_pcm_format_width() return value is not noticed
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7943a8aba93ab439bdfbd9b92221720a4a4d8153
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Apr 16 17:29:09 2008 +0200
[ALSA] hda - Avoid unexpected breakage with ALC889A hack
The last ALC889A hack may break on some devices with certain model presets
since patch_alc*() have different model tables. So, now it's handled in
the original patch_alc882() but fly to patch_alc883() in model=auto
appropriately.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit cb308f97aee2c816834240c8d5f7c98dd8aff157
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Apr 16 14:13:29 2008 +0200
[ALSA] hda - Fix ALC889A codec support
ALC889A is recognized ALC885/ALC882 but it's actually closer to
ALC888/ALC883.
Cc: Kasper Sandberg <lkml at metanurb.dk>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7c2ba97b8a99c857758fd03513350b39a8b242d6
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Wed Apr 16 13:13:59 2008 +0200
[ALSA] hda: Add 5.1 support for second headphone jack
Several 92hd7xxx and STAC9228 laptops have multiple headphone jacks,
the second headphone jack should be used for the 5.1 surround sound.
Add support for 'Headphone as Line Out' switch, which allows it be used
in 5.1 surround sound.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0a08478c0f7548211b492b578a67dacca5aea1a8
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 16 12:59:55 2008 +0200
[ALSA] soc - wm9712: Remove unneeded AC97_EXTENDED_MID updates
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 4972a177fed34036498aee555335f84a70219bc1
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Apr 16 09:15:45 2008 +0200
[ALSA] oxygen: generalize DAC volume TLV handling
Add a pointer for DAC volume TLV data to the model structure so that the
model driver do not need to manually assign it in their control filter.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit e983532e446ac7fabe829d9e3aeff8e26b0a277d
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Apr 16 09:14:30 2008 +0200
[ALSA] oxygen: mute by default
Initialize the playback volume controls as being muted and having
minimal volume.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 193e813814775b1b1574515fc6f11e61b29a54f7
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Apr 16 09:13:36 2008 +0200
[ALSA] oxygen: generalize handling of DAC volume limits
Add fields for the DAC volume limits to the module structure so that
model drivers do not need to install their own control info handlers.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0c0e6daf14183fb1cd0dea054ecf81165abbdc83
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Apr 16 09:12:27 2008 +0200
[ALSA] hifier: remove empty hifier_mixer_init()
The empty hifier_mixer_init() function is useless; remove it.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 3adb8abc70aaf5c071f27576069c8b01783cca83
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Apr 15 18:46:42 2008 +0200
[ALSA] hda - Add support of AD1989A/AD1989B
Added the support of AD1989A and AD1989B codecs.
These codecs can have multiple SPDIF devices, but currently we handle
only one SPDIF. If any real devices with two SPDIF interfaces (likely
one for SPDIF and one for HDMI), we'll fix this rightly.
Otherwise, these codecs are pretty similar with AD1988.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ad5fada51d33b408ad3d2d0848ef6744b5daf06f
Author: Pavel Machek <pavel at suse.cz>
Date: Mon Apr 14 18:31:35 2008 +0200
[ALSA] sound/core.h: evil #ifdefs
snd_minor_info_oss_* is an function returning int _or_ comment,
depending on config parameters. That is truly evil, fix it.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a8bb1bad9b16ab91de6568ac9356b8f705f7272b
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Tue Apr 15 08:57:31 2008 +0200
[ALSA] virtuoso: fix DX front panel I/O
Fix the GPIO 1 mixer control to enable I/O through the front panel
connector of the Xonar DX.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 6e9fc6bd5db34a6580e1917bd0fea4b0754c7de8
Author: Daniel Mack <daniel at caiaq.de>
Date: Mon Apr 14 15:40:31 2008 +0200
[ALSA] snd_usb_caiaq: make high sample rates work with A8DJ
This patch for snd_usb_caiaq makes sample rates higher dann 48KHz work
with devices which have more than 2 stereo input/output pairs.
Signed-off-by: Daniel Mack <daniel at caiaq.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 6849d49c48718def95cf1b74154b9b0aee617c7e
Author: Daniel Mack <daniel at caiaq.de>
Date: Mon Apr 14 15:39:47 2008 +0200
[ALSA] snd_usb_caiaq: correct input channel order
This patch corrects the input channel order of hardware supported by
snd_usb_caiaq.
Signed-off-by: Daniel Mack <daniel at caiaq.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 8d048841e822f745187246a036d03f2793739b7f
Author: Daniel Mack <daniel at caiaq.de>
Date: Mon Apr 14 15:39:14 2008 +0200
[ALSA] snd_usb_caiaq: fix potential lockups locking
This patch fixes potential lockups in snd_usb_caiaq by refining the
locking mechanims and by using usb_kill_urb() in favor to
usb_unlink_urb().
Signed-off-by: Daniel Mack <daniel at caiaq.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f57ab97e767d293132a29a43ca3ecb0f73f1d5bb
Author: Jarkko Nikula <jarkko.nikula at nokia.com>
Date: Mon Apr 14 15:28:19 2008 +0200
[ALSA] ASoC: Add support for 19.2 MHz MCLK in TLV320AIC3X
Signed-off-by: Jarkko Nikula <jarkko.nikula at nokia.com>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 87b57fe2d3fb1ce33671b944db9a4cbe0cd065ea
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Mon Apr 14 15:27:30 2008 +0200
[ALSA] wm9713: Don't control touch screen power on suspend
Leave the power bit for the touch screen alone when suspending the WM9713
so that the touch screen driver can handle it. This allows the touch
screen to be used as a wakeup source when the system is suspended.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a295e09e89d227506ae6c0a58e1cb6359c0cda1c
Author: Nick Andrew <nick at nick-andrew.net>
Date: Mon Apr 14 15:22:11 2008 +0200
[ALSA] sound: this amplifier only goes up to 7
sound: kernel log levels are 0-7
Kernel log levels are 0-7, not 0-9.
Signed-off-by: Nick Andrew <nick at nick-andrew.net>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit eb5a66216658a1c879ab05dcdc65ce7005c4780b
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Mon Apr 14 13:46:28 2008 +0200
[ALSA] hda-intel: Add Quanta IL1 ALC267 model
This adds support for Quanta IL1 mini-notebook to alsa, defining a new model
for it. It comes with an ALC267 codec chip. Some notes about this model:
* In headphone automute, I use AC_VERB_SET_PIN_WIDGET_CONTROL instead of common
amp mute, to avoid conflict with mixer switch (mixer and automute use the
same nid).
* The only connected capture sources in the hardware are the internal mic and
external mic jack. So instead of using an input source selector like on other
ALC268 models, the mic automute automatically switch between captures.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 8b45a209935c4b79905182608922736ba0e5579e
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Mon Apr 14 13:33:36 2008 +0200
[ALSA] sound: fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is
prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable sound
platform drivers, to re-enable auto loading.
[dbrownell at users.sourceforge.net: more drivers, registration fixes]
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0fc9dec46fae19da9899c580a6b870202103f8bb
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Mon Apr 14 13:32:54 2008 +0200
[ALSA] hda: EAPD power management
Power management support for EAPD enabled laptops, when headphones
are sensed it pulls the EAPD GPIO line low to power it down.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 780c8be4ab6c7baf5cdfa1102f56480acb8a2479
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Mon Apr 14 13:32:27 2008 +0200
[ALSA] hda: Correct SPDIF out default config
Several laptops have have the SPDIF out defined as 'Digital other out'
when it should be 'SPDIF out' in the default config.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 06a9c30cdda43ca82d7f22c8ebeb93e691f85b5f
Author: Tony Vroon <tony at linx.net>
Date: Mon Apr 14 13:31:45 2008 +0200
[ALSA] hda - Fujitsu Lifebook PC speaker signal
The legacy PC speaker signal was not routed to outputs. The codec is not
prevented from powering down in this patch, although I suppose one could
argue that perhaps it should be. Let me know if anyone feels strongly one
way or the other.
Signed-off-by: Tony Vroon <tony at linx.net>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5b030389e4ba72cc4e9ad37a5770b32f0353564d
Author: Jiang zhe <zhe.jiang at intel.com>
Date: Mon Apr 14 13:26:53 2008 +0200
[ALSA] hda - PCI quirk for laptop LG which use CMI9880
Please refer to [0003874] on the alsa mantis.
This patch added the pci quirk.
Signed-off-by: Jiang zhe <zhe.jiang at intel.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 64654c2f9e7875a982a9c3b4456ed11ad811ec61
Author: Jiang zhe <zhe.jiang at intel.com>
Date: Mon Apr 14 13:26:21 2008 +0200
[ALSA] hda - Should use HDA_OUTPUT instead of HDA_INPUT to mute pin 15 of ALC880
To mute the output of Pin widget 15 in ALC880, we should use the
HDA_OUTPUT. However, current code looks like :
snd_hda_codec_amp_stereo(codec, 0x15, HDA_INPUT, 0, HDA_AMP_MUTE, bits);
It may be a misspelling.
Signed-off-by: Jiang zhe <zhe.jiang at intel.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 07f51a727462696ddea01c7a7750c27796a0e1f3
Author: Pavel Machek <pavel at suse.cz>
Date: Mon Apr 14 13:15:56 2008 +0200
[ALSA] sound/usb/usbaudio.c: coding style
Putting space between ! and variable is a strange coding style, fix
that, also make it fit into 80 columns where that is easy.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 2a56f51bcc3650ecff806450f7fdab5edf57618f
Author: Pavel Machek <pavel at suse.cz>
Date: Mon Apr 14 13:14:22 2008 +0200
[ALSA] usb audio: make quirk handling more readable, and fix commented-out code
usb audio contains useful debugging code, protected by #if
0. Unfortunately, it will not compile because variable names changed;
fix it.
Dallas workaround is formatted in a way where it is not quite obvious
what is normal code and what is quirk. Reformat it to make it obvious.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit b9d43bcd061956c8144bcb453d07d13236b6ab28
Author: Pavel Machek <pavel at suse.cz>
Date: Mon Apr 14 13:12:47 2008 +0200
[ALSA] usb audio: Fix another Dallas quirk
Dallas USB speakers are buggy in more than one way. One of configs
they offer does not work at all.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit eaa9985b4edb5f8008998abdda8b85ddeba05f1f
Author: Frederik Deweerdt <deweerdt at free.fr>
Date: Mon Apr 14 13:11:44 2008 +0200
[ALSA] hda-codec - Fix unbalanced mutex
On Wed, Apr 02, 2008 at 08:19:29AM -0400, Miles Lane wrote:
> [ 48.765906] [ BUG: bad unlock balance detected! ]
> [ 48.765912] -------------------------------------
> [ 48.765918] pulseaudio/4277 is trying to release lock
> (&codec->spdif_mutex) at:
> [ 48.765930] [<c03031b7>] mutex_unlock+0x8/0xa
> [ 48.765945] but there are no more locks to release!
> [ 48.765950]
> [ 48.765952] other info that might help us debug this:
> [ 48.765959] 2 locks held by pulseaudio/4277:
> [ 48.765965] #0: (&pcm->open_mutex){--..}, at: [<f89f134b>]
> snd_pcm_open+0xc1/0x1ba [snd_pcm]
> [ 48.766003] #1: (&chip->open_mutex){--..}, at: [<f8b4f13d>]
> azx_pcm_open+0x36/0x184 [snd_hda_intel]
> [ 48.766057]
> [ 48.766059] stack backtrace:
> [ 48.766066] Pid: 4277, comm: pulseaudio Not tainted 2.6.25-rc8-mm1 #12
> [ 48.766086] [<c013afc6>] print_unlock_inbalance_bug+0xce/0xd8
> [ 48.766107] [<c0109e1c>] ? save_stack_trace+0x1d/0x3b
> [ 48.766130] [<c012f54e>] ? __kernel_text_address+0x1b/0x27
> [ 48.766146] [<c0104533>] ? dump_trace+0xcd/0xd9
> [ 48.766160] [<c0109d9e>] ? save_stack_address+0x0/0x2c
> [ 48.766176] [<c013b80a>] ? find_usage_backwards+0xa4/0xc3
> [ 48.766193] [<c013cfb5>] lock_release_non_nested+0x84/0x120
> [ 48.766209] [<c03031b7>] ? mutex_unlock+0x8/0xa
> [ 48.766222] [<c013d1bb>] lock_release+0x16a/0x199
> [ 48.766238] [<c0303137>] __mutex_unlock_slowpath+0xa9/0x121
> [ 48.766252] [<c03031b7>] mutex_unlock+0x8/0xa
> [ 48.766263] [<f8b4ffd8>] snd_hda_multi_out_analog_open+0xd3/0xef
> [snd_hda_intel]
The following patch should fix it.
Cc: "Miles Lane" <miles.lane at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 66c9aa6043798197e1760eaf4c5f510d6c69b95a
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Apr 14 13:09:33 2008 +0200
[ALSA] es1968 - fix coding style in the last patch
WARNING: braces {} are not necessary for single statement blocks
#40: FILE: sound/pci/es1968.c:1831:
+ if (diff > 1) {
+ __maestro_write(chip, IDR0_DATA_PORT, cp1);
+ }
total: 0 errors, 1 warnings, 35 lines checked
./patches/es1968-fix-jitter-on-some-maestro-cards.patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Please run checkpatch prior to sending patches
Cc: Andreas Mueller <andreas at stapelspeicher.org>
Tested-by: Rene Herman <rene.herman at keyaccess.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f24bfa53dab478e1bde2d7fd39d3c1a69dc518f1
Author: Andreas Mueller <andreas at stapelspeicher.org>
Date: Mon Apr 14 13:08:05 2008 +0200
[ALSA] es1968: fix jitter on some maestro cards
This patch suppresses jitter on several Maestro cards in stereo mode (ALSA of
course).
The patch is also incorporated in the *BSD drivers where I "ported" it from.
Without this patch most of the stereo audio gets out of sync and really
distorted (oss-emulation with mplayer at 48000khz worked somehow).
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 62cef8212ffa9df3e6c5b358ea2382d90489d590
Author: Denys Vlasenko <vda.linux at googlemail.com>
Date: Mon Apr 14 13:04:18 2008 +0200
[ALSA] sound/pci/rme9652/hdspm.c: stop inlining largish static functions
sound/pci/rme9652/hdspm.c has unusually large number of static inline
functions - 22.
I looked through them and some of them seem to be too big to warrant inlining.
This patch removes "inline" from these static functions (regardless of number
of callsites - gcc nowadays auto-inlines statics with one callsite).
Size difference on 32bit x86:
text data bss dec hex filename
20437 2160 516 23113 5a49 linux-2.6-ALLYES/sound/pci/rme9652/hdspm.o
18036 2160 516 20712 50e8 linux-2.6.inline-ALLYES/sound/pci/rme9652/hdspm.o
[coding fix by Takashi Iwai <tiwai at suse.de>]
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 32f4876e62d5caba712ca76d96b0018dcc0f9601
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Mon Apr 14 12:59:27 2008 +0200
[ALSA] soc - Include register in DAPM debug output
When logging register changes in DAPM debug output include the register
number.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 4383fae0ec5bc269f9eb4383b223731e3ecd2fe3
Author: Jiang zhe <zhe.jiang at intel.com>
Date: Mon Apr 14 12:58:57 2008 +0200
[ALSA] hda-codec - PCI quirk for MSI laptop
Please refer to [0003848] on the alsa mantis.
This patch adds the pci quirk and Mic-Int controller.
Signed-off-by: Jiang zhe <zhe.jiang at intel.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 80060ecc45bd101f3decafed5b7ff0879a188d28
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Fri Apr 11 10:25:40 2008 +0200
[ALSA] virtuoso: initialize two-wire control register
On the Xonar DX, initialize all bits of the two-wire control register.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 387fb6a206749e13377ef8847f77d5341c281e7b
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Fri Apr 11 10:24:48 2008 +0200
[ALSA] virtuoso: add GPIO 1 mixer control
Add a mixer control for switching whatever it is that is connected to
GPIO pin 1 on the Xonar DX.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 1d98c7d4be6ac521e3391025ddffcfe0400c798c
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Apr 9 09:16:33 2008 +0200
[ALSA] oxygen: use SPDIF input only if present
If the card model does not have a digital input or an AC97 codec,
disable the respective interrupt and mixer controls.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 11864b4b84194b459fc20e0ec47906885bddb12e
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Apr 9 09:16:14 2008 +0200
[ALSA] virtuoso: correctly switch input jack on Xonar DX
When selecting the capture source on the Xonar DX, the input jack must
be routed to either the line input or the microphone input by setting a
GPIO pin. This requires an additional callback so that the model driver
can hook into the toggling of AC97 switches.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a9d3cc485e65a56edc9ef78c034146cc8a5b3101
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Apr 7 10:29:44 2008 +0200
[ALSA] virtuoso: add Xonar DX support
Add support for the Asus Xonar DX.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 80647ee26e96d6394cab77332c69f60735396e67
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Apr 7 10:27:01 2008 +0200
[ALSA] virtuoso: fix typo
Fix a (fortunately harmless) typo.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit aef1a535c4dadff408412833b2b71bc7919e84a6
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Apr 7 10:26:45 2008 +0200
[ALSA] virtuoso: change card short name
Change the card short name to show to show the card name instead of the
chip name.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d08267a9df99c3cf288ca05e75084d14479fe7cb
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Apr 7 10:26:26 2008 +0200
[ALSA] virtuoso: set PCM1796 oversampling rate
When playing data at 96 kHz or higher, reduce the DAC oversampling rate
to 32.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit af9af1741f5e7959d220fb0d83604ecb5ae26581
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Apr 7 10:26:03 2008 +0200
[ALSA] virtuoso: move some code to xonar_common_init()
Move the code that is common to all Xonar models to a separate function,
and make it more generic in preparation for another model.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a694a6a0e4ab4752d1a145b9b32e231d7c9611b5
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Apr 7 10:25:30 2008 +0200
[ALSA] virtuoso: allow both CS5381 and CS5361
Rename all CS5381 symbols to CS53x1 because they can also be used for
Xonar models with a CS5361.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 271ebfca5823875cc4f134515b6c3887d99b8dc2
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Apr 7 10:24:22 2008 +0200
[ALSA] virtuoso: separate D2/D2X init functions
Use separate model structures for the D2 and D2X so that the init
function does not have to check for the model again.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 10e6d5f9b6edd4a12d678716d7fdb94278a83227
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Apr 7 10:23:37 2008 +0200
[ALSA] oxygen: add I2C support
Add a function to write I2C registers.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7a4356747298d1c899a12a25260d5ff1b4feeb5e
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Apr 2 10:56:30 2008 +0200
[ALSA] aw2: remove duplicate MODULE_LICENSE
"GPL 2" does not mean that there have to be two MODULE_LICENSE("GPL")
entries. ;-)
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit edab938e63e463da86e4aa7b94628ce8f2b8a137
Author: Pavel Machek <pavel at suse.cz>
Date: Tue Apr 1 15:33:22 2008 +0200
[ALSA] fix comments in sound/core.h
Two sentences seem to be spliced into one in comment, fix that and fix
english. Also fix codingstyle.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit e97f79994ac715e4c8724b201bd3328463ec9314
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Tue Apr 1 10:02:18 2008 +0200
[ALSA] oxygen: fix line-in recording selection (now for real)
On C-Media cards, the GPIO pin 0 of the CM9780 must be handled exactly
like on Xonar cards, so move the Xonar code to the common mixer code.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0c4cc4430f40089bb85557e309038faa458247f1
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Sat Mar 22 10:26:05 2008 +0100
[ALSA] hda-codec - Support mic automute for Clevo M720R/SR
Add support for mic automute in clevo-m720r ALC883 model, and rename it
to more generic clevo-m720. Also change model entry in ALSA-Configuration.txt
accordingly.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 213f0bfe9061e077590f2775cb90c1e6c0c9faa6
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Sat Mar 22 10:25:30 2008 +0100
[ALSA] hda-codec - Map clevo-m720r ALC883 model for Clevo M720SR
Map clevo-m720r ALC883 model for Clevo M720SR.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c81d80cbf6dfe4c061719cb146659677c3c36c8e
Author: Stas Sergeev <stsp at aknet.ru>
Date: Sat Mar 22 10:12:37 2008 +0100
[ALSA] pcsp: remove downsampling
pcsp: remove S16->U8 downsampling as dmix now supports U8 natively.
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 95866d38028c98ea4d6df6947f6ea3fd77334382
Author: Takashi Iwai <tiwai at suse.de>
Date: Sat Mar 22 10:11:08 2008 +0100
[ALSA] ymfpci - Fix race at removal
free_irq() must be called first to avoid races at removal.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit cd97f47df377d2371940b69fa4c8b4d99a980580
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Mar 20 12:30:36 2008 +0100
[ALSA] hda-codec - Add missing models in ALSA-Configuration.txt
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit eea6419ea18ed9dfc16f9a262e96cdb832376e88
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Thu Mar 20 12:14:59 2008 +0100
[ALSA] hda-codec - Use common 3stack-6ch mixer for 3stack-hp model
Forgot one more: 3stack-hp model also have now the same mixer as
3stack-6ch (after DAC assignment fix in ALC883), so use it avoiding
duplicating the same mixer definition.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f24dbdc61dd7ca6b97c525b40979ab7bd07c0934
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Thu Mar 20 12:14:28 2008 +0100
[ALSA] hda-codec - Use base ALC883 mixer for 6stack-dell model
After DAC assignment fix in ALC883, alc888_6st_dell_mixer is now the
same as alc883_base_mixer. Avoid duplicated code and use
alc883_base_mixer in 6stack-dell model, removing alc888_6st_dell_mixer
definition.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5d85f8d02af56da5e3b76805da00a0f7f7427255
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Thu Mar 20 12:13:46 2008 +0100
[ALSA] hda-codec - Remove now uneeded 6stack-hp model from ALC883
After DAC assignment fix in ALC883, the 6stack-hp model is now the same
as 6stack-dig. So just remove 6stack-hp model and replace its use with
6stack-dig.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0e31daf7d6484c60e96f63a905eb9b959b975da5
Author: Jiang zhe <zhe.jiang at intel.com>
Date: Thu Mar 20 12:12:39 2008 +0100
[ALSA] hda-codec - model for alc262 to support Lenovo 3000
This model is to support the Lenovo 3000 y410.
ALSA bug#3856:
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3856
Signed-off-by: Jiang zhe <zhe.jiang at intel.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 07bcb316cf3510d5048bc251bb23cd6452c16fc2
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Thu Mar 20 12:10:57 2008 +0100
[ALSA] hda: 92hd71bxxx DMIC nid
Added missing DMIC verb to dell_4_1_pin_configs[].
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d16be8ed69f3e59d36be8c422508c3a10082fdaa
Author: Pavel Hofman <dustin at seznam.cz>
Date: Thu Mar 20 12:10:27 2008 +0100
[ALSA] ice1724 - Improved the Juli rate setting
* moving most of clock-specific code to card-specific routines
* support for ESI Juli
* to-be-researched - monitoring of analog/digital inputs
Signed-off-by: Pavel Hofman <dustin at seznam.cz>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ff73317ea7c648cf5f59b8bda4a810f7b5d0312c
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu Mar 20 12:07:31 2008 +0100
[ALSA] sound/pci/pcxhr/pcxhr.c: fix warnings
sparc64:
sound/pci/pcxhr/pcxhr.c: In function `pcxhr_update_r_buffer':
sound/pci/pcxhr/pcxhr.c:459: warning: cast to pointer from integer of different size
sound/pci/pcxhr/pcxhr.c: In function `pcxhr_trigger_tasklet':
sound/pci/pcxhr/pcxhr.c:628: warning: long int format, different type arg (arg 4)
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ee0abefde5273c816bd3d4158e5cb9c591b82684
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu Mar 20 12:05:33 2008 +0100
[ALSA] sound/pci/pcxhr/pcxhr_core.c: fix printk warning
sound/pci/pcxhr/pcxhr_core.c: In function `pcxhr_set_pipe_state':
sound/pci/pcxhr/pcxhr_core.c:899: warning: long int format, different type arg (arg 4)
suseconds_t is int on sparc64.
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 91e24faa556548e0705e8940410b8dc3bd1d949d
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu Mar 20 12:04:46 2008 +0100
[ALSA] sound/pci/aw2/aw2-alsa.c needs dma-mapping.h
sparc32:
sound/pci/aw2/aw2-alsa.c: In function 'snd_aw2_create':
sound/pci/aw2/aw2-alsa.c:282: error: 'DMA_32BIT_MASK' undeclared (first use in this function)
sound/pci/aw2/aw2-alsa.c:282: error: (Each undeclared identifier is reported only once
sound/pci/aw2/aw2-alsa.c:282: error: for each function it appears in.)
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 43dd89c7e7cde6b42edac88ca852ec61af610863
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Mar 19 08:21:32 2008 +0100
[ALSA] oxygen: disable clock of unused I2S inputs
Disable the master clock outputs of any unused I2S inputs.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit db12b8e301455cf18644aa3b765ae10869eb947c
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Mar 19 08:20:59 2008 +0100
[ALSA] oxygen: move MIDI flag to model struct
Put the flag that enables the MIDI port into the model structure instead
of passing it as a separate parameter to oxygen_pci_probe().
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 87eedd2fd409d5cd515ccd6fc454cef15c5fa38b
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Mar 19 08:20:13 2008 +0100
[ALSA] oxygen: make SPI/2-wire configuration model-specific
Allow the model drivers to specify if the codec communication goes over
SPI or a 2-wire bus.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f009ad9b39e6484d8e36e9e5029c07eab8c12e8f
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Mar 19 08:19:41 2008 +0100
[ALSA] oxygen: change model-specific PCM device configuration
When specifying which PCM devices to use, model drivers now use flags
that also specify the routing between PCM devices and DMA channels
instead of just DMA channel bits. This simplifies some code that checks
for these flags.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit fa5d8106cb52e5df28673f59cc25af520dc83382
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Mar 19 08:17:33 2008 +0100
[ALSA] oxygen: add monitor controls
Add controls to enable monitoring of the analog and digital inputs.
To allow monitoring after loading the driver when nothing has been
played back or recorded yet, the I2S input and outputs are initialized
to a valid configuration.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 33fa724e291d3cc6c319f7db487e6e084ef5d4b5
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Mar 19 08:16:40 2008 +0100
[ALSA] virtuoso: move PCM1796 symbols to a header file
Move the PCM1796 register symbol definitions to their own header file.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f5b2368ba8c203eb5bb7e5bbd99f4d9064a6aac0
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Wed Mar 19 08:14:01 2008 +0100
[ALSA] oxygen: move WM8785 symbols to a header file
Move the WM8786 register symbol definitions to their own header file.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit acf5850ea73bf82081fb65cf10dd36a9d7a890e9
Author: Timur Tabi <timur at freescale.com>
Date: Tue Mar 18 17:18:18 2008 +0100
[ALSA] Removed deprecated sound/driver.h from Freescale MPC8610 drivers
With commit 9004acc70e8c49c50c4c7b652f906f1e0ed5709d, include/sound/driver.h
is deprecated. This patch removes the #include from fsl_ssi.c and fsl_dma.c.
Signed-off-by: Timur Tabi <timur at freescale.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 850f0e5212a73a548b9c29faf452b4a14d80f43b
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Mar 18 17:11:05 2008 +0100
[ALSA] hda-intel - Add sync support
Addded the support of sync streams to hda-intel driver.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f081374b607f2656ca79a94d96d99cd5a2f60b68
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Mar 18 12:13:03 2008 +0100
[ALSA] hda-codec - Support of Lenovo Thinkpad X300
Added the model thinkpad for Lenovo Thinkpad X300 with AD1984A codec.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c0bbf48db35fec29c39c8a7826ca271069537e57
Author: Robert Jarzmik <rjarzmik at free.fr>
Date: Tue Mar 18 12:08:35 2008 +0100
[ALSA] soc - Add missing audio path between Mono Mixer and Mic PGAs
Signed-off-by: Robert Jarzmik <rjarzmik at free.fr>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 888afa15418f001896bc11f498f9348e029611bd
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Mar 18 09:57:50 2008 +0100
[ALSA] hda-codec - keep the format verb at closing PCM streams
Keep the format verb at closing PCM streams.
Introduced snd_hda_codec_cleanup_stream() for the parcicular purpose.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 117f257d7a9599ff9cb5ab7a6a10201c6294b5f1
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Mar 18 09:53:23 2008 +0100
[ALSA] hda-codec - Fix spekaer output of Panasonic CF-74
Add a new model "panasonic" for Panasonic CF-74 with STAC9200 codec
to fix the speaker output.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 2add9b925394746eff692ff0875d21ea2d5289e2
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Mar 18 09:47:06 2008 +0100
[ALSA] hda-intel - Add barrier
Add proper barriers in the RIRB communication code.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 86d34b7ec878ea4b4c9f33ce92f1722c4326dbe7
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Tue Mar 18 09:27:59 2008 +0100
[ALSA] hda-codec - Map 3stack-6ch-dig ALC883 model for MSI 945GCM5 V2 (MSI-7267)
Map 3stack-6ch-dig ALC883 model for MSI 945GCM5 V2 (MSI-7267).
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f32a19e3e7e72cc896d02c3d104f58dc972d43ea
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Tue Mar 18 09:27:08 2008 +0100
[ALSA] hda-codec - Fix DAC assignment order in ALC883
Actually clfe and surround DACs are inverted in alc883_dac_nids array
(see ALC883 datasheet). I discovered this while testing multi-channel
setup (using 3stack-6ch-dig model) on MSI 945GCM5 V2 motherboard that
has an ALC883 codec. Simply Rear Left/Right and Center/LFE were swapped
in 6 channel mode (also in 4 channel mode you didn't get rear left/right
output). Other models also were affected by this bug, as can be seen by
the mixer layouts that "workaround" this (the real bug was not noticed,
and some other models simply played with mixer and initial verbs). Thus
along with fixing the order of dac nids, also change the models that
relied on previous dac ordering properly.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 9ecaedae0de906f0b5f8dbc09cd610f7056ba975
Author: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Date: Tue Mar 18 09:03:03 2008 +0100
[ALSA] sound/drivers/pcsp/pcsp.c build fix
sound/drivers/pcsp/pcsp.c: In function 'snd_pcsp_create':
sound/drivers/pcsp/pcsp.c:54: error: 'loops_per_jiffy' undeclared (first use in\ this function)
sound/drivers/pcsp/pcsp.c:54: error: (Each undeclared identifier is reported on\ ly once
sound/drivers/pcsp/pcsp.c:54: error: for each function it appears in.)
Signed-off-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f5e09ef0985ff01af6b4a12954840467f153a41c
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Mon Mar 17 14:36:24 2008 +0100
[ALSA] at73c213: Add constraints for periods value
The interrupt handler always provide runtime->period_size data, so it
works correctly only if buffer_size was a multiple of period_size.
This patch fixes periodic click noise.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit b32300a4ce78b4df92f33c455ffe644b36f0ff1a
Author: Julia Lawall <julia at diku.dk>
Date: Mon Mar 17 10:23:35 2008 +0100
[ALSA] sound/pci: remove unused variable
The variable is_capture is initialized but never used otherwise.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
type T;
identifier i;
constant C;
@@
(
extern T i;
|
- T i;
<+... when != i
- i = C;
...+>
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 43337ac0dec5fe507b3028d2ad4404c3f1a28034
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Mar 17 10:16:37 2008 +0100
[ALSA] ice1724 - Fix return codes in some pointis callbacks
Fixed the return codes (1 for changed values) in put callbacks of
pontis.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5a220c868e395bc3662d13ad4c2a18769075af54
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Mar 17 09:59:32 2008 +0100
[ALSA] usb-audio - Add a proper error check
The error in check_hw_params_convention() has to be checked and
handled properly.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 841b23d4d7b554c8d74fc9c34a701f85abc04875
Author: Pavel Hofman <dustin at seznam.cz>
Date: Mon Mar 17 08:45:33 2008 +0100
[ALSA] some fixes and cleanup for ICE1724 cards
* removing the hack with NON_AKM ak4xxx type
* support for card-specific flags in ak4114_stats
* definition of the flags for corresponding cards
Signed-off-by: Pavel Hofman <dustin at seznam.cz>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5949d2443d96f054d9a32d31edddb0be836968c6
Author: Joachim Foerster <JOFT at gmx.de>
Date: Mon Mar 17 08:40:12 2008 +0100
[ALSA] [ML403-AC97CR] Remove duplicate snd_card_set_dev()
We want to have snd_card_set_dev() in _probe(), but not a second one in
snd_ml403_ac97cr_create().
Signed-off-by: Joachim Foerster <JOFT at gmx.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c93f5a1eca1f6d662d791c14c469b6962e05a08f
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Mar 14 17:17:09 2008 +0100
[ALSA] ice1724 - Fix the SPDIF input sample-rate on Juli@
AK4114 on Juli@ has the SPDIF input sample rate detection and
causes errors when an incompatible sample rate is chosen.
The patch adds the open hook to check the current rate and limit
the hw constraints.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5d9fab2d84963ec598810c54a67332decdd922a8
Author: Tony Vroon <tony at linx.net>
Date: Fri Mar 14 17:09:18 2008 +0100
[ALSA] hda-codec - Fujitsu Lifebook port replicator/dock headphone jack sense
The docking station headphone output had no audio and jack sense
was not considered.
Jack information from the laptop itself and the dock are combined, as
the dock does not obscure the connector.
Signed-off-by: Tony Vroon <tony at linx.net>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ee9d6b9a30ae83f15fe8c8d2337ebc0a38151d38
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Mar 14 15:52:20 2008 +0100
[ALSA] hda-intel - Fix power-off hang on ASUS P5AD2
The hda-intel driver has a problem at power-off on ASUS P5AD2.
It's caused when the position-buffer is enabled -- most likely a
hardware-specific problem.
This patch adds a quirk to avoid the unnecessary enablement of
position-buffer.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 3da23cac3d6b93803b8c381a755870cbafcd3212
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Fri Mar 14 12:52:59 2008 +0100
[ALSA] hda-codec - Map 3stack-6ch-dig ALC662 model for Asus P5GC-MX
Map 3stack-6ch-dig ALC662 model for Asus P5GC-MX.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7055ad8a996b2b77f12242109c0b5bacc237e824
Author: Herton Ronaldo Krzesinski <herton at mandriva.com>
Date: Fri Mar 14 12:52:20 2008 +0100
[ALSA] hda-codec - Fix ALC662 DAC mixer mutes
Currently ALC662 doesn't suport amp mute for AmpOut in nids 0x02, 0x03,
0x04 (see block diagram in ALC662 datasheet page 3, does M correspond to
mute?). The result is that currently mute for "Front Playback Switch",
"Surround Playback Switch", "Center Playback Switch" and "LFE Playback
Switch" mixer items doesn't work (tested on Asus P5GC-MX motherboard
with 3stack-6ch model).
The solution I found for this is to mute the proper inputs in 0x0c,
0x0d, 0x0e audio mixers.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 2626a263ffc2369499442933b1c313de0a066ede
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Mar 14 09:18:32 2008 +0100
[ALSA] hda-codec - Fix orphan Headphone controls in STAC codecs
Currently, the headphone controls are created as Master wrongly in
some cases, and this prevents the virtual master controls.
The patch fixes the problem by simply using "Headphone" always for
headphone controls.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d654a660355f9dc30d3a6bf1493d32363bde8570
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Fri Mar 14 08:46:51 2008 +0100
[ALSA] hda: 92HD73xxx distortion fix
Fixed issue on some laptops that if the Master mixer and DAC mixers are
turned all the way up that will cause distortion. This is fixed by limiting
the max volume with the volume knob nid.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 1bc1f30565b561bafc51725fce336aec59029437
Author: Stas Sergeev <stsp at aknet.ru>
Date: Wed Mar 12 13:12:15 2008 +0100
[ALSA] pcsp: locking fix
pcsp: locking fix.
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit bb9f76cd5909b9da6b4d31b55a4086cc35614fe0
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Mar 12 12:51:09 2008 +0100
[ALSA] hda-codec - Improve ALC262 ultra model
Improved ALC262 ultra model for Samsung Q1 Ultra series.
- clean up mixers
- support of input from HP jack as a mic
- add quirk for Q1 EL
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 9f2f0f7c4e997a74ff9fb8e2e2ed0daa21962e97
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Tue Mar 11 08:15:30 2008 +0100
[ALSA] at73c213: remove redundant private_free routine
snd_pcm_lib_preallocate_free_for_all() is called from snd_pcm_free() just
after calling the private_free routine. So there should be no need to call
it in driver's private_free routine.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 91662577979cadf945cd3ffc4c470e5b91378370
Author: Takashi Iwai <tiwai at alsa2.suse.de>
Date: Mon Mar 10 12:19:12 2008 +0100
[ALSA] aw2 - Rename aw2-tsl.h to aw2-tsl.c
aw2-tsl.h should be rather a C file to be included since it's referred
only in aw2-saa6146.c and includes a table data.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ee7a9c7c2eb5cd09c15824323eac4cd95e2d18a8
Author: Michael Gruber <lists.mg at googlemail.com>
Date: Mon Mar 10 11:30:59 2008 +0100
[ALSA] hda-intel - Fix microphone capture with ALC880 F1734 model
The default capture source should be the mic which is 0x01 on this model.
In addition to that the change to VREF50 allows for higher capture volume.
Signed-off-by: Michael Gruber <lists.mg at googlemail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7747ecceb523d7b00c8dfe568154d0b4e70e0800
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Mon Mar 10 11:30:04 2008 +0100
[ALSA] hda: Reorganized DAC outputs
Changed so that internal speakers point to the Front mixer instead of Surround.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 85bfb8fe5d26b316ccd4892d1834778ec5fc17c3
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Mar 10 11:21:30 2008 +0100
[ALSA] release 1.0.16
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 4a295ca47424b48c993d5cea7c3fbeca75ddb608
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sat Mar 8 11:08:32 2008 +0100
[ALSA] at73c213: monaural support
Add support for monaural playback to at73c213 driver. The sound will be apear
on L-channel. Tested on AT91SAM9260-EK.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c67582b195fb5deb24808ebbafb41045f1a61425
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sat Mar 8 11:07:26 2008 +0100
[ALSA] at73c213: fix error checking for clk API
The clk_round_rate() and clk_set_rate() will return int, so not store thier
return value to unsigned long variable. This bug hides real error on these
API.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit b419f346994d4ba082244fb1327754bc839a4d8a
Author: Tobin Davis <tdavis at dsl-only.net>
Date: Fri Mar 7 11:57:51 2008 +0100
[ALSA] HDA Codecs: add support for Toshiba Equium L30
This patch adds support for the Toshiba Equium L30 laptop and renames the mixer
controls to match Laptop usages.
Signed-off-by: Tobin Davis <tdavis at dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 21ac1f9934d33ea2ffa71d13fa2f6286127d3caf
Author: Julia Lawall <julia at diku.dk>
Date: Tue Mar 4 15:07:24 2008 -0800
sound: Use BUG_ON
if (...) BUG(); should be replaced with BUG_ON(...) when the test has no
side-effects to allow a definition of BUG_ON that drops the code completely.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ disable unlikely @ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (unlikely(E)) { BUG(); }
+ BUG_ON(E);
)
@@ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (E) { BUG(); }
+ BUG_ON(E);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 0ccb541c96e6d40844d00ec88fae734568bdd0bd
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Mar 6 16:58:35 2008 +0100
[ALSA] hda-codec - Add internal mic item for ALC268 acer model
Added the internal mic as a capture source item for ALC268 acer model.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7194cae62e92c5db8b87df1120fbf24f83f488f8
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Mar 6 16:58:17 2008 +0100
[ALSA] hda-codec - Fix dmics on ALC268 in auto configuration
Fixed the handling of dmics on ALC268 in the auto-configuration mode.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 487145a1984b78e9b194aa44f8079cc019779a58
Author: Peer Chen <peerchen at gmail.com>
Date: Thu Mar 6 15:15:11 2008 +0100
[ALSA] hda_intel: Add the DIDs of nvidia MCP79 HD audio controller to hda_intel.c
Add the Device IDs of nvidia MCP79 HD audio controller to hda_intel.c
Signed-off-by: Peer Chen <peerchen at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 2de3c232a0050ee247ae6e97b055f39e15a08ee3
Author: Jiang zhe <zhe.jiang at intel.com>
Date: Thu Mar 6 11:09:09 2008 +0100
[ALSA] hda-codec - model for cx20549 to support laptop HP530
Currently the model laptop-hpsense use the 0x12 as ExtMic,
and use 0x14 as Internal IntMic.
But the hp530 only have one ExtMic, the Pin widget is 0x14.
In this patch, I changed the mixer item for them.
I still reserved the IntMic item, it will be helpful if
other machine may use this model.
ALSA bug#3821.
Signed-off-by: Jiang zhe <zhe.jiang at intel.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit fb97dc67397c1ee63eb0094c28fc9a5dcc0a83a6
Author: Jiang zhe <zhe.jiang at intel.com>
Date: Thu Mar 6 11:07:11 2008 +0100
[ALSA] hda-codec - model for alc883 to support FUJITSU Pi2515
There is no suitable model for Pi2515.
This model is to support it. ALSA bug#3800.
Signed-off-by: Jiang zhe <zhe.jiang at intel.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d08cd58db9f4078bb9237fc6ff7104ed50d7804b
Author: Stas Sergeev <stsp at aknet.ru>
Date: Thu Mar 6 11:01:44 2008 +0100
[ALSA] pcsp: add description
update ALSA-Configuration.txt
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 52337310af443278ee84ec4b9adaee0037cc0e30
Author: Stas Sergeev <stsp at aknet.ru>
Date: Thu Mar 6 11:01:16 2008 +0100
[ALSA] pcsp: improve "enable" option handling
Simplify init code.
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 8280823668d42ed9695da759047b86074ad14ba4
Author: Pascal Terjan <pterjan at mandriva.com>
Date: Tue Mar 4 11:33:28 2008 +0100
[ALSA] ALC288 - Add NEC S970 to the quirk table
NEC S970 has no sound in the internal speakers when autodetection is
used.
With targa-dig model, there is sound in the speakers and it gets
correctly muted when pluging headphones.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a91605b86a234b01d2f99b38411ac30a40bdf067
Author: Stas Sergeev <stsp at aknet.ru>
Date: Tue Mar 4 11:28:43 2008 +0100
[ALSA] pcsp - clean ups
- make pcsp_start_timer_tasklet static
- remove redundant includes. <asm/i8253.h> is not available on all platforms.
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 368c7a95ea324b3f9728ba1c901ac119d409bf4e
Author: Jiang zhe <zhe.jiang at intel.com>
Date: Tue Mar 4 11:20:33 2008 +0100
[ALSA] hda-codec - model for alc883 to support M720R
There is no suitable model for M720R (ALSA bug#3781).
This patch is to support HP jack-sensing and mixer.
Signed-off-by: Jiang zhe <zhe.jiang at intel.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit fd2499f0ed765de3ab11c7fd6f37f9fbfaf059ec
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Mar 4 11:06:26 2008 +0100
[ALSA] aw2 - Remove endian dependency
Removed unnecessary dependency on the little-endianess.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 9bf8e7ddeaf57f1ec534014c447705ad31d5d721
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Mar 3 15:32:18 2008 -0800
[ALSA] sound: replace remaining __FUNCTION__ occurences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 24982c5f7feca2f4d1b0b562a28b767d93a01ce0
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Mar 4 10:08:58 2008 +0100
[ALSA] hda_intel needs dma-mapping.h
sparc32:
sound/pci/hda/hda_intel.c: In function 'azx_create':
sound/pci/hda/hda_intel.c:1838: error: 'DMA_64BIT_MASK' undeclared (first use in this function)
sound/pci/hda/hda_intel.c:1838: error: (Each undeclared identifier is reported only once
sound/pci/hda/hda_intel.c:1838: error: for each function it appears in.)
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ae092c9ede515bd6864b44efc2d83135bd3c535b
Author: Graeme Gregory <graeme at openmoko.org>
Date: Mon Mar 3 17:19:45 2008 +0100
[ALSA] soc - Add Invert Switch for ROUT2
GTA02 device has a speaker between LOUT2 & ROUT2 and in this mode ROUT2
needs to be inverted. This patch adds a mixer control for this.
Signed-off-by: Graeme Gregory <graeme at openmoko.org>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 9ab4d072ad67793d70b8707e14fb9261749c4e07
Author: Stas Sergeev <stsp at aknet.ru>
Date: Mon Mar 3 10:53:54 2008 +0100
[ALSA] Add PC-speaker sound driver
Added PC-speaker sound driver (snd-pcsp).
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 40ac8c4f208111cdc1542ccc9feb21b98a6b0219
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Feb 29 14:16:17 2008 +0100
[ALSA] hda-codec - Fix the array over-range access with stac92hd71bxx codec
Add the check of the array range for dac_nids to prevent the over-range
access.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit fd6640fa2d8b5f5f471aad5abd8ce5d6995df563
Author: Pawel MOLL <pawel.moll at st.com>
Date: Fri Feb 29 12:41:31 2008 +0100
[ALSA] IEC958 definitions for consumer status channel, byte 4
Added definition for byte 4 of SPDIF channel status, according to
second edition of IEC 60958-3 (consumer) spec.
Signed-off-by: Pawel MOLL <pawel.moll at st.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 52fe0f9d59cf4f5842bd319e4f212f907abd2e5d
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Fri Feb 29 12:08:20 2008 +0100
[ALSA] hda: add verbs for 92hd73xxx laptops
Added core_init[] for several 92hd73xxx laptops.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit bce6c2b5b4dbe8cd97c48c633b62adeb535954ad
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Fri Feb 29 12:07:43 2008 +0100
[ALSA] hda: disable power management on fixed ports
Power management can't be enabled on fixed ports, since the presence
will always return false and prevent output.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 3c9a3203ff9863fbe798030928f496347c2ed3bd
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:59:26 2008 +0100
[ALSA] sound: hda: missing includes of hda_patch.h
Move the array declaration to hda_codec.c where it is used and add includes
where the individual presets are declared.
Fixes the following sparse warnings:
sound/pci/hda/patch_realtek.c:13744:25: warning: symbol 'snd_hda_preset_realtek' was not declared. Should it be static?
sound/pci/hda/patch_cmedia.c:729:25: warning: symbol 'snd_hda_preset_cmedia' was not declared. Should it be static?
sound/pci/hda/patch_analog.c:3656:25: warning: symbol 'snd_hda_preset_analog' was not declared. Should it be static?
sound/pci/hda/patch_sigmatel.c:3995:25: warning: symbol 'snd_hda_preset_sigmatel' was not declared. Should it be static?
sound/pci/hda/patch_si3054.c:286:25: warning: symbol 'snd_hda_preset_si3054' was not declared. Should it be static?
sound/pci/hda/patch_atihdmi.c:156:25: warning: symbol 'snd_hda_preset_atihdmi' was not declared. Should it be static?
sound/pci/hda/patch_conexant.c:1721:25: warning: symbol 'snd_hda_preset_conexant' was not declared. Should it be static?
sound/pci/hda/patch_via.c:1962:25: warning: symbol 'snd_hda_preset_via' was not declared. Should it be static?
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 64ed0dfd1f42edb15f4d18c13d7696edbc2f7e4c
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Feb 29 11:57:53 2008 +0100
[ALSA] hda-codec - Use int instead of long in patch_sigmatel.c
The HD-audio parameters are at most 32bit int.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 8b55178515e8872670dc830203dad0e9e51e16be
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:56:48 2008 +0100
[ALSA] sound: patch_sigmatel.c fix shadowed variable warning
Temp variable in the loop shadows the second argument (which is otherwise
unused in this function). Change this to defcfg as it is used to hold
the default config.
sound/pci/hda/patch_sigmatel.c:2759:18: warning: symbol 'cfg' shadows an earlier one
sound/pci/hda/patch_sigmatel.c:2734:26: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0b76b51e5807951995a39ea791b39971a7ae945f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:54:49 2008 +0100
[ALSA] sound: hdspm.c fix returning void expression warnings
Just drop the returns.
sound/pci/rme9652/hdspm.c:1031:3: warning: returning void-valued expression
sound/pci/rme9652/hdspm.c:1033:3: warning: returning void-valued expression
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 0cd87b10ca29a351c61c8c63761ab8fb48e47b2f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:54:26 2008 +0100
[ALSA] sound: riptide.c fix shadowed variable warnings
In both cases we are passing around the substream number, use
sub_num for this.
sound/pci/riptide/riptide.c:1633:6: warning: symbol 'index' shadows an earlier one
sound/pci/riptide/riptide.c:121:12: originally declared here
sound/pci/riptide/riptide.c:1673:6: warning: symbol 'index' shadows an earlier one
sound/pci/riptide/riptide.c:121:12: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit caba7f70fce924dc5da2019f7678189086d0acd4
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:53:59 2008 +0100
[ALSA] sound: pcxhr_core.c fix shadowed variable warning
Inner loop redeclares err with u32 rather than int, stupid fix here
is to change the inner err to err2.
sound/pci/pcxhr/pcxhr_core.c:1008:8: warning: symbol 'err' shadows an earlier one
sound/pci/pcxhr/pcxhr_core.c:983:6: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ff143874d09a5850e7bf6c68d141243cb12a7b58
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:46:57 2008 +0100
[ALSA] sound: virtuoso.c fix shadowed variable warning
Use priv_idx as an identifier.
sound/pci/oxygen/virtuoso.c:277:15: warning: symbol 'index' shadows an earlier one
sound/pci/oxygen/virtuoso.c:56:12: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c3daa92d60552891057b65f278d882348b76fffe
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:52:50 2008 +0100
[ALSA] sound: ice1712.c fix shadowed variable warnings
In all four case, adding a private value to the iooff index,
call it priv_idx.
sound/pci/ice1712/ice1712.c:1300:6: warning: symbol 'index' shadows an earlier one
sound/pci/ice1712/ice1712.c:85:12: originally declared here
sound/pci/ice1712/ice1712.c:1312:6: warning: symbol 'index' shadows an earlier one
sound/pci/ice1712/ice1712.c:85:12: originally declared here
sound/pci/ice1712/ice1712.c:1338:6: warning: symbol 'index' shadows an earlier one
sound/pci/ice1712/ice1712.c:85:12: originally declared here
sound/pci/ice1712/ice1712.c:1350:6: warning: symbol 'index' shadows an earlier one
sound/pci/ice1712/ice1712.c:85:12: originally declared here
[tiwai - fixed coding issues as well]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f2948fc2f0e1c19b8bea77a14338d338e941ac9a
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:44:57 2008 +0100
[ALSA] sound: emu10k1x.c fix shadowed variable warnings
enable in these contexts refers specifically to intr enable, as
per the two functions it is found in. Use intr_enable instead.
sound/pci/emu10k1/emu10k1x.c:330:15: warning: symbol 'enable' shadows an earlier one
sound/pci/emu10k1/emu10k1x.c:53:12: originally declared here
sound/pci/emu10k1/emu10k1x.c:341:15: warning: symbol 'enable' shadows an earlier one
sound/pci/emu10k1/emu10k1x.c:53:12: originally declared here
instead of shadowing, use cap_voice as we test for the capture
voice in this statement.
sound/pci/emu10k1/emu10k1x.c:798:25: warning: symbol 'pvoice' shadows an earlier one
sound/pci/emu10k1/emu10k1x.c:787:24: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 4677df07e551d64167f64eba5e3563b3df7f4ca8
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:44:26 2008 +0100
[ALSA] sound: emuproc.c fix signedness warning
Reading regs from the fpga into an int instead of a u32, trivial
fix.
sound/pci/emu10k1/emuproc.c:422:34: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emuproc.c:422:34: expected unsigned int [usertype] *value
sound/pci/emu10k1/emuproc.c:422:34: got int *<noident>
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 3fa4a9073886a1031400c19e8b09fca3eebb645f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Feb 29 11:41:56 2008 +0100
[ALSA] sound: au88x0_pcm.c fix integer as NULL pointer warning
sound/pci/au88x0/au88x0_pcm.c:508:15: warning: Using plain integer as NULL pointer
Also some small codingstyle fixes.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 470f23b873679b045908551302fec6b1edf05a5a
Author: Ahmet Ä°nan <ainan at>
Date: Thu Feb 28 12:46:32 2008 +0100
[ALSA] snd-dummy - better realtime app support
when the time interval for a period is smaller than kernel HZ, then
snd-aloop and snd-dummy cannot call snd_pcm_period_elapsed as fast enough
annymore. this happens for example with games. but the app still needs to
see, that the buffer actually did go further, which is provided by these
patches.
Signed-off-by: Ahmet Ä°nan <ainan <at> mathematik.uni-freiburg.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit bed515b0dfdcf8f440c7e6c5bad8ce3eb96fb625
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 12:02:56 2008 +0100
[ALSA] sound: ca0106_mixer.c fix shadowed variable warnings
Change the variable err to _err within the ADD_CTLS macro to avoid
shadowing the local variable.
sound/pci/ca0106/ca0106_mixer.c:710:2: warning: symbol 'err' shadows an earlier one
sound/pci/ca0106/ca0106_mixer.c:663:6: originally declared here
sound/pci/ca0106/ca0106_mixer.c:712:3: warning: symbol 'err' shadows an earlier one
sound/pci/ca0106/ca0106_mixer.c:663:6: originally declared here
sound/pci/ca0106/ca0106_mixer.c:721:3: warning: symbol 'err' shadows an earlier one
sound/pci/ca0106/ca0106_mixer.c:663:6: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d967a02712f09265b3c357f35f125715f5dffd2f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 12:02:22 2008 +0100
[ALSA] sound: ca0106_main.c fix shadowed variable warnings
change to intr_enable as per the two functions it is defined in.
sound/pci/ca0106/ca0106_main.c:438:15: warning: symbol 'enable' shadows an earlier one
sound/pci/ca0106/ca0106_main.c:159:12: originally declared here
sound/pci/ca0106/ca0106_main.c:449:15: warning: symbol 'enable' shadows an earlier one
sound/pci/ca0106/ca0106_main.c:159:12: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c74056d437401dc7d43970cd845c34a7e28723c0
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 12:00:48 2008 +0100
[ALSA] sound: ali5451.c fix shadowed variable warnings
enable is used to test for whether or not spdif should be enabled,
change to spdif_enable.
sound/pci/ali5451/ali5451.c:1812:15: warning: symbol 'enable' shadows an earlier one
sound/pci/ali5451/ali5451.c:63:12: originally declared here
sound/pci/ali5451/ali5451.c:1840:27: warning: symbol 'enable' shadows an earlier one
sound/pci/ali5451/ali5451.c:63:12: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 608b10bad3563e2349393136ce421d9f67329170
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 11:58:18 2008 +0100
[ALSA] sound: ac97_pcm.c fix shadowed variable warning
err is always assigned before it is used, no need to declare another
inside the if statement.
sound/pci/ac97/ac97_pcm.c:577:7: warning: symbol 'err' shadows an earlier one
sound/pci/ac97/ac97_pcm.c:572:6: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 44977b719f7425ddb1cb67d647a4f588a9718163
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 11:57:47 2008 +0100
[ALSA] sound: rme96.c fix integer as NULL pointer warning
kernel style does assignment outside of if() block
sound/pci/rme96.c:1562:71: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 4db9e4f2b5278338ff9487eefdc8e32109aa0552
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 11:57:23 2008 +0100
[ALSA] sound: rme32.c fix integer as NULL pointer warning
kernel style does assignment outside of if() statements.
sound/pci/rme32.c:1353:71: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit e37273d3484e241063fefb2611a0c93eb0d9ddbd
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 11:56:37 2008 +0100
[ALSA] sound: maestro3.c fix shadowed variable warnings
change id to elem_id as it is used to initialize each mixer element
sound/pci/maestro3.c:2071:25: warning: symbol 'id' shadows an earlier one
sound/pci/maestro3.c:67:13: originally declared here
index is used in each of these places to count over the dsp's memory,
change to the name dsp_index
sound/pci/maestro3.c:2572:9: warning: symbol 'index' shadows an earlier one
sound/pci/maestro3.c:66:12: originally declared here
sound/pci/maestro3.c:2604:9: warning: symbol 'index' shadows an earlier one
sound/pci/maestro3.c:66:12: originally declared here
[tiwai - fixed coding style issues as well]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 58e4334e82c0f4eb0147a905a127bd14f0ea0a2d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 11:55:07 2008 +0100
[ALSA] sound: fm801.c fix shadowed variable warning
id was only used as a counter in a for loop, move the declaration
to where it is used and change it to i.
sound/pci/fm801.c:1288:6: warning: symbol 'id' shadows an earlier one
sound/pci/fm801.c:51:13: originally declared here
[tiwai - fixed a coding style issue as well]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 3463d8fa14ba2e00ede9894efdaa65189eb04b36
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 11:53:41 2008 +0100
[ALSA] sound: es1968.c fox shadowed variable warning
id is used when initializing the mixer elements, use elem_id here
instead.
sound/pci/es1968.c:1963:25: warning: symbol 'id' shadows an earlier one
sound/pci/es1968.c:129:13: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 405b0a377cfe3750f4af54b80d0402c3fe777b87
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 11:53:07 2008 +0100
[ALSA] sound: ens1370.c fix shadowed variable warning
index is incremented only when AC97_EI_SPDIF and then assigned to
the index field. Change the temporary name to is_spdif.
sound/pci/ens1370.c:1638:10: warning: symbol 'index' shadows an earlier one
sound/pci/ens1370.c:84:12: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7dfa31ed5e1fc0ace7f1959b9564ad43d78fd7af
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Feb 28 11:52:17 2008 +0100
[ALSA] sound: cmipci.c fix shadowed variable warning
A temporary variable for each mixer element is used in an initialization
loop, use the name elem_id.
sound/pci/cmipci.c:2747:26: warning: symbol 'id' shadows an earlier one
sound/pci/cmipci.c:56:13: originally declared here
[tiwai - fixed a coding style issue as well]
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 964a788e0ba64aa4ce2e6488718f3ee28cc2e61e
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Tue Feb 26 13:16:08 2008 +0100
[ALSA] soc - Report errors from snd_soc_dapm_set_endpoint()
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit b26451c059e741ec5e3389f7758627cb094b3766
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Feb 26 11:56:35 2008 +0100
[ALSA] hda-codec - Add docking-station mic input for Thinkpad X61
Added the docking-stationc mic input to the capture source list
for Thinkpad X61.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit aea7bb0a6ff5e751ef611ba9c1146c3c8489f25e
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 25 18:26:41 2008 +0100
[ALSA] hda-codec - Fix initial DAC numbers of 92HD71bxx codecs
Fix the initial num_dacs of 92HD71bxx codecs.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 25a47b6b01314f027553d231c1a67dee27ff02b0
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Feb 25 11:04:19 2008 +0100
[ALSA] usb-audio: sort quirks list
Move some entries to their proper position so that the list is again
sorted by vendor/product ID.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
commit ea6b5828cdbbedaf26b12ae64befbec18084ea3c
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Feb 25 10:59:52 2008 +0100
[ALSA] mpu401: reduce tx loop timeout
Reduce the number of times to check for a non-empty Tx FIFO from 100 to
2 because there is no MPU-401 implementation that needs more than one or
two reads to determine the actual FIFO status.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
commit 47ba97f8fa01bb5b48e73b4b1271fbf1436a2d4b
Author: Remy Bruno <remy.bruno at trinnov.com>
Date: Fri Feb 22 17:57:02 2008 +0100
[ALSA] hdsp - RME 9632 fix at 192kHz
The bits indicating SPDIF frequency in the status register are not the same for
the 9632 than for the other cards, because it also supports 192kHz. A specific
bitmask has thus been added (used in hdsp_spdif_sample_rate()).
The 9632 does not seem to report external sample rates greater than 96kHz. In
this case, the best seems to report spdif rate when autosync reference is
spdif. This also required to move function hdsp_spdif_sample_rate().
Signed-off-by: Remy Bruno <remy.bruno at trinnov.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ae0afd81b34ce287ffda7dd4e33b5144de2ad39d
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Fri Feb 22 17:55:05 2008 +0100
[ALSA] hda: Mic as output fix
Added logic to check if AUTO_PIN_FRONT_MIC is available for output
switch, if AUTO_PIN_MIC isn't.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 88d18ea2c2b40496b56efcb354e9eae1f09ef126
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Feb 21 14:11:09 2008 +0100
[ALSA] hda-codec - Add missing descriptions for STAC codec models
Added the missing descriptions for STAC codec models.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c354cd7d9627930dcfbcff8355d422fa1bca948a
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Feb 21 12:40:00 2008 +0100
[ALSA] seq-oss - Remove invalid BUG()
Removed invalid BUG() - the driver should handle the error case properly
rather than issuing BUG().
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 87218e9c6e7f7908baf98030b6d724e14aa8b5cd
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Feb 21 08:13:11 2008 +0100
[ALSA] hda-intel - Use PCI_DEVICE() macro
Clean up the pci id table using PCI_DEVICE() macro.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 53463a8302d0c3148c4c64c034312215e76429c2
Author: Ahmet Ä°nan <ainan at>
Date: Thu Feb 21 07:55:30 2008 +0100
[ALSA] snd-dummy - improved timing, silence on prepare
Signed-off-by: Ahmet Ä°nan <ainan <at> mathematik.uni-freiburg.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 03d7ca177fd2ecac8eb22f482f327ecaae4ac8cb
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Thu Feb 21 07:51:46 2008 +0100
[ALSA] hda: STAC927x analog mic
Some laptops have a internal analog microphone that is not setup by the BIOS.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a7662640104599249e15cda7839e9050f92e6a0e
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Thu Feb 21 07:51:14 2008 +0100
[ALSA] hda: 92HDxxxx PCI Quirks
Added PCI_QUIRKS for laptop that have the 92HDxxx family of codecs.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7989fba979daea99285079dc0099ab658e4db759
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Thu Feb 21 07:50:12 2008 +0100
[ALSA] hda: STAC927x invalid association value
STAC_DELL_BIOS quirks were setting the association value wrong
for port 0x0f, which prevented it from being included in hp_outs[].
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 4451089e2aafba87d7574e27c839895131a80293
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Thu Feb 21 07:49:31 2008 +0100
[ALSA] hda: fix STAC927x power management
Fix issue on STAC927x codecs that first DAC was getting powered down
even if was being used.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 6876a5323f6169f9321354a398f7364b41ca82fa
Author: Jarkko Nikula <jarkko.nikula at nokia.com>
Date: Wed Feb 20 17:13:44 2008 +0100
[ALSA] ASoC: Add support for 12 MHz MCLK in TLV320AIC3X
Signed-off-by: Jarkko Nikula <jarkko.nikula at nokia.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 9e235323db4689e8b7e123252b998a4904806c38
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Feb 20 12:13:29 2008 +0100
[ALSA] Add description of aw2 driver
Added a brief description of aw2 driver to ALSA-Configuration.txt.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 34b6757dc7ce0e9d5d3930b29d53a7bcb0fde047
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Feb 20 12:12:58 2008 +0100
[ALSA] aw2 - Add missing module parameters
Added the missing declarations for module parameters.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 98f2a97f207a776603173ee96327d977e592579d
Author: Cedric Bregardis <cedric.bregardis at free.fr>
Date: Wed Feb 20 12:05:13 2008 +0100
[ALSA] Emagic Audiowerk 2 ALSA driver.
Signed-off-by: Cedric Bregardis <cedric.bregardis at free.fr>
Signed-off-by: Jean-Christian Hassler <jhassler at free.fr>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 67ebcb0311110dc7268bb5b135bf437d8033337e
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Feb 19 15:03:57 2008 +0100
[ALSA] hda-codec - Don't create multiple capture streams for single inputs
When the device has only one input source, it makes no sense to have
multiple capture streams.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 85860c06aba5e145805ad840553a2388e60a7e23
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Feb 19 15:00:15 2008 +0100
[ALSA] hda-codec - Fix ALC268 capture source
Initialize the capture source properly for auto model.
It's especially important for cases that only mic is detected.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit aef9d318b1d741d80486ff7ea3507a8321dedf6b
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Feb 19 13:16:41 2008 +0100
[ALSA] hda-codec - Add beep volume control to ALC268
Added the beep volume control to ALC268 codec support code.
Since the codec doesn't return the correct AMP caps, we need to override
the value.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 77a261b75521564dcc5f22355cce4830f6b1376a
Author: Kailang Yang <kailang at realtek.com.tw>
Date: Tue Feb 19 11:38:05 2008 +0100
[ALSA] hda-codec - Fix ALC662 recording
Fixed ALC662 recording issue.
Signed-off-by: Kailang Yang <kailang at realtek.com.tw>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 8b6ed8e70d9a7c39748a9902d64138e070d4064b
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Feb 19 11:36:35 2008 +0100
[ALSA] hda-intel - Clean up stream definitions
Clean up the code to define playback/capture streams.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 49c88b85b53767f97eb8c9171cb0b976c62a0114
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 18 13:06:49 2008 +0100
[ALSA] ca0106 - Add master volume controls
Added master volume and switch controls for ca0106 using vmaster.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 1c82ed1bc531746a8fa9b46c593ddce546f28026
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 18 13:05:50 2008 +0100
[ALSA] Keep private TLV entry in vmaster itself
Use a private array for TLV entries of virtual master controls instead
of (supposed) static array. This cleans up the existing codes.
Also, now vmaster assumes the simple dB-range TLV that is the only type
it can handle.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit e922b0028fad87de0d262f9fa51f98595d2df258
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 18 13:03:13 2008 +0100
[ALSA] Move vmaster code to sound core
Move the codes for virtual master controls to sound core part so that
not only hda-intel drivers can use it.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 4235a31784f59c9be5ff71534743c055091f9735
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 18 12:23:13 2008 +0100
[ALSA] intel8x0 - Add support of 8 channel sound
Added the support of 8 channel sound for codecs that are known to work.
So far, only ALC850 is marked as a 8ch-support codec.
This fix is a modified version of the patch on ALSA BTS#2097 by
Martin Ellis:
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=2097
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 2eef1258e54722b1c4efac6e5760d2153f96c4b4
Author: Hans-Christian Egtvedt <hcegtvedt at atmel.com>
Date: Mon Feb 18 11:44:56 2008 +0100
[ALSA] Add __devinit macro to at73c213 sound driver probe functions
This patch adds __devinit to the functions used when probing. Will also reduce
the memory footprint a bit if CONFIG_HOTPLUG is not enabled.
Signed-off-by: Hans-Christian Egtvedt <hcegtvedt at atmel.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 310355c111dbae005269fe3fc39afdd60779bf5d
Author: Vladimir Barinov <vbarinov at ru.mvista.com>
Date: Mon Feb 18 11:40:22 2008 +0100
[ALSA] Davinci ASoC support
Add ASoC support for the TI Davinci SoC and the Davicni-EVM reference board.
It includes:
- ASoC Davinci DMA driver
- ASoC Davinci I2S (Davinci McBSP module based) driver
- ASoC Davinci-EVM reference board
Signed-off-by: Vladimir Barinov <vbarinov at ru.mvista.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit b40b04ad380ad641e5740486e4b9a56fd32b64cc
Author: Takashi Iwai <tiwai at suse.de>
Date: Sat Feb 16 09:44:56 2008 +0100
[ALSA] hda-codec - Add model=mobile for AD1884A & co
Added the new model mobile for AD1884A and compatible codecs.
It's a reduced version of model=laptop.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c5059259688ab76f14f2f69a93e13575a36b614b
Author: Takashi Iwai <tiwai at suse.de>
Date: Sat Feb 16 09:43:56 2008 +0100
[ALSA] hda-codec - Add support of AD1883/1884A/1984A/1984B
Added the support of new AD codecs: AD1883, AD1884A, AD1984A and AD1984B.
These are almost compatible except for additional digital pins, etc.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 83ac08c0846bc6106d6c7fbb342eab02b32dd399
Author: Liam Girdwood <liam.girdwood at wolfsonmicro.com>
Date: Fri Feb 15 16:43:11 2008 +0100
[ALSA] ASoC: WM9713 driver
This patch adds an ASoC driver for the WM9713 AC97 codec.
Signed-off-by: Liam Girdwood <liam.girdwood at wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 88c71a9974693f2b2824b09340269511dd7cbe18
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Feb 14 17:27:17 2008 +0100
[ALSA] hda-codec - Fix missing capsrc_nids for ALC262
ALC262 must have capsrc_nids defined as well as in ALC882.
Also, add a NULL check in alc882_mux_enum_put to avoid Oops.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 814b1a5ce6b35bafd583ae813da97e8254bb1930
Author: Libin Yang <Libin.yang at amd.com>
Date: Thu Feb 14 12:55:13 2008 +0100
[ALSA] HDA-Intel - Patch to support RV7xx HDMI Audio
This patch is to add R7xx HDMI audio support.
Signed-off-by: Libin Yang <Libin.yang at amd.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d260cdf65657382c4cde366a1c7d4ddce669a427
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Feb 13 17:19:35 2008 +0100
[ALSA] hda-codec - Fix breakage of resume in auto-config of realtek codecs
The last patch for fixing the auto-config pin setting breaks the resume
due to a wrong use of snd_hda_codec_amp_stereo(). The code in the init
hook shouldn't touch the amp cache.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c8cd1281171602033861d0888273e0512f9b165c
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Feb 13 16:59:29 2008 +0100
[ALSA] hda-codec - Add more names to vendor list
Added more known names to the vendor id list.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 9a08160bdbe3148a405f72798f76e2a5d30bd243
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Feb 12 18:37:26 2008 +0100
[ALSA] hda-codec - Add "IEC958 Default PCM" switch
Added a new mixer switch to enable/disable the sharing of the default
PCM stream with analog and SPDIF outputs. When "IEC958 Default PCM"
switch is on, the PCM stream is routed both to analog and SPDIF outputs.
This is the behavior in the earlier version.
Turning this switch off has a merit for some codecs, though. Some codec
chips don't support 24bit formats for SPDIF but only for analog outputs.
In this case, you can use 24bit format by disabling this switch.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f6c7e5461e9046445d50c5c7a9a4587824239623
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Feb 12 18:32:23 2008 +0100
[ALSA] hda-codec - Fix auto-configuration of Realtek codecs
This patch fixes some bugs in the auto-configurator of Realtek codecs:
- add missing pin set-up for speaker pins
- fix the speaker auto-mute function not to conflict with the existing
"Speaker" mixer switch
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5832fcf8b55cfdbd7d8511f747d15fd20ed4703d
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Feb 12 18:30:12 2008 +0100
[ALSA] hda-codec - More fix-up for auto-configuration
In some cases, the BIOS sets up only the HP pins with different assoc
and sequence numbers, e.g. on FSC Esprimo with ALC262.
This patch adds a fix-up for such a case. When multiple HPs are defined
and no line-outs is found, the configurator tries to re-assign some pins
from HP list to line-out, judging from the sequence number.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 5d5d5f43f1b835c375de9bd270cce030d16e2871
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Feb 12 12:11:36 2008 +0100
[ALSA] hda-codec - Implement auto-mic jack sensing on Samsung laptops
Implemented the auto-mic jack sensing for Samsung laptops with AD1986A
codec chip (model=laptop-eapd).
The hardware uses pin 0x1d and 0x1f for the internal and external
mics, respectively.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit e1406348129dc2db60ccad079c3d014200590557
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 11 18:32:32 2008 +0100
[ALSA] hda-codec - Clean up capture source selection of Realtek codecs
Clean up the codes of the capture source selection for Realtek codecs.
Now using common helper functions with the new capsrc_nids field.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f0824812af1bf4f7d27e054a2ca2686385d770bb
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 11 15:54:34 2008 +0100
[ALSA] hda-codec - Fix automute of AD1981HD hp model
Reprogram the speaker-pin setting at each HP pin plug to make sure
the spekaer auto-muting on AD1981HD hp model.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 937b416027d8f79d7b37bb63b6585ea8fdf125de
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 11 14:52:36 2008 +0100
[ALSA] hda-codec - Fix ALC880 F1734 model
Fixed some issues with ALC880 F1734 model
- fix capture via mic
- enable volume-wheel control
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit fdafad6fc24a11070bcd0885100be7143cc038f8
Author: Pavel Hofman <dustin at seznam.cz>
Date: Mon Feb 11 14:48:06 2008 +0100
[ALSA] AK4114 - listing regs in proc
A simple patch for listing AK4114 regs in proc.
Signed-off-by: Pavel Hofman <dustin at seznam.cz>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit aa27a44395c3d35bc16e52f1e709e0fb2a3709e4
Author: Jonathan Woithe <jwoithe at physics.adelaide.edu.au>
Date: Fri Feb 8 12:44:17 2008 +0100
[ALSA] hda-codec - remove duplicate controls in alc268 test mixer
I've just noticed that there are a handful of duplicate controls in the
ALC268 test model mixer. This patch (against alsa-driver 1.0.16) removes
them.
Signed-off-by: Jonathan Woithe <jwoithe at physics.adelaide.edu.au>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit cc4d13873aeacf89901861706a7a083d5a82e26a
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Feb 7 17:12:01 2008 +0100
[ALSA] hda-codec - Correct HDMI transmitter names
Give better names to the new HDMI transmitter chips.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 21c7b0819f0d04788b2d3341f5062744373589a1
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Feb 7 12:06:32 2008 +0100
[ALSA] hda-intel - Fix a compile error with CONFIG_SND_DEBUG_DETECT=y
Forgot to get rid of the obsolete fragsize field from a debug print.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ef2cd2ccad66b4aba518eca7514eface267ee0f3
Author: Jaroslav Kysela <perex at perex.cz>
Date: Wed Feb 6 20:04:49 2008 +0100
[ALSA] ice1712 - added support for M-Audio Delta 66E
See ALSA bug#3327 for more details. Experimental.
Also fix support for M-Audio Delta 1010E - subdevice check.
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
commit a60567d13c047b03167df4aed6b7a8730f267234
Author: Jaroslav Kysela <perex at perex.cz>
Date: Wed Feb 6 15:48:06 2008 +0100
[ALSA] Added support for Delta1010E (newer revisions of Delta1010)
For more details, see ALSA bug#3327 .
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
commit cf7aaca8bae3a719db47ff6eca5f6f2f42eba05a
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Feb 6 15:05:57 2008 +0100
[ALSA] hda-intel - Support 64bit buffer allocation
The HD-audio hardware usually supports 64bit address for DMA and other
buffers. The patch enables the feature if supported.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 4ce107b990d994a0fccea9b1e885b08a0daea495
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Feb 6 14:50:19 2008 +0100
[ALSA] hda-intel - Use SG buffer
Use SG buffers for the HD-audio instead of linear buffers.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit b76c850fbc280d6c0ff786653915f3a9700b5912
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Wed Feb 6 14:49:44 2008 +0100
[ALSA] hda: STAC927x power down inactive DACs
On several laptops that have STAC9228 codecs have unused DACs,
this powers them down to a D3 state.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit d043143d803ad9a9f4a66d6a833876735fb7b869
Author: Alan Horstmann <gineera at aspect135.co.uk>
Date: Wed Feb 6 14:43:54 2008 +0100
[ALSA] ice1712 - Fix hoontech MIDI input
Fixes the problems with Midi In on Hoontech/STA dsp24 cards, for example with
DSP2000 box, without restricting the box configurations available. Also adds
mpu_401 name strings.
Signed-off-by: Alan Horstmann <gineera at aspect135.co.uk>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7d664ed58fb54bc421d5fe8e5e0adec736fd0558
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Feb 6 14:41:59 2008 +0100
[ALSA] hda-codec - Add ID for an unknown HDMI codec chip
Added the ID for an unknown HDMI codec chip on Jetway J9F2.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7ba72ba1fe891a94b1e9d506236507e4dc50e872
Author: Takashi Iwai <tiwai at suse.de>
Date: Wed Feb 6 14:03:20 2008 +0100
[ALSA] hda-intel - Fix PCM device number assignment
In the current scheme, PCM device numbers are assigned incrementally
in the order of codecs. This causes problems when the codec number
is irregular, e.g. codec #0 for HDMI and codec #1 for analog. Then
the HDMI becomes the first PCM, which is picked up as the default
output device. Unfortuantely this doesn't work well with normal
setups.
This patch introduced the fixed device numbers for the PCM types,
namely, analog, SPDIF, HDMI and modem. The PCM devices are assigned
according to the corresponding PCM type. After this patch, HDMI will
be always assigned to PCM #3, SPDIF to PCM #1, and the first analog
to PCM #0, etc.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 6c4cc3a8ed15aacc06a5fd369639fef633cee2bc
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 4 12:44:11 2008 +0100
[ALSA] Add more fallbacks to OSS PHONEOUT mixer map
Added more fallbacks to OSS PHONEOUT mixer mapping. This corresponds
to the speaker output in general, so now "Mono" and "Speaker" are
assigned.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a76969228a5b341f9c968abbc6eb7655ac3734e4
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 4 12:36:32 2008 +0100
[ALSA] ice1724 - Add ADC setup in set_rate callback for Audiophile192
Added the missing GPIO setup for the AK5385A ADC codec on Audiophile192.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f339eb0f30e6598c1d3f91b01a3e634364fab7a2
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 4 12:34:59 2008 +0100
[ALSA] ice1724 - Enable AK4114 support for Audiophile192
Fixed and enabled the support of AK4114 chip on Audiophile192.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f12462c5224bf992f5ed4d37af4d42622f7d5934
Author: Mirco Tischler <mt-ml at gmx.de>
Date: Mon Feb 4 12:33:59 2008 +0100
[ALSA] hda-codec - Add support of Zepto laptops
Adds support for zepto laptops with alc268 intel_hda codec.
Signed-off-by: Mirco Tischler <mt-ml at gmx.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 12a733e56c0f1c78bd34bf36e9765463fd51c88e
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 4 12:32:20 2008 +0100
[ALSA] hda-codec - Add SI HDMI codec support
Added the support of SI HDMI codec, found in ASUS machines.
ALSA bug#3654
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3654
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 09f99701393c7b66bde01df6c292fe5d9f843033
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Feb 4 12:31:13 2008 +0100
[ALSA] hda-codec - Allow multiple SPDIF devices
The current code doesn't allow multiple SPDIF devices, and causes
errors when multiple SPDIF devices are found (e.g. SPDIF out and HDMI).
This patch allows multiple SPDIF devices by incrementing the index
automatically.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit bf277785d6921b8a9f8339ad5ad632aef6cae73c
Author: Tobin Davis <tdavis at dsl-only.net>
Date: Sun Feb 3 20:31:47 2008 +0100
[ALSA] HDA - Add support for the OQO Model 2
This patch adds support for the OQO Model 2 Ultra Mobile PC.
Signed-off-by: Tobin Davis <tdavis at dsl-only.net>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit dc952e693e3653d0fa50ee1986a47d88de3465b7
Author: Kristoffer Ericson <kristoffer.ericson at gmail.com>
Date: Fri Feb 1 13:16:10 2008 +0100
[ALSA] Add SUPERH depends to sound/soc/sh/Kconfig
Currently you will see an empty "SoC Audio support for SuperH" menu
when building for other archs (example pxa).
This patch adds "depends on SUPERH" to remove that empty menu.
Signed-off-by: Kristoffer Ericson <kristoffer.ericson at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 102646085ab530a0e155d2bde424589b83ef5a89
Author: Mike Montour <mail at mmontour.net>
Date: Fri Feb 1 13:12:12 2008 +0100
[ALSA] soc - Mono voice playback volume for WM8753
Voice playback volume is in register bits 0:2, not 4:6.
From: Mike Montour <mail at mmontour.net>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Cc: Werner Almesberger <werner at openmoko.org>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 4a1fd556c1f1fbd6d9d6739efec042324732b697
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Mon Apr 21 18:42:04 2008 +0100
[ARM] fix 48d7927bdf071d05cf5d15b816cf06b0937cb84f
The proc-*.S files have the _prefetch_abort pointer placed at the end
of the processor structure but the cpu-multi32.h defines it in the
second position. The patch also fixes the support for XSC3 and the
MMU-less CPUs (740, 7tdmi, 940, 946 and 9tdmi).
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 328d8a012583f0c25f8db25a2e5e63b521201542
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Sun Apr 20 17:42:16 2008 +0100
[ARM] 5010/1: htc-pasic3: remove unused defines and includes
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 5e659e4cb0eedacdc1f621a61e400a4611ddef8a
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu Apr 24 01:02:16 2008 -0700
[NET]: Fix heavy stack usage in seq_file output routines.
Plan C: we can follow the Al Viro's proposal about %n like in this patch.
The same applies to udp, fib (the /proc/net/route file), rt_cache and
sctp debug. This is minus ~150-200 bytes for each.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3d36696024499aef19dbf24a781e91a24fbbe4af
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Thu Apr 24 00:59:25 2008 -0700
[AF_UNIX] Initialise UNIX sockets before general device initcalls
When drivers call request_module(), it tries to do something with UNIX
sockets and triggers a 'runaway loop modprobe net-pf-1' warning. Avoid
this by initialising AF_UNIX support earlier.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8243e40acb087fcd9e7609333f0b0551391f49fc
Author: David S. Miller <davem at davemloft.net>
Date: Wed Apr 23 22:52:13 2008 -0700
[SPARC64]: Store magic cookie and trap type in pt_regs.
This sets us up for several simplifications and facilities:
1) The magic cookie lets us identify trap frames more
accurately in stack backtraces.
2) The trap type lets us simplify all of the "are we in
a syscall" state management and checks.
3) We can now see if a task off the cpu is sleeping in
a system call or not. In fact, we can see what
trap it is sleeping in whatever the type. The utrace
guys will use this.
Based upon some discussions with Roland McGrath.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit db9a7fb12c8d05104e8a541003593d62a42ade8f
Author: David S. Miller <davem at davemloft.net>
Date: Wed Apr 23 22:22:29 2008 -0700
[SPARC64]: PROM debug console can be CON_ANYTIME.
No per-cpu or similar resources need to be setup before
we can use this console device.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c6ca978370c57422cdcf814af1da96cfc7c24811
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Apr 23 19:15:59 2008 -0700
sparc64: cleanup after SunOS/Solaris binary emulation removal
The following cleanups are now possible:
- arch/sparc64/kernel/entry.S:ret_sys_call no longer has to be global
- arch/sparc64/kernel/sparc64_ksyms.c:
remove no longer used prototypes
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a5c564279854c971a27cc650be4bb32c290e9ae7
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Apr 23 19:15:34 2008 -0700
sparc: cleanup after SunOS binary emulation removal
The following cleanups are now possible:
- arch/sparc/kernel/entry.S:ret_sys_call no longer has to be global
- arch/sparc/kernel/signal.c:sys_sigpause() can be removed
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 919ee677b656c52c5f86d3d916786891220d5452
Author: David S. Miller <davem at davemloft.net>
Date: Wed Apr 23 05:40:25 2008 -0700
[SPARC64]: Add NUMA support.
Currently there is only code to parse NUMA attributes on
sun4v/niagara systems, but later on we will add such parsing
for older systems.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1f261ef53ba06658dfeb5a9c3007d0ad1b85cadf
Author: David S. Miller <davem at davemloft.net>
Date: Wed Mar 19 04:53:58 2008 -0700
[SPARC64]: Allocate TSB node-local.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c1b1a5f1f1b2612b69b67381b223bce9f8ec4da5
Author: David S. Miller <davem at davemloft.net>
Date: Wed Mar 19 04:52:48 2008 -0700
[SPARC64]: NUMA device infrastructure.
Record and propagate NUMA information for devices.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0c49a573ea93f777fd27f26b7853e7bf5a20e1a3
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 22:15:46 2008 -0800
[SPARC64]: Kill pci_iommu_table_init() declaration.
No longer exists.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ce3b1d47a8605905b666649ea309b6471a75b4ed
Author: David S. Miller <davem at davemloft.net>
Date: Wed Mar 19 03:54:09 2008 -0700
[SPARC64]: Once we have the boot cmdline, call parse_early_param()
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 30957a86c2442fb6d73aaa9a3153f023fe0a682b
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 22:07:34 2008 -0800
[SPARC64]: Remove unused asm-sparc64/numnodes.h
This is handled with config options now.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 86cfc751cb4d5da20904ae26c67fb6fd2a68a9c4
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 22:01:57 2008 -0800
[SPARC64]: Decrease SECTION_SIZE_BITS to 30.
We'll need this to handle NUMA properly on some systems.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4a28333984be123d9c063df23175c48749c4b4a0
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 19:22:23 2008 -0800
[SPARC64]: Initialize MDESC earlier and use lmb_alloc()
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ad072004ca35a9918964ca7aee2bf00d79c8657f
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 19:21:51 2008 -0800
[SPARC64]: Use lmb_alloc() for PROM device tree.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b97094560b991af5c62391014e72bfa4c3a3701f
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 19:20:45 2008 -0800
[SPARC64]: Call real_setup_per_cpu_areas() earlier and use lmb_alloc().
We have to do it like this before we can move the PROM and MDESC device
tree code over to using lmb_alloc().
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9422273ba7d139537720c8c47514925d9a621e0d
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 18:31:41 2008 -0800
[SPARC64]: Fully use LMB information in bootmem_init().
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 25b0c659dfb94f1ddaeda7a8c88ef7043f57f419
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 18:20:14 2008 -0800
[SPARC64]: Start using LMB information in bootmem_init().
This allows us to kill the incredibly complicated and stupid function
trim_pavail().
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3b2a7e23a9808e349bc5fb32327bacc5e81be79c
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 18:13:20 2008 -0800
[SPARC64]: Initialize LMB tables.
Call lmb_add() on available regions, and call lmb_reserve()
on the main kernel image and the ramdisk (if any).
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4e82c9a606da2b1c1c7ea7dfd8052626a4c6d5d6
Author: David S. Miller <davem at davemloft.net>
Date: Wed Feb 13 18:00:03 2008 -0800
[SPARC64]: Move ramdisk discovery code out to seperate function.
And add some comments explaining all of the quirks involved in
the way the bootloader provides this information.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7347aefbccb47ce2d076d8ac7dff2cdd1435974c
Author: David S. Miller <davem at davemloft.net>
Date: Wed Apr 23 23:30:59 2008 -0700
[LMB]: Fix lmb allocation regression.
Changeset d9024df02ffe74d723d97d552f86de3b34beb8cc ("[LMB] Restructure
allocation loops to avoid unsigned underflow") removed the alignment
of the 'size' argument to call lmb_add_region() done by __lmb_alloc_base().
In doing so it reintroduced the bug fixed by changeset
eea89e13a9c61d3928223d2f9bf2295e22e0efb6 ("[LMB]: Fix bug in
__lmb_alloc_base().").
This puts it back.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c9c1014b2bd014c7ec037bbb6f58818162fdb265
Author: Patrick McHardy <kaber at trash.net>
Date: Wed Apr 23 22:10:48 2008 -0700
[RTNETLINK]: Fix bogus ASSERT_RTNL warning
ASSERT_RTNL uses mutex_trylock to test whether the rtnl_mutex is
held. This bogus warnings when running in atomic context, which
f.e. happens when adding secondary unicast addresses through
macvlan or vlan or when synchronizing multicast addresses from
wireless devices.
Mid-term we might want to consider moving all address updates
to process context since the locking seems overly complicated,
for now just fix the bogus warning by changing ASSERT_RTNL to
use mutex_is_locked().
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit df698690341377c78a6c2e31fd116778dafb68d6
Author: Paul Mackerras <paulus at samba.org>
Date: Thu Apr 24 14:05:15 2008 +1000
Revert "[POWERPC] Add compat handler for PTRACE_GETSIGINFO"
This reverts commit e4cc58944c1e2ce41e3079d4eb60c95e7ce04b2b, as
requested by Roland McGrath, because compat_ptrace_request (added in
commit e16b27816462de700f9508d86954410c41105dc2, "ptrace:
compat_ptrace_request siginfo") now handles this case.
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 75a44ce00b312f57264f42a0a985d17cd9994b98
Author: Len Brown <len.brown at intel.com>
Date: Wed Apr 23 23:00:13 2008 -0400
ACPICA: update Intel copyright
Signed-off-by: Len Brown <len.brown at intel.com>
commit 6440be177f56e0b52dd81df82b78875d9a07d5f9
Merge: 49186b4a083655a4ebf54e94baf0736256b01b47 099714934d80100624829f1e2961b9dccaef3280
Author: David S. Miller <davem at davemloft.net>
Date: Wed Apr 23 19:44:58 2008 -0700
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 49186b4a083655a4ebf54e94baf0736256b01b47
Author: Zhu Yi <yi.zhu at intel.com>
Date: Wed Apr 23 19:44:13 2008 -0700
iwlwifi: Fix built-in compilation of iwlcore (part 2)
On Wed, 2008-04-23 at 13:38 +0300, Tomas Winkler wrote:
> This patch fixes problem in Makefile that prevented
> built-in compilation of iwlcore
Here is the second part. Without this,
drivers/net/wireless/iwlwifi/build-in.o will not be linked into vmlinux.
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 48abfe05cd01279afe27159e98d7c7f932598f42
Author: David S. Miller <davem at davemloft.net>
Date: Wed Apr 23 19:37:58 2008 -0700
tun: Fix minor race in TUNSETLINK ioctl handling.
Noticed by Alan Cox.
The IFF_UP test is a bit racey, because other entities
outside of this driver's ioctl handler can modify that
state, even though this ioctl handler runs under
lock_kernel().
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8c0469cdd08df4dacabc8ca33256ce20de43d73f
Author: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Date: Wed Apr 23 18:54:01 2008 -0700
ppp_generic: use stats from net_device structure
Use stats which now is in the net_device instead of one declared in
ppp structure.
Kill ppp_net_stats function, because by default it is used identical
internal_stats function from net/core/dev.c
Signed-of-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9b98af3217ae6ad979075eb233a5e8a5c82f13ca
Author: Alek Du <alek.du at intel.com>
Date: Thu Apr 24 09:19:44 2008 +0800
PCI: Add Intel SCH PCI IDs
This patch adds Intel SCH chipsets (US15W, US15L, UL11L) PCI IDs, these
IDs will be used by following SCH driver patches.
Signed-off-by: Alek Du <alek.du at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at jbarnes-t61.(none)>
commit 099714934d80100624829f1e2961b9dccaef3280
Author: Roland Dreier <rdreier at cisco.com>
Date: Wed Apr 23 16:22:13 2008 -0700
iwlwifi: Don't unlock priv->mutex if it isn't locked
Commit b716bb91 ("iwlwifi: Cancel scanning upon association") moved the
test of priv->vif in iwl{3945,4964}_mac_config_interface() outside of
where priv->mutex is held, but still tries to do mutex_unlock() on
return. This is clearly wrong and triggers a nasty lockdep warning when
this codepath is triggered. Fix this by removing the mutex_unlock().
Signed-off-by: Roland Dreier <rolandd at cisco.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4d381ffb02701c3fc976091473aead7c03523133
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Wed Apr 23 22:10:29 2008 +0200
wireless: rndis_wlan: modparam_workaround_interval is never below 0.
priv->param_workaround_interval is unsigned, modparam_workaround_interval not.
the former is never < 0.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 8ba82e969f71d088f718f93d64985d5fcdd9c171
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Wed Apr 23 21:56:49 2008 +0200
prism54: prism54_get_encode() test below 0 on unsigned index
previously in this function:
u32 index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
index is unsigned, so if -1, the original test (below) didn't work.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d619ee08490ca78c9571dca133cd0d0527a60839
Author: Luis Carlos Cobo <luisca at cozybit.com>
Date: Wed Apr 23 12:34:59 2008 -0700
mac80211: update mesh EID values
This patch updates mesh EID values, some of which where conflicting with
already-approved 11h EIDs (pointed out by Tomas Winkler). I wanted to use the
values suggested in the last available 802.11 draft (2.0) but it assigns 50 to
MESH_CONFIG, the same value than EXT_SUPP_RATES. Using the values proposed in
the draft incremented by one.
Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 1033b3ea11820ea1fb1b877207bd6724e9aaedc3
Author: Michael Buesch <mb at bu3sch.de>
Date: Wed Apr 23 19:13:01 2008 +0200
b43: Workaround DMA quirks
Some mainboards/CPUs don't allow DMA masks bigger than a certain limit.
Some VIA crap^h^h^h^hdevices have an upper limit of 0xFFFFFFFF. So in this
case a 64-bit b43 device would always fail to acquire the mask.
Implement a workaround to fallback to lower DMA mask, as we can always
also support a lower mask.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 0da926f05748d273e7b2b673b0de21629ae9acdd
Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
Date: Wed Apr 23 13:45:12 2008 +0300
mac80211: fix use before check of Qdisc length
This patch fixes use of Qdisc length in requeue function, before we checked
the reference is valid. (Adrian Bunk's catch)
Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 13d8fd2d15fdd492078bedb9fde87c901a4e4df0
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Apr 23 12:51:28 2008 +0300
net/mac80211/rx.c: fix off-by-one
This patch fixes an off-by-one in net/mac80211/rx.c introduced by
commit 8318d78a44d49ac1edf2bdec7299de3617c4232e
(cfg80211 API for channels/bitrates, mac80211 and driver conversion)
and spotted by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 1ebebea8e844d01c80b93b8ee4d696ee7c0cbc27
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Wed Apr 23 11:47:15 2008 +0400
mac80211: Fix race between ieee80211_rx_bss_put and lookup routines.
The put routine first decrements the users counter and then
(if it is zero) locks the sta_bss_lock and removes one from
the list and the hash.
Thus, any of ieee80211_sta_config_auth, ieee80211_rx_bss_get
or ieee80211_rx_mesh_bss_get can race with it by finding a
bss that is about to get kfree-ed.
Using atomic_dec_and_lock in ieee80211_rx_bss_put takes care
of this race.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d1d8f44a4e3c730984283c0bf4b3458e3a88c15a
Author: Nick Kossifidis <mick at madwifi.org>
Date: Mon Apr 21 21:28:24 2008 +0300
ath5k: Fix radio identification on AR5424/2424
*Fix radio chip identification on AR5424/2424 during ath5k_hw_attach
*Try to assign an RF2413 radio on AR2424 for testing
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4503183aa32e6886400d82282292934fa64a81b0
Author: Larry Finger <Larry.Finger at lwfinger.net>
Date: Sat Apr 19 17:52:12 2008 +0200
ssb: Fix all-ones boardflags
In the SSB SPROM a field set to all ones means the value
is not defined in the SPROM.
In case of the boardflags, we need to set them to zero
to avoid confusing drivers. Drivers will only check the
flags by ANDing.
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Signed-off-by: Gabor Stefanik <netrolller.3d at gmail.com>
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 9fc38458355525f801cd2ab403ac89850489a05e
Author: Michael Buesch <mb at bu3sch.de>
Date: Sat Apr 19 16:53:00 2008 +0200
b43: Add more btcoexist workarounds
This adds more workarounds for devices with broken BT bits.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit a259d6a45b915e00e8c6085e35fea7b61e3008a8
Author: Michael Buesch <mb at bu3sch.de>
Date: Fri Apr 18 21:06:37 2008 +0200
b43: Fix HostFlags data types
The HostFlags are a bitmask of 48bit. So we must use an u64 datatype
to hold all bits.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 1855ba7812dbd294fcfc083dc7d3b14d3b1f38db
Author: Michael Buesch <mb at bu3sch.de>
Date: Fri Apr 18 20:51:41 2008 +0200
b43: Workaround invalid bluetooth settings
This adds a workaround for invalid bluetooth SPROM settings
on ASUS PCI cards.
This will stop the microcode from poking with the BT GPIO line.
This fixes data transmission on this device, as the BT GPIO line
is used for something TX related on this device
(probably the power amplifier or the radio).
This also adds a modparam knob to help debugging this in the future,
as more devices with this bug may show up.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 0f48d7e1cf2341148dcafc19a098ca22e184bee9
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Thu Apr 17 19:36:28 2008 +0200
mac80211: MAINTAINERS update
This updates the mac80211 maintainers entry to
 1) remove Jiri
2) put me first
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Cc: Michael Wu <flamingice at sourmilk.net>
Cc: Jiri Benc <jbenc at suse.cz>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit a46f025d053e47b9ce602f53f6d30e94d304a51c
Author: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
Date: Wed Apr 16 14:02:04 2008 -0700
mac80211: Fix n-band association problem
There are two structures named wmm_info and wmm_param, they are used while
parsing the beacon frame. (Check the function ieee802_11_parse_elems).
Certain APs like D-link does not set the fifth bit in WMM IE.
While sending the association request to n-only ap it checks for wmm_ie.
If it is set then only ieee80211_ht_cap is sent during association request.
So n-only association fails.
And this patch fixes this problem by copying the wmm_info to wmm_ie,
which enables the "wmm" flag in iee80211_send_assoc.
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
Acked-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4cfe02fabbb87108d7d06d2335429025ca84e616
Author: Jesper Juhl <jesper.juhl at gmail.com>
Date: Wed Apr 23 00:28:47 2008 +0200
PCI Express ASPM support should default to 'No'
Running 'make oldconfig' I just noticed that PCIEASPM defaults to
'y' in Kconfig even though the feature is both experimental and the
help text recommends that if you are unsure you say 'n'.
It seems to me that this really should default to 'n', not 'y' at the
moment.
The following patch makes that change. Please consider applying.
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 77f5492c43adb4eb351fa0d163136877e8b2ed92
Author: Richard Genoud <richard.genoud at gmail.com>
Date: Wed Apr 23 19:51:14 2008 +0200
[MTD] [NAND] Hardware ECC controller on at91sam9263 / at91sam9260
This is a patch to use the hardware ECC controller of
the AT91SAM9260 and AT91SAM9263 for the AT91 nand.
On AT91 NAND, there's now a choice between ECC soft,
ECC hard or no ECC (for debug).
It has been tested on AT91SAM9263 with 8 bits large
and small page NAND.
Signed-off-by: Richard Genoud <richard.genoud at gmail.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit ca456252db0521e5e88024fa2b67535e9739e030
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Apr 16 16:28:47 2008 -0400
knfsd: clear both setuid and setgid whenever a chown is done
Currently, knfsd only clears the setuid bit if the owner of a file is
changed on a SETATTR call, and only clears the setgid bit if the group
is changed. POSIX says this in the spec for chown():
"If the specified file is a regular file, one or more of the
S_IXUSR, S_IXGRP, or S_IXOTH bits of the file mode are set, and the
process does not have appropriate privileges, the set-user-ID
(S_ISUID) and set-group-ID (S_ISGID) bits of the file mode shall
be cleared upon successful return from chown()."
If I'm reading this correctly, then knfsd is doing this wrong. It should
be clearing both the setuid and setgid bit on any SETATTR that changes
the uid or gid. This wasn't really as noticable before, but now that the
ATTR_KILL_S*ID bits are a no-op for the NFS client, it's more evident.
This patch corrects the nfsd_setattr logic so that this occurs. It also
does a bit of cleanup to the function.
There is also one small behavioral change. If a SETATTR call comes in
that changes the uid/gid and the mode, then we now only clear the setgid
bit if the group execute bit isn't set. The setgid bit without a group
execute bit signifies mandatory locking and we likely don't want to
clear the bit in that case. Since there is no call in POSIX that should
generate a SETATTR call like this, then this should rarely happen, but
it's worth noting.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit dee3209d993f17081d2c58d6470dfc8d6662078b
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Apr 16 16:28:46 2008 -0400
knfsd: get rid of imode variable in nfsd_setattr
...it's not really needed.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 0dc220f0815497858db539d27947f3ec83202ace
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Mon Apr 14 12:27:52 2008 -0400
SUNRPC: Use unsigned loop and array index in svc_init_buffer()
Clean up: Suppress a harmless compiler warning.
Index rq_pages[] with an unsigned type. Make "pages" unsigned as well,
as it never represents a value less than zero.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 50c8bb13eaaf345caf2e7966667ba1d3e4d68af2
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Mon Apr 14 12:27:45 2008 -0400
SUNRPC: Use unsigned index when looping over arrays
Clean up: Suppress a harmless compiler warning in the RPC server related
to array indices.
ARRAY_SIZE() returns a size_t, so use unsigned type for a loop index when
looping over arrays.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit c0401ea008fb7c785a93428752d69dccafb127ec
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Mon Apr 14 12:27:30 2008 -0400
SUNRPC: Update RPC server's TCP record marker decoder
Clean up: Update the RPC server's TCP record marker decoder to match the
constructs used by the RPC client's TCP socket transport.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit b7872fe86db78cc96c85a13338ea6e3fe1aef610
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Mon Apr 14 12:27:01 2008 -0400
SUNRPC: RPC server still uses 2.4 method for disabling TCP Nagle
Use the 2.6 method for disabling TCP Nagle in the kernel's RPC server.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit f97c650dda24e48405399aa0676e90da52408515
Author: Jeff Layton <jlayton at redhat.com>
Date: Tue Apr 8 15:40:08 2008 -0400
NLM: don't let lockd exit on unexpected svc_recv errors (try #2)
When svc_recv returns an unexpected error, lockd will print a warning
and exit. This problematic for several reasons. In particular, it will
cause the reference counts for the thread to be wrong, and can lead to a
potential BUG() call.
Rather than exiting on error from svc_recv, have the thread do a 1s
sleep and then retry the loop. This is unlikely to cause any harm, and
if the error turns out to be something temporary then it may be able to
recover.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 06e02d66fa0055230efc2443c43ee4f3ab5eb0b6
Author: Jeff Layton <jlayton at redhat.com>
Date: Tue Apr 8 15:40:07 2008 -0400
NFS: don't let nfs_callback_svc exit on unexpected svc_recv errors (try #2)
When svc_recv returns an unexpected error, nfs_callback_svc will print a
warning and exit. This problematic for several reasons. In particular,
it will cause the reference counts for the thread to be wrong, and no
new thread will be started until all nfs4 mounts are unmounted.
Rather than exiting on error from svc_recv, have the thread do a 1s
sleep and then retry the loop. This is unlikely to cause any harm, and
if the error turns out to be something temporary then it may be able to
recover.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 9078dc08143e23b18ea72e70265f0df920cf2998
Author: Steven Whitehouse <swhiteho at redhat.com>
Date: Tue Apr 8 13:12:52 2008 +0100
Use a zero sized array for raw field in struct fid
The raw field's size can vary so we use a zero sized array since
gcc will not allow a variable sized array inside a union. This
has been tested with ext3 and gfs2 and relates to the bug
report: http://lkml.org/lkml/2007/10/24/374 and discussion
thread: http://lkml.org/lkml/2008/4/7/65
Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
Cc: Christoph Hellwig <hch at infradead.org>
Cc: Neil Brown <neilb at suse.de>
Cc: Adrian Bunk <bunk at kernel.org>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit ff7d9756b501744540be65e172d27ee321d86103
Author: Olga Kornievskaia <aglo at citi.umich.edu>
Date: Fri Mar 28 16:04:56 2008 -0400
nfsd: use static memory for callback program and stats
There's no need to dynamically allocate this memory, and doing so may
create the possibility of races on shutdown of the rpc client. (We've
witnessed it only after adding rpcsec_gss support to the server, after
which the rpc code can send destroys calls that expect to still be able
to access the rpc_stats structure after it has been destroyed.)
Such races are in theory possible if the module containing this "static"
memory is removed very quickly after an rpc client is destroyed, but
we haven't seen that happen.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 8774282c4cef82695ccca8bd09976de5d6e49610
Author: Jeff Layton <jlayton at redhat.com>
Date: Mon Apr 7 16:45:37 2008 -0400
SUNRPC: remove svc_create_thread()
Now that the nfs4 callback thread uses the kthread API, there are no
more users of svc_create_thread(). Remove it.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit e1ba1ab76e68de9f4a93fae8406627924efaed99
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Mon Apr 7 13:09:47 2008 -0400
nfsd: fix comment
Obvious comment nit.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 3c61eecb607dbc2777074b1a95b8a97e31a96a73
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Mon Apr 7 13:05:27 2008 -0400
lockd: Fix stale nlmsvc_unlink_block comment
As of 5996a298da43a03081e9ba2116983d173001c862 ("NLM: don't unlock on
cancel requests") we no longer unlock in this case, so the comment is no
longer accurate.
Thanks to Stuart Friedberg for pointing out the inconsistency.
Cc: Stuart Friedberg <sfriedberg at hp.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit a5ae03989254ec25cd3a934ca02c008d67e259f7
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Tue Apr 1 21:48:37 2008 -0400
NFSD: Strip __KERNEL__ testing from unexported header files.
Also, sort the Kbuild file.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 4ab4b0bedda7d41c63cef98cd5d6cabada460936
Author: Kevin Coffman <kwc at citi.umich.edu>
Date: Mon Mar 31 10:31:44 2008 -0400
sunrpc: make token header values less confusing
g_make_token_header() and g_token_size() add two too many, and
therefore their callers pass in "(logical_value - 2)" rather
than "logical_value" as hard-coded values which causes confusion.
This dates back to the original g_make_token_header which took an
optional token type (token_id) value and added it to the token.
This was removed, but the routine always adds room for the token_id
rather than not.
Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 5743d65c2f77d5145fb4c4262c4dd70c3f078776
Author: Kevin Coffman <kwc at citi.umich.edu>
Date: Mon Mar 31 10:31:33 2008 -0400
gss_krb5: consistently use unsigned for seqnum
Consistently use unsigned (u32 vs. s32) for seqnum.
In get_mic function, send the local copy of seq_send,
rather than the context version.
Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 1a448fdb3c5495405bc44d77ea676150f9195444
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Thu Mar 27 16:34:54 2008 -0400
NFSD: Remove NFSv4 dependency on NFSv3
Clean up: Because NFSD_V4 "depends on" NFSD_V3, it appears as a child of
the NFSD_V3 menu entry, and is not visible if NFSD_V3 is unselected.
Replace the dependency on NFSD_V3 with a "select NFSD_V3". This makes
NFSD_V4 look and work just like NFS_V3, while ensuring that NFSD_V3 is
enabled if NFSD_V4 is.
Sam Ravnborg adds:
"This use of select is questionable. In general it is bad to select
a symbol with dependencies.
In this case the dependencies of NFSD_V3 are duplicated for NFSD_V4
so we will not se erratic configurations but do you remember to
update NFSD_V4 when you add a depends on NFSD_V3?
But I see no other clean way to do it right now."
Later he said:
"My comment was more to say we have things to address in kconfig.
This is abuse in the acceptable range."
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 3329ba05231808c96cf9fd0598b8f46afec9777c
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Thu Mar 27 16:34:47 2008 -0400
SUNRPC: Remove PROC_FS dependency
Recently, commit 440bcc59 added a reverse dependency to fs/Kconfig to
ensure that PROC_FS was enabled if SUNRPC_GSS was enabled.
Apparently this isn't necessary because the auth_gss components under
net/sunrpc will build correctly even if PROC_FS is disabled, though
RPCSEC_GSS will not work without /proc.
It also violates the guideline in Documentation/kbuild/kconfig-language.txt
that states "In general use select only for non-visible symbols (no prompts
anywhere) and for symbols with no dependencies."
To address these issues, remove the dependency.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 6ffd4be6336f9c3f1a10822099587544cd0a11d7
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Thu Mar 27 16:34:40 2008 -0400
NFSD: Use "depends on" for PROC_FS dependency
Recently, commit 440bcc59 added a reverse dependency to fs/Kconfig to
ensure that PROC_FS was enabled if NFSD_V4 was enabled.
There is a guideline in Documentation/kbuild/kconfig-language.txt that
states "In general use select only for non-visible symbols (no prompts
anywhere) and for symbols with no dependencies."
A quick grep around other Kconfig files reveals that no entry currently
uses "select PROC_FS" -- every one uses "depends on". Thus CONFIG_NFSD_V4
should use "depends on PROC_FS" as well.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 03550fac06c4f0c39a1885d46015c28794413c82
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Fri Mar 14 17:51:12 2008 -0400
nfsd: move most of fh_verify to separate function
Move the code that actually parses the filehandle and looks up the
dentry and export to a separate function. This simplifies the reference
counting a little and moves fh_verify() a little closer to the kernel
ideal of small, minimally-indentended functions. Clean up a few other
minor style sins along the way.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
Cc: Neil Brown <neilb at suse.de>
commit c3bb257d2d3a1a4e49372b9d74eaebe0fcf110dd
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed Mar 12 14:04:25 2008 -0700
net/sunrpc/svc.c: suppress unintialized var warning
net/sunrpc/svc.c: In function '__svc_create_thread':
net/sunrpc/svc.c:587: warning: 'oldmask.bits[0u]' may be used uninitialized in this function
Cc: Neil Brown <neilb at suse.de>
Cc: Trond Myklebust <Trond.Myklebust at netapp.com>
Cc: David S. Miller <davem at davemloft.net>
Cc: Tom Tucker <tom at opengridcomputing.com>
Cc: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 30aef3166ab27f7bcb14c5e809205af8126fa10b
Author: Kevin Coffman <kwc at citi.umich.edu>
Date: Thu Feb 21 13:44:27 2008 -0500
Remove define for KRB5_CKSUM_LENGTH, which will become enctype-dependent
cleanup: When adding new encryption types, the checksum length
can be different for each enctype. Face the fact that the
current code only supports DES which has a checksum length of 8.
Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 3d4a6886786f839976c36e62303507692bf87d8d
Author: Kevin Coffman <kwc at citi.umich.edu>
Date: Thu Feb 21 13:44:12 2008 -0500
Correct grammer/typos in dprintks
cleanup: Fix grammer/typos to use "too" instead of "to"
Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 830bb59b6ece51c36dd456b685d145c69d3b7e1c
Author: Tom Tucker <tom at opengridcomputing.com>
Date: Tue Mar 11 12:44:27 2008 -0500
SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send
SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send
The svcrdma transport can crash if a send is waiting for an
empty SQ slot and the connection is closed due to an asynchronous error.
The crash is caused when svc_rdma_send attempts to send on a deleted
QP.
Signed-off-by: Tom Tucker <tom at opengridcomputing.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 9167f501c6b53492eb2566dd618ce7f55f2856d5
Author: Felix Blyakher <felixb at sgi.com>
Date: Tue Feb 26 10:54:36 2008 -0800
nfsd: initialize lease type in nfs4_open_delegation()
While lease is correctly checked by supplying the type argument to
vfs_setlease(), it's stored with fl_type uninitialized. This breaks the
logic when checking the type of the lease. The fix is to initialize
fl_type.
The old code still happened to function correctly since F_RDLCK is zero,
and we only implement read delegations currently (nor write
delegations). But that's no excuse for not fixing this.
Signed-off-by: Felix Blyakher <felixb at sgi.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit a3fa73bd0eea74c58315114c9fc3e913f6c26d61
Author: James Lentini <jlentini at netapp.com>
Date: Mon Feb 25 12:20:13 2008 -0500
Documentation: NFS/RDMA instructions for 2.6.25-rc1
Add some instructions for using the new NFS/RDMA features.
Signed-off-by: James Lentini <jlentini at netapp.com>
Cc: Roland Dreier <rdreier at cisco.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit a277e33cbe3fdfb9a77b448ea3043be22f000dfd
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Feb 20 08:55:30 2008 -0500
NFS: convert nfs4 callback thread to kthread API
There's a general push to convert kernel threads to use the (much
cleaner) kthread API. This patch converts the NFSv4 callback kernel
thread to the kthread API. In addition to being generally cleaner this
also removes the dependency on signals when shutting down the thread.
Note that this patch depends on the recent patches to svc_recv() to
make it check kthread_should_stop() periodically. Those patches are
in Bruce's tree at the moment and are slated for 2.6.26 along with
the lockd conversion, so this conversion is probably also appropriate
for 2.6.26.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Acked-by: Trond Myklebust <Trond.Myklebust at netapp.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 3ba1514815817f93a4f09615726dd4bcd0ddbbc9
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Feb 20 12:49:02 2008 -0800
nfsd: fix sparse warning in vfs.c
fs/nfsd/vfs.c:991:27: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit a254b246ee238ab90e7b3fae1f76875b608b2213
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Feb 20 12:49:00 2008 -0800
nfsd: fix sparse warnings
Add extern to nfsd/nfsd.h
fs/nfsd/nfssvc.c:146:5: warning: symbol 'nfsd_nrthreads' was not declared. Should it be static?
fs/nfsd/nfssvc.c:261:5: warning: symbol 'nfsd_nrpools' was not declared. Should it be static?
fs/nfsd/nfssvc.c:269:5: warning: symbol 'nfsd_get_nrthreads' was not declared. Should it be static?
fs/nfsd/nfssvc.c:281:5: warning: symbol 'nfsd_set_nrthreads' was not declared. Should it be static?
fs/nfsd/export.c:1534:23: warning: symbol 'nfs_exports_op' was not declared. Should it be static?
Add include of auth.h
fs/nfsd/auth.c:27:5: warning: symbol 'nfsd_setuser' was not declared. Should it be static?
Make static, move forward declaration closer to where it's needed.
fs/nfsd/nfs4state.c:1877:1: warning: symbol 'laundromat_main' was not declared. Should it be static?
Make static, forward declaration was already marked static.
fs/nfsd/nfs4idmap.c:206:1: warning: symbol 'idtoname_parse' was not declared. Should it be static?
fs/nfsd/vfs.c:1156:1: warning: symbol 'nfsd_create_setattr' was not declared. Should it be static?
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit d8421202121ce74daf4625ca9d1d825bbd7ce66a
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Wed Feb 20 15:40:15 2008 -0500
lockd: convert nsm_mutex to a spinlock
There's no reason for a mutex here, except to allow an allocation under
the lock, which we can avoid with the usual trick of preallocating
memory for the new object and freeing it if it turns out to be
unnecessary.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit a95e56e72c196970a8067cd515c658d064813170
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Wed Feb 20 15:27:31 2008 -0500
lockd: clean up __nsm_find()
Use list_for_each_entry(). Also, in keeping with kernel style, make the
normal case (kzalloc succeeds) unindented and handle the abnormal case
with a goto.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 164f98adbbd50c67177b096a59f55c1a56a45c82
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Wed Feb 20 14:02:47 2008 -0500
lockd: fix race in nlm_release()
The sm_count is decremented to zero but left on the nsm_handles list.
So in the space between decrementing sm_count and acquiring nsm_mutex,
it is possible for another task to find this nsm_handle, increment the
use count and then enter nsm_release itself.
Thus there's nothing to prevent the nsm being freed before we acquire
nsm_mutex here.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit dd35210e1e2cb46d6dba5c97f1bc3784c4f97998
Author: Harshula Jayasuriya <harshula at sgi.com>
Date: Wed Feb 20 10:56:56 2008 +1100
sunrpc: GSS integrity and decryption failures should return GARBAGE_ARGS
In function svcauth_gss_accept() (net/sunrpc/auth_gss/svcauth_gss.c) the
code that handles GSS integrity and decryption failures should be
returning GARBAGE_ARGS as specified in RFC 2203, sections 5.3.3.4.2 and
5.3.3.4.3.
Reviewed-by: Greg Banks <gnb at sgi.com>
Signed-off-by: Harshula Jayasuriya <harshula at sgi.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 93245d11fcaccdebccabe86a2b92db524f82d8b4
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Feb 18 02:01:49 2008 -0800
lockd: fix sparse warning in svcshare.c
fs/lockd/svcshare.c:74:50: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit f2b0dee2ec8d562ad9ced2b7481be72d356c6cfc
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Feb 13 23:30:26 2008 +0200
make nfsd_create_setattr() static
This patch makes the needlessly global nfsd_create_setattr() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 7b54fe61ffd5bfa4e50d371a2415225aa0cbb38e
Author: Jeff Layton <jlayton at redhat.com>
Date: Tue Feb 12 11:47:24 2008 -0500
SUNRPC: allow svc_recv to break out of 500ms sleep when alloc_page fails
svc_recv() calls alloc_page(), and if it fails it does a 500ms
uninterruptible sleep and then reattempts. There doesn't seem to be any
real reason for this to be uninterruptible, so change it to an
interruptible sleep. Also check for kthread_stop() and signalled() after
setting the task state to avoid races that might lead to sleeping after
kthread_stop() wakes up the task.
I've done some very basic smoke testing with this, but obviously it's
hard to test the actual changes since this all depends on an
alloc_page() call failing.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 6aaa67b5f3b9fe24f0c76d0415cc72e5a1137bea
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Mon Feb 11 17:12:38 2008 -0500
NFSD: Remove redundant "select" clauses in fs/Kconfig
As far as I can tell, selecting the CRYPTO and CRYPTO_MD5 entries under
CONFIG_NFSD is redundant, since CONFIG_NFSD_V4 already selects
RPCSEC_GSS_KRB5, which selects these entries.
Testing with "make menuconfig" shows that the entries under CRYPTO still
properly reflect "Y" or "M" based on the setting of CONFIG_NFSD after this
change is applied.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 78dd0992a3462e05138cf4d08df759bf1c7a08c9
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Mon Feb 11 17:12:31 2008 -0500
NFSD: Move "select NFSD_V2_ACL if NFSD_V3_ACL"
Clean up: since NFSD_V2_ACL is a boolean, it can be selected safely
under the NFSD_V3_ACL entry (also a boolean).
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 892069552eedfa0d2fca41680d076a5bc0a3c26e
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Mon Feb 11 17:12:24 2008 -0500
NFSD: Move "select FS_POSIX_ACL if NFSD_V4"
Clean up: since FS_POSIX_ACL is a non-visible boolean entry, it can be
selected safely under the NFSD_V4 entry (also a boolean).
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit d24455b5ffe02a652e8cb1ed2d3570a512c898f8
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Mon Feb 11 17:11:54 2008 -0500
NFSD: Update help text for CONFIG_NFSD
Clean up: refresh the help text for Kconfig items related to the NFS
server. Remove obsolete URLs, and make the language consistent among
the options.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 5ea0dd61f221ba2701314a85e998b8202412553d
Author: Chuck Lever <chuck.lever at oracle.com>
Date: Mon Feb 11 17:11:39 2008 -0500
NFSD: Remove NFSD_TCP kernel build option
Likewise, distros usually leave CONFIG_NFSD_TCP enabled.
TCP support in the Linux NFS server is stable enough that we can leave it
on always. CONFIG_NFSD_TCP adds about 10 lines of code, and defaults to
"Y" anyway.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit c0ce6ec87c59d7a29438717b1f72f83fb408f416
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Mon Feb 11 15:48:47 2008 -0500
nfsd: clarify readdir/mountpoint-crossing code
The code here is difficult to understand; attempt to clarify somewhat by
pulling out one of the more mystifying conditionals into a separate
function.
While we're here, also add lease_time to the list of attributes that we
don't really need to cross a mountpoint to fetch.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
Cc: Peter Staubach <staubach at redhat.com>
commit 67eb6ff610d50da231a37beb634d6dea4b5025ab
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Thu Jan 31 16:14:54 2008 -0500
svcrpc: move unused field from cache_deferred_req
This field is set once and never used; probably some artifact of an
earlier implementation idea.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 6a85fa3adddd3a74bd5b94c4b72668d307b88377
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Sat Jan 26 23:36:48 2008 -0500
nfsd4: kill unnecessary check in preprocess_stateid_op
This condition is always true.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 0836f587258c2a24bfdc8810ad2327e7f354b6c7
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Sat Jan 26 19:08:12 2008 -0500
nfsd4: simplify stateid sequencing checks
Pull this common code into a separate function.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit f3362737be14668f4e8f5c8d082eb131aafc1353
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Sat Jan 26 14:58:45 2008 -0500
nfsd4: remove unnecessary CHECK_FH check in preprocess_seqid_op
Every caller sets this flag, so it's meaningless.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 065f30ec14b1460c695b371bc44e068832a60d9b
Author: J. Bruce Fields <bfields at citi.umich.edu>
Date: Sat Jan 19 13:58:23 2008 -0500
nfs: remove unnecessary NFS_NEED_* defines
Thanks to Robert Day for pointing out that these two defines are unused.
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
Cc: Trond Myklebust <trond at netapp.com>Trond Myklebust <trond at netapp.com>
Cc: Neil Brown <neilb at suse.de>
Cc: "Robert P. J. Day" <rpjday at crashcourse.ca>
commit f15364bd4cf8799a7677b6daeed7b67d9139d974
Author: Aurélien Charbon <aurelien.charbon at ext.bull.net>
Date: Fri Jan 18 15:50:56 2008 +0100
IPv6 support for NFS server export caches
This adds IPv6 support to the interfaces that are used to express nfsd
exports. All addressed are stored internally as IPv6; backwards
compatibility is maintained using mapped addresses.
Thanks to Bruce Fields, Brian Haley, Neil Brown and Hideaki Joshifuji
for comments
Signed-off-by: Aurelien Charbon <aurelien.charbon at bull.net>
Cc: Neil Brown <neilb at suse.de>
Cc: Brian Haley <brian.haley at hp.com>
Cc: YOSHIFUJI Hideaki / å‰è—¤è‹±æ˜Ž <yoshfuji at linux-ipv6.org>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit d751a7cd0695554498f25d3026ca6710dbb3698f
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Feb 7 16:34:55 2008 -0500
NLM: Convert lockd to use kthreads
Have lockd_up start lockd using kthread_run. With this change,
lockd_down now blocks until lockd actually exits, so there's no longer
need for the waitqueue code at the end of lockd_down. This also means
that only one lockd can be running at a time which simplifies the code
within lockd's main loop.
This also adds a check for kthread_should_stop in the main loop of
nlmsvc_retry_blocked and after that function returns. There's no sense
continuing to retry blocks if lockd is coming down anyway.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 7086721f9c8b59331e164e534f588e075cfd9d3f
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Feb 7 16:34:54 2008 -0500
SUNRPC: have svc_recv() check kthread_should_stop()
When using kthreads that call into svc_recv, we want to make sure that
they do not block there for a long time when we're trying to take down
the kthread.
This patch changes svc_recv() to check kthread_should_stop() at the same
places that it checks to see if it's signalled(). Also check just before
svc_recv() tries to schedule(). By making sure that we check it just
after setting the task state we can avoid having to use any locking or
signalling to ensure it doesn't block for a long time.
There's still a chance of a 500ms sleep if alloc_page() fails, but
that should be a rare occurrence and isn't a terribly long time in
the context of a kthread being taken down.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 23d42ee278de1552d67daef5774ba59ff30925db
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Feb 7 16:34:53 2008 -0500
SUNRPC: export svc_sock_update_bufs
Needed since the plan is to not have a svc_create_thread helper and to
have current users of that function just call kthread_run directly.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Reviewed-by: NeilBrown <neilb at suse.de>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 1447d25eb3a7bbe5bf5e4e7489f09be13e1ec73a
Author: NeilBrown <neilb at suse.de>
Date: Fri Feb 8 13:03:37 2008 +1100
knfsd: Remove NLM_HOST_MAX and associated logic.
Lockd caches information about hosts that have recently held locks to
expedite the taking of further locks.
It periodically discards this information for hosts that have not been
used for a few minutes.
lockd currently has a value NLM_HOST_MAX, and changes the 'garbage
collection' behaviour when the number of hosts exceeds this threshold.
However its behaviour is strange, and likely not what was intended.
When the number of hosts exceeds the max, it scans *less* often (every
2 minutes vs every minute) and allows unused host information to
remain around longer (5 minutes instead of 2).
Having this limit is of dubious value anyway, and we have not
suffered from the code not getting the limit right, so remove the
limit altogether. We go with the larger values (discard 5 minute old
hosts every 2 minutes) as they are probably safer.
Maybe the periodic garbage collection should be replace to with
'shrinker' handler so we just respond to memory pressure....
Acked-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: J. Bruce Fields <bfields at citi.umich.edu>
commit 3dc5063786b273f1aee545844f6bd4e9651ebffe
Author: Christoph Lameter <clameter at sgi.com>
Date: Wed Apr 23 12:28:01 2008 -0700
slab_err: Pass parameters correctly to slab_bug
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 79c1cb7a8ca8f08cd78f7c5eebc85bbe937f5ad4
Merge: b0d19a378a409373244088511e889957645f2a44 97e7e0f71d6d948c25f11f0a33878d9356d9579e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 23 12:24:19 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[patch 7/7] vfs: mountinfo: show dominating group id
[patch 6/7] vfs: mountinfo: add /proc/<pid>/mountinfo
[patch 5/7] vfs: mountinfo: allow using process root
[patch 4/7] vfs: mountinfo: add mount peer group ID
[patch 3/7] vfs: mountinfo: add mount ID
[patch 2/7] vfs: mountinfo: add seq_file_root()
[patch 1/7] vfs: mountinfo: add dentry_path()
[PATCH] remove unused label in xattr.c (noise from ro-bind)
commit b0d19a378a409373244088511e889957645f2a44
Merge: 0093cb1199ec551f179562ca9fbd6f64fb750645 d7d313000ba2fc94a5383511a17ff38a39bab928
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Apr 23 12:23:45 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
iwlwifi: Fix built-in compilation of iwlcore
net: Unexport move_addr_to_{kernel,user}
rt2x00: Select LEDS_CLASS.
iwlwifi: Select LEDS_CLASS.
leds: Do not guard NEW_LEDS with HAS_IOMEM
[IPSEC]: Fix catch-22 with algorithm IDs above 31
time: Export set_normalized_timespec.
tcp: Make use of before macro in tcp_input.c
hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c
[NETNS]: Remove empty ->init callback.
[DCCP]: Convert do_gettimeofday() to getnstimeofday().
[NETNS]: Don't initialize err variable twice.
[NETNS]: The ip6_fib_timer can work with garbage on net namespace stop.
[IPV4]: Convert do_gettimeofday() to getnstimeofday().
[IPV4]: Make icmp_sk_init() static.
[IPV6]: Make struct ip6_prohibit_entry_template static.
tcp: Trivial fix to correct function name in a comment in net/ipv4/tcp.c
[NET]: Expose netdevice dev_id through sysfs
skbuff: fix missing kernel-doc notation
[ROSE]: Fix soft lockup wrt. rose_node_list_lock
commit 0093cb1199ec551f179562ca9fbd6f64fb750645
Author: Len Brown <len.brown at intel.com>
Date: Wed Apr 23 00:09:13 2008 -0400
pnpacpi: fix potential corruption on "pnpacpi: exceeded the max number of IRQ resources 2"
PNP_MAX_IRQ is 2
If a device invokes pnpacpi_parse_allocated_irqresource() 0, 1, or 2 times, we are happy.
The 3rd time, we will fail and print "pnpacpi: exceeded the max number of IRQ resources: 2"
The 4th and subsequent calls (if this ever happened) would silently scribble on
irq_resource[2], which doesn't actualy exist.
Found-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Len Brown <len.brown at intel.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 31d1e340f0e8d53804d737571b2f2bb28a74ecc5
Author: Roland Dreier <rolandd at cisco.com>
Date: Wed Apr 23 11:55:45 2008 -0700
RDMA/nes: Remove volatile qualifier from struct nes_hw_cq.cq_vbase
Remove the volatile qualifier from the cq_vbase member of struct
nes_hw_cq, and add an rmb() in the one place where it looks like
access order might make a difference. As usual, removing a volatile
qualifier in a declaration is actually a bug fix, since a volatile
qualifier is not sufficient to make sure that aggressively
out-of-order CPUs don't reorder things and cause incorrect results.
For example, a CPU might speculatively execute reads of other cqe
fields before the NIC hardware has written those fields and before it
has set the NES_CQE_VALID bit (even though those reads come after the
test of the NES_CQE_VALID bit in program order), but then when the CPU
actually executes the conditional test of the NES_CQE_VALID, the bit
has been set, and the CPU will proceed with the results of the earlier
speculative execution and end up using bogus data.
This also gets rid of the warning:
drivers/infiniband/hw/nes/nes_verbs.c: In function 'nes_destroy_cq':
drivers/infiniband/hw/nes/nes_verbs.c:1978: warning: passing argument 3 of 'pci_free_consistent' discards qualifiers from pointer target type
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit f5b3a096b138940f283907debe9bde6c6f40ebf3
Author: Vladimir Sokolovsky <vlad at mellanox.co.il>
Date: Wed Apr 23 11:55:45 2008 -0700
mlx4_core: CQ resizing should pass a 0 opcode modifier to MODIFY_CQ
The call to mlx4_MODIFY_CQ() had a typo so that mlx4_cq_resize() was
actually asking the FW to modify a CQ's interrupt moderation rather than
asking it to resize a CQ.
Signed-off-by: Vladimir Sokolovsky <vlad at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 6296883ca4cd52dafb45f191d24102e28ded38f2
Author: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Date: Wed Apr 23 11:55:45 2008 -0700
mlx4_core: Move kernel doorbell management into core
In addition to mlx4_ib, there will be ethernet and FC consumers of
mlx4_core, so move the code for managing kernel doorbells into the
core module to avoid having to duplicate this multiple times.
Signed-off-by: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 14fb05b3497351fbeb514381bcd227d84e115bd9
Author: Joachim Fenkes <fenkes at de.ibm.com>
Date: Wed Apr 23 11:55:45 2008 -0700
IB/ehca: Bump version number to 0026
Signed-off-by: Joachim Fenkes <fenkes at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 0455e36d81db76f5f4acb68a820da43adfa7ccec
Author: Joachim Fenkes <fenkes at de.ibm.com>
Date: Wed Apr 23 11:55:45 2008 -0700
IB/ehca: Make some module parameters bool, update descriptions
Signed-off-by: Joachim Fenkes <fenkes at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit a7607c9b1112b498c3044c9e5bc68fdb4985f93e
Author: Joachim Fenkes <fenkes at de.ibm.com>
Date: Wed Apr 23 11:55:45 2008 -0700
IB/ehca: Remove mr_largepage parameter
Always enable large page support; didn't seem to cause problems for anyone.
Signed-off-by: Joachim Fenkes <fenkes at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 4da27d6d5b92c8fe4b3a3e5bcf42606d9e4a6fc8
Author: Joachim Fenkes <fenkes at de.ibm.com>
Date: Wed Apr 23 11:55:45 2008 -0700
IB/ehca: Move high-volume debug output to higher debug levels
Signed-off-by: Joachim Fenkes <fenkes at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 863fb09fbf1eb74f56ea02184a62165056aa29cb
Author: Joachim Fenkes <fenkes at de.ibm.com>
Date: Wed Apr 23 11:55:45 2008 -0700
IB/ehca: Prevent posting of SQ WQEs if QP not in RTS
...as required by IB Spec, C10-29.
Signed-off-by: Joachim Fenkes <fenkes at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit bc7b3a36ba02e4053ca38653e6a753082d9add03
Author: Shirley Ma <mashirle at us.ibm.com>
Date: Wed Apr 23 11:55:45 2008 -0700
IPoIB: Handle 4K IB MTU for UD (datagram) mode
This patch enables IPoIB to use 4K UD messages (when the underlying
device and fabrics support a 4K MTU) by using two scatter buffers when
PAGE_SIZE is less than or equal to thhe HCA IB MTU size. The first
buffer is for IPoIB header + GRH header, and the second buffer is the
IPoIB payload, which is 4K-4.
Signed-off-by: Shirley Ma <xma at us.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit bc5698f3ecc9587e1edb343a2878f8d228c49e0e
Author: Chien Tung <ctung at neteffect.com>
Date: Wed Apr 23 11:55:45 2008 -0700
RDMA/nes: Fix adapter reset after PXE boot
After PXE boot, the iw_nes driver does a full reset to ensure the card
is in a clean state. However, it doesn't wait for firmware to
complete its work before issuing a port reset to enable the ports,
which leads to problems bringing up the ports.
The solution is to wait for firmware to complete its work before
proceeding with port reset.
This bug was flagged by Roland Dreier <rolandd at cisco.com>.
Cc: <stable at kernel.org>
Signed-off-by: Chien Tung <ctung at neteffect.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit e447703123d817b3f802c6eb69171d5342c8832e
Author: Roland Dreier <rolandd at cisco.com>
Date: Wed Apr 23 11:55:43 2008 -0700
RDMA/nes: Print IPv4 addresses in a readable format
Use NIPQUAD_FMT instead of printing raw 32-bit hex quantities in
debugging output.
Acked-by: Glenn Streiff <gstreiff at neteffect.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 2bd01c5d2ed04838d50548cb7b955505a20ac0bd
Author: Roland Dreier <rolandd at cisco.com>
Date: Wed Apr 23 11:52:18 2008 -0700
RDMA/nes: Use print_mac() to format ethernet addresses for printing
Removing open-coded MAC formats shrinks the source and the generated
code too, eg on x86-64:
add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-103 (-103)
function old new delta
make_cm_node 932 912 -20
nes_netdev_set_mac_address 427 406 -21
nes_netdev_set_multicast_list 1148 1124 -24
nes_probe 2349 2311 -38
Acked-by: Glenn Streiff <gstreiff at neteffect.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 2c61cb250cf7e8cdd3b83b79b76d2ea0b3da010a
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Wed Apr 23 16:43:15 2008 +0100
[JFFS2] Introduce dbg_readinode2 log level, use it to shut read_dnode() up
We haven't seen bugs in this for a while now, since the rewrite. No need
to be _quite_ so verbose...
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 422b120238130307da64fa44c9fb722bfaf5f1af
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Wed Apr 23 15:40:52 2008 +0100
[JFFS2] Fix jffs2_reserve_space() when all blocks are pending erasure.
When _all_ the blocks were on the erase_pending_list, we could't find a
block to GC from but there was no _actually_ free space, and
jffs2_reserve_space() would get a little unhappy.
Handle this case by returning -EAGAIN from jffs2_garbage_collect_pass().
There are two callers of that function -- jffs2_flush_wbuf_gc(), which
will interpret it as an error and flush the writebuffer by other means,
and jffs2_reserve_space(), which we modify to respond to -EAGAIN with an
immediate call to jffs2_erase_pending_blocks() and another run round the
loop.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit e2bc322bf05936ec7160d62bc3fd45cbf4aa405a
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Wed Apr 23 14:15:24 2008 +0100
[JFFS2] Add erase_checking_list to hold blocks being marked.
Just to keep the debug code happy when it's adding all the blocks up.
Otherwise, they disappear for a while while the locks are dropped to
check them and write the cleanmarker.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit d7d313000ba2fc94a5383511a17ff38a39bab928
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Wed Apr 23 03:48:57 2008 -0700
iwlwifi: Fix built-in compilation of iwlcore
This patch fixes problem in Makefile that prevented
built-in compilation of iwlcore
Commit that caused this problem: eadd3c4b ("iwlwifi: make Makefile
more concise")
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Yi Zhu <yi.zhu at intel.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit cd58f2a96ba95fb5b69580784bc6f7179001869c
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Apr 23 03:37:49 2008 -0700
net: Unexport move_addr_to_{kernel,user}
After the removal of the Solaris binary emulation the exports of
move_addr_to_{kernel,user} are no longer used.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 201410ce85d80b7b893cdc72e944a1341dd393f1
Author: David S. Miller <davem at davemloft.net>
Date: Wed Apr 23 03:34:50 2008 -0700
rt2x00: Select LEDS_CLASS.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e82404ad612ebabc65d15c3d59b971cb35c3ff36
Author: David S. Miller <davem at davemloft.net>
Date: Wed Apr 23 03:34:31 2008 -0700
iwlwifi: Select LEDS_CLASS.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 00713e224e718b350cb0148184dc7884885d00b9
Author: David S. Miller <davem at davemloft.net>
Date: Wed Apr 23 03:33:32 2008 -0700
leds: Do not guard NEW_LEDS with HAS_IOMEM
The LEDS infrastructure itself does not require anything
that a platform dependant upon HAS_IOMEM.
The individual drivers do, but they are properly guarded
with the necessary platform dependencies.
One can even imagine a hypervisor based LED driver that
a platform without HAS_IOMEM might have.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 697fa9721cbc54ce1604dae09d1be6bb918567f6
Author: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Date: Wed Apr 23 13:43:21 2008 +0300
UBI: add a message
UBI scan takes quite a time on some systems, so it is nice
to print a message that we started attaching an MTD device.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 8a0f572397ca0673c65c1662946014bb73b5cdc6
Author: Anders Grafström <grfstrm at users.sourceforge.net>
Date: Wed Mar 12 20:29:23 2008 +0100
[JFFS2] Return values of jffs2_block_check_erase error paths
It looks the error paths in jffs2_block_check_erase() have wrong return
values. A block that failed to be erased never gets marked as bad.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit e43fe686e48835ca027559a068bbe0b6d264a254
Merge: 986ee0139a91ab8b6b07d29d7a112c8033b5f8e0 434b825e1fc9ef7971fc962734278ffbab36a1ab
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Wed Apr 23 09:57:25 2008 +0100
Merge git://git.infradead.org/~dedekind/ubi-2.6
commit 986ee0139a91ab8b6b07d29d7a112c8033b5f8e0
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Wed Apr 23 09:39:49 2008 +0100
[MTD] Clean up AR7 partition map support
drivers/mtd/ar7part.c: In function ‘create_mtd_partitions’:
drivers/mtd/ar7part.c:69: warning: passing argument 4 of ‘master->read’ from incompatible pointer type
drivers/mtd/ar7part.c:91: warning: passing argument 4 of ‘master->read’ from incompatible pointer type
drivers/mtd/ar7part.c:99: warning: passing argument 4 of ‘master->read’ from incompatible pointer type
drivers/mtd/ar7part.c:110: warning: passing argument 4 of ‘master->read’ from incompatible pointer type
drivers/mtd/ar7part.c:111: error: ‘SQUASHFS_MAGIC’ undeclared (first use in this function)
drivers/mtd/ar7part.c:111: error: (Each undeclared identifier is reported only once
drivers/mtd/ar7part.c:111: error: for each function it appears in.)
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 97e7e0f71d6d948c25f11f0a33878d9356d9579e
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Thu Mar 27 13:06:26 2008 +0100
[patch 7/7] vfs: mountinfo: show dominating group id
Show peer group ID of nearest dominating group that has intersection
with the mount's namespace.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 2d4d4864ac08caff5c204a752bd004eed4f08760
Author: Ram Pai <linuxram at us.ibm.com>
Date: Thu Mar 27 13:06:25 2008 +0100
[patch 6/7] vfs: mountinfo: add /proc/<pid>/mountinfo
[mszeredi at suse.cz] rewrite and split big patch into managable chunks
/proc/mounts in its current form lacks important information:
- propagation state
- root of mount for bind mounts
- the st_dev value used within the filesystem
- identifier for each mount and it's parent
It also suffers from the following problems:
- not easily extendable
- ambiguity of mountpoints within a chrooted environment
- doesn't distinguish between filesystem dependent and independent options
- doesn't distinguish between per mount and per super block options
This patch introduces /proc/<pid>/mountinfo which attempts to address
all these deficiencies.
Code shared between /proc/<pid>/mounts and /proc/<pid>/mountinfo is
extracted into separate functions.
Thanks to Al Viro for the help in getting the design right.
Signed-off-by: Ram Pai <linuxram at us.ibm.com>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit a1a2c409b666befc58c2db9c7fbddf200f153470
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Thu Mar 27 13:06:24 2008 +0100
[patch 5/7] vfs: mountinfo: allow using process root
Allow /proc/<pid>/mountinfo to use the root of <pid> to calculate
mountpoints.
- move definition of 'struct proc_mounts' to <linux/mnt_namespace.h>
- add the process's namespace and root to this structure
- pass a pointer to 'struct proc_mounts' into seq_operations
In addition the following cleanups are made:
- use a common open function for /proc/<pid>/{mounts,mountstat}
- surround namespace.c part of these proc files with #ifdef CONFIG_PROC_FS
- make the seq_operations structures const
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 719f5d7f0b90ac2c8f8ca4232eb322b266fea01e
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Thu Mar 27 13:06:23 2008 +0100
[patch 4/7] vfs: mountinfo: add mount peer group ID
Add a unique ID to each peer group using the IDR infrastructure. The
identifiers are reused after the peer group dissolves.
The IDR structures are protected by holding namepspace_sem for write
while allocating or deallocating IDs.
IDs are allocated when a previously unshared vfsmount becomes the
first member of a peer group. When a new member is added to an
existing group, the ID is copied from one of the old members.
IDs are freed when the last member of a peer group is unshared.
Setting the MNT_SHARED flag on members of a subtree is done as a
separate step, after all the IDs have been allocated. This way an
allocation failure can be cleaned up easilty, without affecting the
propagation state.
Based on design sketch by Al Viro.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 73cd49ecdde92fdce131938bdaff4993010d181b
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Mar 26 22:11:34 2008 +0100
[patch 3/7] vfs: mountinfo: add mount ID
Add a unique ID to each vfsmount using the IDR infrastructure. The
identifiers are reused after the vfsmount is freed.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 9d1bc60138977d9c79471b344a64f2df13b2ccef
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Thu Mar 27 13:06:21 2008 +0100
[patch 2/7] vfs: mountinfo: add seq_file_root()
Add a new function:
seq_file_root()
This is similar to seq_path(), but calculates the path relative to the
given root, instead of current->fs->root. If the path was unreachable
from root, then modify the root parameter to reflect this.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 6092d048183b76bfa3f84b32f8158dd8d10bd811
Author: Ram Pai <linuxram at us.ibm.com>
Date: Thu Mar 27 13:06:20 2008 +0100
[patch 1/7] vfs: mountinfo: add dentry_path()
[mszeredi at suse.cz] split big patch into managable chunks
Add the following functions:
dentry_path()
seq_dentry()
These are similar to d_path() and seq_path(). But instead of
calculating the path within a mount namespace, they calculate the path
from the root of the filesystem to a given dentry, ignoring mounts
completely.
Signed-off-by: Ram Pai <linuxram at us.ibm.com>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 934b25c597c0e98304a7eaec198a87e4633a42bb
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Wed Apr 23 00:04:04 2008 -0400
[PATCH] remove unused label in xattr.c (noise from ro-bind)
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit cca97b81564c5edbc8700ebb64fc2b4e13dfa51f
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:44 2008 +0400
ACPICA: Fix for some local named nodes not marked temporary and to disallow duplicates
Fixed a problem with the CreateField, CreateXXXField (Bit, Byte,
Word, Dword, Qword), Field, BankField, and IndexField operators
when invoked from inside an executing control method. In this case,
these operators created namespace nodes that were incorrectly
left marked as permanent nodes instead of temporary nodes. This
could cause a problem if there is race condition between an
exiting control method and a running namespace walk. (Reported
by Linn Crosetto). Fixed a problem where the CreateField and
CreateXXXField operators would incorrectly allow duplicate names
(the name of the field) with no exception generated.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 66e2c0bcc5f6b8454d9091f6ba9ef4090abca4fd
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:44 2008 +0400
ACPICA: Update version to 20080321
Update version to 20080321.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 514d18d79b1da052ed4553ceec1f7e1197a5bb51
Author: Zhang Rui <rui.zhang at intel.com>
Date: Thu Apr 10 19:06:44 2008 +0400
ACPICA: Update for new Notify values
Implemented several changes for Notify handling: Added support
for new Notify values (ACPI 2.0+) and improved the Notify debug
output. Notify on PowerResource objects is no longer allowed,
as per the ACPI specification.
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1a3a4c7130d6f39b56efc259d653f6dec4990ea3
Author: Sonic Zhang <sonic.zhang at analog.com>
Date: Wed Apr 23 09:43:20 2008 +0800
Blackfin Serial Driver: Fix bug - kernel hangs when accessing uart 0 on bf537 when booting u-boot and linux on uart 1
Wait only when this UART is enabled.
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3995
Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 0c44a86d9e19021b38a7d7835f25210ef74b2612
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Thu Apr 24 04:56:02 2008 +0800
Blackfin Serial Driver: punt unused lsr variable
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 94bc891b00e40cbec375feb4568780af183fd7f4
Merge: 934b7024f0ed29003c95cef447d92737ab86dc4f 1ec7f1ddbe5ba49f7b10c3b129d6d5c90c43526c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 22 18:27:56 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()
[PATCH] proc_readfd_common() race fix
[PATCH] double-free of inode on alloc_file() failure exit in create_write_pipe()
[PATCH] teach seq_file to discard entries
[PATCH] umount_tree() will unhash everything itself
[PATCH] get rid of more nameidata passing in namespace.c
[PATCH] switch a bunch of LSM hooks from nameidata to path
[PATCH] lock exclusively in collect_mounts() and drop_collected_mounts()
[PATCH] move a bunch of declarations to fs/internal.h
commit 934b7024f0ed29003c95cef447d92737ab86dc4f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 22 18:16:30 2008 -0700
Fix cardbus resource allocation
Commit 884525655d07fdee9245716b998ecdc45cdd8007 ("PCI: clean up resource
alignment management") didn't set the alignment information for the
cardbus window resources, causing their subsequent allocations to fail
miserably with a message like
yenta_cardbus 0000:15:00.0: device not available because of BAR 7 [100:1ff] collisions
yenta_cardbus: probe of 0000:15:00.0 failed with error -16
or similar.
This fixes it and clarifies the code a bit too (we used to have to use
the insane PCI bridge alignment logic that put the alignment in the
"start" field, this makes it use the slightly easier-to-understand
size-based alignment, and allows us to set the resource start to zero
until it gets allocated).
Reported-and-tested-by: Jeff Chua <jeff.chua.linux at gmail.com>
Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 29591b92e19f409d5ad4c099c2b7b5ea56f50dfa
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date: Tue Apr 22 22:57:50 2008 +0200
bus_remove_device: be more careful about incomplete initialization
Prevent bus_remove_device() from crashing if dev->knode_bus has not been
initialized before it's called.
This can happen if the device_add() ended up breaking out early due to
an error, for example.
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fe224668dff97dd8899bd559d1608cc9285db67b
Author: Thomas Kunze <thommycheck at gmx.de>
Date: Wed Apr 23 01:40:52 2008 +0200
[MTD] [NOR] Fix Intel CFI driver for collie flash
collie seems to contain LH28F640BF flash chips. According to
http://sharp-world.com/products/device/flash/pdf/*FUM00701*@E.pdf
(page 83) if they have 0x51 of Extended Query Table (number of hardware
partitions) set to zero, they have a single fixed partition.
This patch makes those chips work.
Signed-off-by: Thomas Kunze <thommycheck at gmx.de>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 19e56ceae7cb1833ffd806038c19477b2c265f9f
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Wed Apr 23 01:26:12 2008 +0100
[JFFS2] Finally remove redundant ref->__totlen field.
Haven't had any complaints about it recently, despite having the test
code enabled to verify that the calculated length is correct.
Kill it off, just by #undef TEST_TOTLEN for now; removing it for real
can come a little later.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 27e6b8e388fffb332476ddab00bbe05cd5da5f32
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Wed Apr 23 01:25:33 2008 +0100
[JFFS2] Honour TEST_TOTLEN macro in debugging code. ref->__totlen is going!
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 85a62db6245a82f07a31b387915ee2180b9ea11a
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Wed Apr 23 01:17:51 2008 +0100
[JFFS2] Add paranoia debugging for superblock counts
The problem fixed in commit 014b164e1392a166fe96e003d2f0e7ad2e2a0bb7
(space leak with in-band cleanmarkers) would have been caught a lot
quicker if our paranoid debugging mode had included adding up the size
counts from all the eraseblocks and comparing the totals with the counts
in the superblock. Add that.
Make jffs2_mark_erased_block() file the newly-erased block on the
free_list before calling the debug function, to make it happy.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 08119e8966e993993d0ba92b2fba38c582c8f787
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date: Wed Apr 23 00:48:23 2008 +0200
Relax check on adding children of suspended devices
Do not refuse to actually register children of suspended devices,
but still warn about attempts to do that.
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1ec7f1ddbe5ba49f7b10c3b129d6d5c90c43526c
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Tue Apr 22 05:35:42 2008 -0400
[PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()
The only reason to have separated __...() for those was to keep them inlined
for local users in exit.c. Since Alexey removed the inline on those, there's
no reason whatsoever to keep them around; just collapse with normal variants.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 9b4f526cdc0f95f635607dfba6ac788b3deca188
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Tue Apr 22 01:32:44 2008 -0400
[PATCH] proc_readfd_common() race fix
Since we drop the rcu_read_lock inside the loop, we can't assume
that files->fdt will remain unchanged (and not freed) between
iterations.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit ed1524371716466e9c762808b02601d0d0276a92
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Tue Apr 22 19:51:27 2008 -0400
[PATCH] double-free of inode on alloc_file() failure exit in create_write_pipe()
Duh... Fortunately, the bug is quite recent (post-2.6.25) and, embarrassingly,
mine ;-/
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit aca239b793a4006db0d92ad0e43846ab6b54d816
Merge: 16abef0e9e79643827fd5a2a14a07bced851ae72 2c2b94f93f4732c3b9703ce62627e6187e7d6128
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 22 16:47:54 2008 -0700
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl
[IA64] run rest drivers/misc/sgi-xp through scripts/Lindent
[IA64] run some drivers/misc/sgi-xp through scripts/Lindent
[IA64] move XP and XPC to drivers/misc/sgi-xp
[IA64] minor irq handler cleanups
[IA64] simplify notify hooks in mca.c
[IA64] do notify DIE_MCA_MONARCH_PROCESS for each monarchs
[IA64] disable interrupts on exit of ia64_trace_syscall
commit 66d3ca9ea28e1b3d591083772fd797b9b46410b8
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:44 2008 +0400
ACPICA: Fixes for size of StartDependent resource descriptor
Fixed a couple of size calculation issues with the variable-length
Start Dependent resource descriptor.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit d8846574ed4a81be319bf68728f9cca9af595afd
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:43 2008 +0400
ACPICA: Updates for Debug object output
Implemented several improvements for the output of the ASL "Debug"
object to clarify and keep all data for a given object on one
output line.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit cd0b2248241f4146152fb04a6bf4bccb6ce0478a
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:43 2008 +0400
ACPICA: Fixes for external Reference Objects
All Reference Objects returned via the AcpiEvaluteObject interface
are now marked as type "REFERENCE" instead of "ANY". The type ANY
is now reservered for NULL objects - either NULL package elements
or unresolved named references.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 014b164e1392a166fe96e003d2f0e7ad2e2a0bb7
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Tue Apr 22 23:54:38 2008 +0100
[JFFS2] Fix free space leak with in-band cleanmarkers
We were accounting for the cleanmarker by calling jffs2_link_node_ref()
(without locking!), which adjusted both superblock and per-eraseblock
accounting, subtracting the size of the cleanmarker from {jeb,c}->free_size
and adding it to {jeb,c}->used_size.
But only _then_ were we adding the size of the newly-erased block back
to the superblock counts, and we were adding each of jeb->{free,used}_size
to the corresponding superblock counts. Thus, the size of the cleanmarker
was effectively subtracted from the superblock's free_size _twice_.
Fix this, by always adding a full eraseblock size to c->free_size when
we've erased a block. And call jffs2_link_node_ref() under the proper
lock, while we're at it.
Thanks to Alexander Yurchenko and/or Damir Shayhutdinov for (almost)
pinpointing the problem.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit cf9d1e428cc28ef5798aeda0822a6ce64849a439
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Tue Apr 22 23:53:26 2008 +0100
[JFFS2] Self-sufficient #includes in jffs2_fs_i.h: include <linux/mutex.h>
... instead of <linux/semaphore.h> which we don't need any more anyway.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 16abef0e9e79643827fd5a2a14a07bced851ae72
Author: David Sterba <dsterba at suse.cz>
Date: Tue Apr 22 15:09:22 2008 +0200
fs: use loff_t type instead of long long
Use offset type consistently.
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e199ceee15c8f8652cc3bb97651bdf246ba23c5f
Merge: b24a31442e2ff66053ae4f76e9c69c557d59c7d1 618442509128fe4514be94de70ce54075cd9a706
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 22 15:15:48 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
SELinux fixups needed for preemptable RCU from -rt
SELinux: no BUG_ON(!ss_initialized) in selinux_clone_mnt_opts
commit 2c2b94f93f4732c3b9703ce62627e6187e7d6128
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Apr 22 14:50:17 2008 -0500
[IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl
Addressed issues raised by scripts/checkpatch.pl. Removed unnecessary curly
braces. Eliminated uses of volatiles and use of kernel_thread() and daemonize().
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 35190506b1a18eda7df24b285fdcd94dec7800ef
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Apr 22 14:48:55 2008 -0500
[IA64] run rest drivers/misc/sgi-xp through scripts/Lindent
Ran patches through scripts/Lindent (part 2).
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 4a3ad2ddc0b920cd3ead84b0c67599be02d689ca
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Apr 22 14:48:01 2008 -0500
[IA64] run some drivers/misc/sgi-xp through scripts/Lindent
Ran patches through scripts/Lindent (part 1).
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 45d9ca492e4bd1522d1b5bd125c2908f1cee3d4a
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Apr 22 14:46:56 2008 -0500
[IA64] move XP and XPC to drivers/misc/sgi-xp
Move XPC and XPNET from arch/ia64/sn/kernel to drivers/misc/sgi-xp.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit b24a31442e2ff66053ae4f76e9c69c557d59c7d1
Merge: 73486722b70a83bba17be722677519b0855abedf add8eda7f2be781af0224241e870715cf0cfd75a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 22 13:59:30 2008 -0700
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Fix platform driver hotplug/coldplug
i2c: New driver for the SuperH Mobile I2C bus controller
i2c/scx200_acb: Don't use 0 as NULL pointer
i2c-bfin-twi: Fix mismatch in add timer and delete timer
i2c-bfin-twi: Just let i2c-bfin-twi driver depends on BLACKFIN
i2c-bfin-twi: Use simpler comment headers and strip out information that is maintained in the scm's log
i2c-bfin-twi: Cleanup driver descriptions, versions and some module useful information
i2c-bfin-twi: Add missing pin mux operation
i2c-bfin-twi: Add platform_resource interface to support multi-port TWI controllers
i2c-bfin-twi: Add repeat start feature to avoid break of a bundle of i2c master xfer operation
i2c: Remove trailing whitespaces in busses/Kconfig
i2c: Replace remaining __FUNCTION__ occurrences
i2c: Renesas SH7760 I2C master driver
i2c-dev: Split i2cdev_ioctl
i2c-ibm_iic: Support building as an of_platform driver
i2c-ibm_iic: Change the log levels
i2c: Add platform driver on top of the new pca-algorithm
i2c-algo-pca: Extend for future drivers
i2c-algo-pca: Remove trailing whitespaces and unnecessary UTF
i2c: Remove the algorithm drivers from the config menu
commit 73486722b70a83bba17be722677519b0855abedf
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Tue Apr 22 10:07:22 2008 -0700
kernel-doc: fix sched.c missing parameter
Add missing kernel-doc in kernel/sched.c:
Warning(linux-2.6.25-git3//kernel/sched.c:7044): No description found for parameter 'span'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 03b883840c630c7b571690577809754739ac773f
Merge: 0d07a15bdb5a4ea6271b6e874d307c48151ef546 c1c76743e98346eb052b707f0e054377a09441d1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 22 13:44:23 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: linux/{dlm,dlm_device}.h: cleanup for userspace
dlm: common max length definitions
dlm: move plock code from gfs2
dlm: recover nodes that are removed and re-added
dlm: save master info after failed no-queue request
dlm: make dlm_print_rsb() static
dlm: match signedness between dlm_config_info and cluster_set
commit 0d07a15bdb5a4ea6271b6e874d307c48151ef546
Merge: 62429f434091586d54b37b8dd46076e7c08b27b9 efa0f16b0d0e87ffbef311785fed0815b0240f46
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 22 13:43:46 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Suppress hidinput for Samsung IR control
HID: remove 60x GTCO devices from blacklist
HID: export headers properly
HID: WiseGroup 866 Dual Joypad needs output reports quirk
HID: ThrustMaster FF driver is no longer experimental
HID: Logitech diNovo Mini pad support
HID: fix race between open() and disconnect() in usbhid
HID: make hid_input_field and usbhid_modify_dquirk static
HID: pass numbered reports properly to hidraw
HID: fix misplaced rdesc quirk
HID: force feedback driver for Logitech Rumblepad 2
HID: move wait from hid to usbhid
HID: make function from dbg_hid
HID: fix sparse warnings
HID: only dump report traffic with debug level 2
HID: patch to add NOGET for DMI/Acomdata
HID: Sunplus Wireless Desktop needs report descriptor fixup
HID: quirk for MS Wireless Desktop Receiver (model 1028)
HID: fixup fullspeed interval on highspeed Afatech DVB-T IR kbd
HID: fix build failure in hiddev_ioctl with gcc 3.2
commit ed8165c75e3dd0b2e51b92a858cabe29ba00c9cb
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Apr 14 14:58:58 2008 +0100
[MTD] [NAND] Verify probe by retrying to checking the results match
With modern systems using bus-hold instead of bus pull-up, it can
often lead to erroneous reporting of NAND devices where there are
none. Do a double probe to ensure that the result we got the first
time is repeatable, and if it is not then return that there is no
chip there.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 37e5ffa3f15bd9a8b133ab13e9bef833b5eb33d4
Author: Ben Dooks <ben-mtd at fluff.org>
Date: Tue Apr 15 11:36:22 2008 +0100
[MTD] [NAND] S3C2410 Allow ECC disable to be specified by the board
Add support to disable ECC checking for a given chip
when passed by the board via the platform data.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 1c21ab67b7d3c9a1296019939e0efb69350487cf
Author: Ben Dooks <ben-mtd at fluff.org>
Date: Tue Apr 15 11:36:21 2008 +0100
[MTD] [NAND] S3C2410 Allow ECC layout to be passed through platform data
Add support for the ECC layout to be passed via the
platform data specified by the board.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit c45c6c68333c04de84c21a4b869f36a96f642779
Author: Ben Dooks <ben-mtd at fluff.org>
Date: Tue Apr 15 11:36:20 2008 +0100
[MTD] [NAND] S3C2410 Allow unset ecc to be ignored for ecc correction
If a block's ecc field is all 0xff, then ignore the ECC
correction. This is for systems where some of the blocks,
such as the initial cramfs are written without ECC and
need to be loaded on start.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 62429f434091586d54b37b8dd46076e7c08b27b9
Merge: 26defe34e48e18b058b773f60467729c64917490 f845fced913b1437659bb5baf187698547697afe
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Apr 22 13:40:47 2008 -0700
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: (41 commits)
udf: use crc_itu_t from lib instead of udf_crc
udf: Fix compilation warnings when UDF debug is on
udf: Fix bug in VAT mapping code
udf: Add read-only support for 2.50 UDF media
udf: Fix handling of multisession media
udf: Mount filesystem read-only if it has pseudooverwrite partition
udf: Handle VAT packed inside inode properly
udf: Allow loading of VAT inode
udf: Fix detection of VAT version
udf: Silence warning about accesses beyond end of device
udf: Improve anchor block detection
udf: Cleanup anchor block detection.
udf: Move processing of virtual partitions
udf: Move filling of partition descriptor info into a separate function
udf: Improve error recovery on mount
udf: Cleanup volume descriptor sequence processing
udf: fix anchor point detection
udf: Remove declarations of arrays of size UDF_NAME_LEN (256 bytes)
udf: Remove checking of existence of filename in udf_add_entry()
udf: Mark udf_process_sequence() as noinline
...
commit 71d54f3855b4ca98559e8782350336ec2433cc24
Author: Ben Dooks <ben-mtd at fluff.org>
Date: Tue Apr 15 11:36:19 2008 +0100
[MTD] [NAND] S3C2410 Large page NAND support
This adds support for using large page NAND devices
with the S3C24XX NAND controller. This also adds the
file Documentation/arm/Samsung-S3C24XX/NAND.txt to
describe the differences.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 26defe34e48e18b058b773f60467729c64917490
Author: Petr Tesarik <ptesarik at suse.cz>
Date: Tue Apr 22 05:36:52 2008 +0200
fix brd allocation flags
While looking at the implementation of the Ram backed block device
driver, I stumbled across a write-only local variable, which makes
little sense, so I assume it should actually work like this:
Signed-off-by: Petr Tesarik <ptesarik at suse.cz>
Signed-off-by: Nick Piggin <npiggin at suse.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0916083210039bf3d186a87522cc806dc21b7097
Author: Ben Dooks <ben-mtd at fluff.org>
Date: Tue Apr 15 11:36:18 2008 +0100
[MTD] [NAND] S3C2410 Fix previous nFCE suspend save patch
Commit 03680b1e00d146df718c8a4eac34438566b70c85 incorrectly
was assuming S3C2410_NFCONF was being used to select the
NAND chip. Fix this error by ising the sel_reg.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 67e5a28b35254bbbcd5bfce61ef646709e059bbf
Author: Adrian Hunter <ext-adrian.hunter at nokia.com>
Date: Mon Apr 14 09:39:39 2008 +0300
[MTD] [OneNAND] Allow for controller errors when reading
A power loss while writing can result in a page becoming unreadable.
When the device is mounted again, reading that page gives controller
errors. Upper level software like JFFS2 treat -EIO as fatal, refusing to
mount at all. That means it is necessary to treat the error as an ECC
error to allow recovery. Note that typically in this case, the
eraseblock can still be erased and rewritten i.e. it has not become a
bad block.
Signed-off-by: Adrian Hunter <ext-adrian.hunter at nokia.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit f1ebe4eba40e0ee862767893277d1b1a1e4cc85f
Author: David Brownell <david-b at pacbell.net>
Date: Mon Apr 7 12:29:23 2008 -0700
[MTD] [MAPS] omap_nor section fixes
Minor tweaks to omap_nor ... as with most platform drivers, its probe
and remove logic can (and should!) safely vanish in most configs.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 70b072550a59e787b46030ab104ac64e25fcc732
Author: Trent Piepho <tpiepho at freescale.com>
Date: Sun Mar 30 21:19:30 2008 -0700
[MTD] [NOR] Fixup for incorrect CFI data in Spansion S29GL064/32N flash chips
This is a known erratum confirmed by Spansion. I have an errata document,
but I can't find a link to it anywhere on their site to include here.
Some of the S29GL064N chips report 64 sectors when they should report 128,
and some of S29GL032N chips report 127 sectors when they should report 63.
Note that when the chip dies are fixed by Spansion, they will still have
the same id. The fix is done in such a way that it won't affect corrected
chips.
The fixups use the extended id made available by a previous patch. Without
that, virtually all newer AMD/Spansion chips will have the same ID (0x227e)
and it's not possible to apply the fixup to the correct chips.
Signed-off-by: Trent Piepho <tpiepho at freescale.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit add8eda7f2be781af0224241e870715cf0cfd75a
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Tue Apr 22 22:16:49 2008 +0200
i2c: Fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform
modalias is prefixed with "platform:". Add MODULE_ALIAS() to the
hotpluggable I2C platform drivers, to allow module auto loading.
[ db: add some more drivers ]
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit da672773d8f8169938ebf53449c99afc09938f66
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Tue Apr 22 22:16:49 2008 +0200
i2c: New driver for the SuperH Mobile I2C bus controller
This is V5 of the SuperH Mobile I2C Controller Driver. A simple Master
only driver for the I2C block included in processors such as sh7343,
sh7722 and sh7723. Tested on a sh7722 MigoR using a rs5c732b rtc.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit dec1a998bdafb4e4a18c1259bf01ffe85db368c2
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Apr 22 22:16:48 2008 +0200
i2c/scx200_acb: Don't use 0 as NULL pointer
Don't use 0 as NULL pointer.
Spotted by sparse.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit afc13b765ea71d316ce4974d3dc5a96cc73a0e95
Author: Hans Schillstrom <hans.schillstrom at shlsys.com>
Date: Tue Apr 22 22:16:48 2008 +0200
i2c-bfin-twi: Fix mismatch in add timer and delete timer
Move init_completion to just before i2c transfer.
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3385
Signed-off-by: Hans Schillstrom <hans.schillstrom at shlsys.com>
Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit d4ce220d493c2f9c41bad510c959c2130b2f1d0d
Author: Bryan Wu <cooloney at kernel.org>
Date: Tue Apr 22 22:16:48 2008 +0200
i2c-bfin-twi: Just let i2c-bfin-twi driver depends on BLACKFIN
Simply use "depends on BLACKFIN" (which is technically correct) and just
document which machines have the device.
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit bd584996b092a019a3ac32fcde7c3851935add96
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Tue Apr 22 22:16:48 2008 +0200
i2c-bfin-twi: Use simpler comment headers and strip out information that is maintained in the scm's log
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit fa6ad222713a65980528348e7f75abc768b78297
Author: Bryan Wu <cooloney at kernel.org>
Date: Tue Apr 22 22:16:48 2008 +0200
i2c-bfin-twi: Cleanup driver descriptions, versions and some module useful information
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 74d362e0b3afb7a324855ab9675eb6cda78fda8c
Author: Bryan Wu <cooloney at kernel.org>
Date: Tue Apr 22 22:16:48 2008 +0200
i2c-bfin-twi: Add missing pin mux operation
Blackfin TWI controller hardware pin should be requested from GPIO port controller
Before BF54x, there is no need to do this. But as long as BF54x and BF52x
are supported by this generic driver, the missing pin mux operation should be
added.
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit aa3d02091747727f7ff2e1f2455ad8363a9e6946
Author: Bryan Wu <cooloney at kernel.org>
Date: Tue Apr 22 22:16:48 2008 +0200
i2c-bfin-twi: Add platform_resource interface to support multi-port TWI controllers
- Dynamic alloc the resource of TWI driver data according to board information
- TWI register read/write accessor based on dynamic regs_base
- Support TWI0/TWI1 for BF54x
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 4dd39bb12f5b9f0d9a98f29071dc1c51e9306954
Author: Sonic Zhang <sonic.zhang at analog.com>
Date: Tue Apr 22 22:16:47 2008 +0200
i2c-bfin-twi: Add repeat start feature to avoid break of a bundle of i2c master xfer operation
- Create a new mode TWI_I2C_MODE_REPEAT.
- No change to smbus operation.
Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 4c03f68fc4ab902353336b6b0c6933617821cf70
Author: Wolfram Sang <w.sang at pengutronix.de>
Date: Tue Apr 22 22:16:47 2008 +0200
i2c: Remove trailing whitespaces in busses/Kconfig
Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 08882d20932224d5c4500a855a2f4b1216e5f836
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Apr 22 22:16:47 2008 +0200
i2c: Replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit a26c20b1fa6d16fd3c402785b943a5e915eda30a
Author: Manuel Lauss <mano at roarinelk.homelinux.net>
Date: Tue Apr 22 22:16:47 2008 +0200
i2c: Renesas SH7760 I2C master driver
Driver for I2C interfaces in master mode on SH7760.
Signed-off-by: Manuel Lauss <mano at roarinelk.homelinux.net>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit dba7997a87cd12b815c0d58b2a0522a8bb0cf5ec
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 22 22:16:47 2008 +0200
i2c-dev: Split i2cdev_ioctl
Split the handling of the I2C_RDWR and I2C_SMBUS ioctls to their own
functions. This limits the stack usage, saves one level of indentation
and makes the code more readable.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 838349b5c6454ebce8ec3e8c448941cf8608ffea
Author: Sean MacLennan <smaclennan at pikatech.com>
Date: Tue Apr 22 22:16:47 2008 +0200
i2c-ibm_iic: Support building as an of_platform driver
This patch allows the i2c-ibm_iic driver to be built either as an ocp
driver or an of_platform driver. This allows it to run under the powerpc
arch but maintains backward compatibility with the ppc arch.
Signed-off-by: Sean MacLennan <smaclennan at pikatech.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 681aae82c5804f8bbecbb495da90587d4167753c
Author: Sean MacLennan <smaclennan at pikatech.com>
Date: Tue Apr 22 22:16:46 2008 +0200
i2c-ibm_iic: Change the log levels
Change the log levels based on feedback from linxppc-dev.
Signed-off-by: Sean MacLennan <smaclennan at pikatech.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 244fbbb81c46eefcc5f3a9cc37c4668f9d8ff801
Author: Wolfram Sang <w.sang at pengutronix.de>
Date: Tue Apr 22 22:16:46 2008 +0200
i2c: Add platform driver on top of the new pca-algorithm
Tested on a blackfin.
Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit c01b0831057381c7f6e0bfb3634bac8c5f7fb256
Author: Wolfram Sang <w.sang at pengutronix.de>
Date: Tue Apr 22 22:16:46 2008 +0200
i2c-algo-pca: Extend for future drivers
The separation between algorithm and adapter was unsharp at places. This was
partly hidden by the fact, that the ISA-driver allowed just one instance and
had all private data in static variables. This patch makes neccessary
preparations to add a platform driver on top of the algorithm, while still
supporting ISA. Note: Due to lack of hardware, the ISA-driver could not be
tested except that it builds.
Concerning the core struct i2c_algo_pca_data:
- A private data field was added, all hardware dependant data may go here.
Similar to other algorithms, now a pointer to this data is passed to the
adapter's functions. In order to make as less changes as possible to the
ISA-driver, it leaves the private data empty and still only uses its static
variables.
- A "reset_chip" function pointer was added; such a functionality must come
from the adapter, not the algorithm.
- use a variable "i2c_clock" instead of a function pointer "get_clock",
allowing for write access to a default in case a wrong value was supplied.
In the algorithm-file:
- move "i2c-pca-algo.h" into "linux/i2c-algo-pca.h"
- now using per_instance timeout values (i2c_adap->timeout)
- error messages specify the device, not only the driver name
- restructure initialization to easily support "i2c_add_numbered_adapter"
- drop "retries" and "own" (i2c address) as they were unused
(The state-machine for I2C-communication was not touched.)
In the ISA-driver:
- adapt to new algorithm
Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 3d4382913f9a86f0d9ff47740feb427415fe7234
Author: Wolfram Sang <w.sang at pengutronix.de>
Date: Tue Apr 22 22:16:46 2008 +0200
i2c-algo-pca: Remove trailing whitespaces and unnecessary UTF
Remove trailing whitespaces to make further patches more readable. Also remove
an unnecessary UTF-char for simplicity ("us" for microseconds is fine enough).
Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 3845de25c5f83cd52729570f7b501679d37ca8de
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 22 22:16:46 2008 +0200
i2c: Remove the algorithm drivers from the config menu
The algorithm drivers are helper drivers that are selected automatically
as needed. There's no point in listing them in the config menu, it can
only confuse users and waste their time.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 93c20a59af4624aedf53f8320606b355aa951bc1
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Sat Apr 19 00:43:15 2008 +0900
[SCSI] scsi_transport_sas: fix the lifetime of sas bsg objects
scsi_transport_sas calls blk_cleanup_queue too early for bsg
queues. If a user holds a sas_host, end_device, or expander device
open, remove the device, then send a request to it, we get a kernel
crash. We need to call blk_cleanup_queue in the release callback as we
do with scsi devices.
This patch moves blk_cleanup_queue to sas_expander_release and
sas_end_device_release from sas_bsg_remove. sas_host can't use the
release callback in struct device so use bsg's release callback.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 97f46ae45c70857e459b7f8df1fc2807e7bd90a9
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Sat Apr 19 00:43:14 2008 +0900
[SCSI] bsg: add release callback support
This patch adds release callback support, which is called when a bsg
device goes away. bsg_register_queue() takes a pointer to a callback
function. This feature is useful for stuff like sas_host that can't
use the release callback in struct device.
If a caller doesn't need bsg's release callback, it can call
bsg_register_queue() with NULL pointer (e.g. scsi devices can use
release callback in struct device so they don't need bsg's callback).
With this patch, bsg uses kref for refcounts on bsg devices instead of
get/put_device in fops->open/release. bsg calls put_device and the
caller's release callback (if it was registered) in kref_put's
release.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 643eb2d932c97a0583381629d632d486934cf7ee
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Sat Mar 22 22:42:27 2008 -0500
[SCSI] rework scsi_target allocation
The current target allocation code registeres each possible target
with sysfs; it will be deleted again if no useable LUN on this target
was found. This results in a string of 'target add/target remove' uevents.
Based on a patch by Hannes Reinecke <hare at suse.de> this patch reworks
the target allocation code so that only uevents for existing targets
are sent. The sysfs registration is split off from the existing
scsi_target_alloc() into a in a new scsi_add_target() function, which
should be called whenever an existing target is found. Only then a
uevent is sent, so we'll be generating events for existing targets
only.
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit f7120a4f75168df3c02efacd10403a4ba0bcb29d
Author: Hannes Reinecke <hare at suse.de>
Date: Tue Mar 18 14:32:28 2008 +0100
[SCSI] use default attributes for scsi_host
This patch removes the unused sysfs attibute overwriting logic for
the scsi host attibutes, and plugs them into the driver core default
attribute creation.
Signed-off-by: Hannes Reinecke <hare at suse.de>
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 352f6bb422bd31a80b4a0f1c3f19b6993df2508c
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Thu Mar 20 20:57:02 2008 -0500
[SCSI] scsi_transport_spi: fix the attribute settings
We now take advantage of the mode_t return of is_valid, and also
update the attributes when the target is configured.
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 0f4238958d28044b335644b69df6071cdb04b5ce
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Thu Mar 20 20:47:52 2008 -0500
[SCSI] sysfs: make group is_valid return a mode_t
We have a problem in scsi_transport_spi in that we need to customise
not only the visibility of the attributes, but also their mode. Fix
this by making the is_visible() callback return a mode, with 0
indicating is not visible.
Also add a sysfs_update_group() API to allow us to change either the
visibility or mode of the files at any time on the fly.
Acked-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit bbd1ae412c9eb09ae7bb11cfaf7018a2367d493f
Author: Hannes Reinecke <hare at suse.de>
Date: Tue Mar 18 14:32:28 2008 +0100
[SCSI] qla2xxx, lfpc: Rename 'state' attribute to 'link_state'
lpfc and qla2xxx overwrite the standard 'state' attribute with
custom callbacks. So rename the custom attributes to 'link_state'
and retain the original meaning of the 'state' attribute.
Signed-off-by: Hannes Reinecke <hare at suse.de>
Acked-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Acked-by: James Smart <James.Smart at Emulex.Com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit b0ed43360fdca227048d88a08290365cb681c1a8
Author: Hannes Reinecke <hare at suse.de>
Date: Tue Mar 18 14:32:28 2008 +0100
[SCSI] add scsi_host and scsi_target to scsi_bus
This patch implements scsi_host and scsi_target device types
and adds both to the scsi_bus.
Signed-off-by: Hannes Reinecke <hare at suse.de>
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit cb6b7f40630f94126233194847a86bf5501fb63c
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Sat Mar 15 13:01:40 2008 -0500
[SCSI] ses: fix up functionality after class_device->device conversion
ses uses an unusual two level class hierarchy which broke in this
conversion. Fix it up still with a two level hierarchy, but this time
let the ses device manage the links to and from the real device in the
enclosure.
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 7d15d6a4dc08dfd456d834e33ef6c1d798fb2edc
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Fri Mar 14 14:12:43 2008 -0700
[SCSI] st: fix up after class_device removal
There's a change in the SCSI tree that adds another class_device, so change
it to an ordinary device
[jejb: this one got rebased until it's basically cosmetic only]
Cc: Kai Makisara <Kai.Makisara at kolumbus.fi>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit fecb8865def541ff38f59ef3caf0cbd09f4fc9fd
Author: Trent Piepho <tpiepho at freescale.com>
Date: Sun Mar 30 21:19:29 2008 -0700
[MTD] [NOR] Read extended device ID from AMD/Spansion CFI flash chips
AMD/Spansion use a device id of 0x7e to indicate an extended device is
present at offset 0xe and 0xf in the query data.
I've verified with Spansion that all their chips (mfr == 0x01) with an id
of 0x7e use it to indicate an extended id is present. What's more, there
are no chips with a NON-extended id that is the same as a different chip's
extended id. In other words, when the extended ID is present, one can
replace the normal id with the extended id without losing any information.
Which is what I've done.
Signed-off-by: Trent Piepho <tpiepho at freescale.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 0ff6631be150702ed4c92b46b77941affee866ba
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Fri Mar 28 22:10:54 2008 +0300
[MTD] [NAND] fsl_elbc_nand: workaround for hangs during nand write
Using current driver elbc sometimes hangs during nand write. Reading back
last byte helps though (thanks to Scott Wood for the idea).
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Acked-by: Scott Wood <scottwood at freescale.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 93919d384df98eba02bebd417ecb2f481b3bdcb8
Author: Hamish Moffatt <hamish at cloud.net.au>
Date: Fri Mar 28 15:00:00 2008 +1100
[MTD] [NAND] plat_nand: set mtd->name
This patch sets mtd->name to the platform bus ID in the plat_nand
driver, so that you can specify partitions readily with mtdparts=.
Currently it relies on nand_base filling in the name from the device,
which results in names like "NAND 256MiB 3,3V 8-bit", that you can't
use with cmdlineparts.
Signed-off-by: Hamish Moffatt <hamish at cloud.net.au>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 1938de46cb7e108120ffbf5155678a2a5e05b377
Author: Mike Hench <mhench at engagenet.com>
Date: Wed Mar 19 12:40:15 2008 -0500
[MTD] [NAND] corrected MPC8313 NAND fixes
Fix a race condition in fsl_elbc_run_command
Fix incorrect usage of clearbits32 that bashed option register
Remove work around for bashed register
Signed-off-by: Mike Hench <mhench at elutions.com>
Acked-by: Scott Wood <scottwood at freescale.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 9ebed3e60f9991e980e6c38b0edbdf9c8ff2ff6d
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Tue Mar 18 19:34:03 2008 +0300
[MTD] [NAND] fsl_elbc_nand: fix mtd name
Currently fsl_elbc_nand doesn't initialize mtd->name, and this causes
nand_get_flash_type() to assign name that is equal to chip type, like
this:
root at b1:~# cat /proc/mtd
dev: size erasesize name
mtd0: 00800000 00010000 "fe000000.flash"
mtd1: 02000000 00004000 "NAND 32MiB 3,3V 8-bit"
mtd0 is physmap_of flash (normal name), and mtd1 is fsl_elbc_nand.
Despite inconsistency, with mtd name like this specifying paritions
from the kernel command line becomes a torture (though, I didn't tried
and not sure if mtdparts= can handle spaces at all). Plus, this causes
real bugs when multiple fsl_elbc_nand chips registered.
With this patch applied fsl_elbc_nand chip will have proper name:
root at b1:~# cat /proc/mtd
dev: size erasesize name
mtd0: 00800000 00010000 "fe000000.flash"
mtd1: 02000000 00004000 "e0600000.flash"
p.s. We can't use priv->dev->bus_id as in physmap_of, because
fsl_elbc_nand pretends to be a localbus controller, so its bus_id is
"address.localbus", which is incorrect and thus will also not work
for multiple chips.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit f0797881d59ab93d7d92c55411e0573977d909d4
Author: Matteo Croce <technoboy85 at gmail.com>
Date: Wed Mar 12 02:25:06 2008 +0100
[MTD] AR7 mtd partition map
Signed-off-by: Matteo Croce <technoboy85 at gmail.com>
Signed-off-by: Felix Fietkau <nbd at openwrt.org>
Signed-off-by: Eugene Konev <ejka at imfi.kspu.ru>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 5c249c5a57dce2b47f1fb92093201b3a7013cb57
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Tue Mar 11 22:33:13 2008 +0300
[MTD] [NAND] FSL UPM NAND driver
This is very simple driver, NAND is connected through localbus,
and User-Programmable Machine is doing various adjustments to
speak NAND. No special efforts needed to do read and write cycles,
though to control ALE and CLE phases, we ask UPM to generate exact
pre-programmed signals on the localbus lines.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit a1c06ee11f0b83e372c958b165338f579d17e3d4
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Tue Apr 22 20:39:43 2008 +0100
[MTD] [NAND] Fix checkpatch errors in pxa3xx_nand
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 7a5bb9964512c5313af19310c6a3002ec54f7336
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:43 2008 +0400
ACPICA: Fix to handle NULL package elements correctly
Fixed problem where NULL package elements were not returned to
the AcpiEvaluateObject interface correctly. Instead of returning a
NULL ACPI_OBJECT package element, the element was simply ignored,
potentially causing a buffer overflow and/or confusing the caller
who expected a fixed number of elements.
http://bugzilla.kernel.org/show_bug.cgi?id=10132
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 0ba7d25c70699cdd3e06fc049d8884ee54b9d5db
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:43 2008 +0400
ACPICA: Fix for extraneous debug message for packages
Fixed a problem where an extraneous debug message was produced for
package objects (when debugging enabled). The message "Package
List length larger than NumElements count" is now produced in
the correct case, and is also an error message rather than a
debug message. Added a debug message for the opposite case, where
NumElements is larger than the Package List, and the package has
been padded out with NULL elements.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1b0a062be7fccfbf0218a81c98c0e4d380ee23f5
Author: Andrei Dolnikov <adolnikov at ru.mvista.com>
Date: Mon Mar 3 21:01:21 2008 +0300
[MTD] [NOR] Add JEDEC support for the SST 36VF3203 flash chip
Add support for the SST 36VF3203 flash chip. It is used on Emerson
KSI8560 board.
Signed-off-by: Andrei Dolnikov <adolnikov at ru.mvista.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 757570063a350ee3875c42a6338d29ee09f5af07
Author: Florian Fainelli <florian.fainelli at telecomint.eu>
Date: Mon Mar 3 18:30:24 2008 +0100
[MTD] [MAPS] Extend plat-ram to support a supplied probe type
This enhances plat-ram to take a map_probes argument in
the platform_data structure which allow plat-ram to support
any direct-mapped device that MTD supports (jedec, cfi, amd ..)
A few items are also fixed:
- Don't panic if probes is 0
- Actually use the partition list that is passed in
Signed-off-by: Florian Fainelli <florian.fainelli at telecomint.eu>
Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit ca5c23c3b8882d61bf19b7685f2244501902869f
Author: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Date: Wed Feb 27 01:42:39 2008 +0200
[MTD] XIP: Use generic xip_iprefetch() instead of asm volatile (...)
Untested, but shouldn't break anything... Makes MTD_XIP arch
independent. I guess this is why xip_iprefetch() was made for.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Acked-by: Nicolas Pitre <nico at cam.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit a0144a2929620d9682bc4b0c6274ef03e417f49a
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:43 2008 +0400
ACPICA: Update ACPICA version to 20080213
Update ACPICA version to 20080213.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 24a3157a90ddf851a0880c0b8963bc43481cd85b
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:43 2008 +0400
ACPICA: Fix for possible error when packages/buffers are passed to methods externally
Fixed a problem where buffer and package objects passed as
arguments to a control method via the external AcpiEvaluateObject
interface could cause an AE_AML_INTERNAL exception depending on the
order and type of operators executed by the target control method.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a3df4dadd446c0d7195f2bbe86dd5174426d8090
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:43 2008 +0400
ACPICA: Update behavior of CopyObject to match ACPI spec
Fixed a problem where a CopyObject to RegionField, BankField, and
IndexField objects did not perform an implicit conversion as it
should. These types must retain their initial type permanently as
per the ACPI specification. However, a CopyObject to all other
object types should not perform an implicit conversion, as per
the ACPI specification.
http://www.acpica.org/bugzilla/show_bug.cgi?id=388
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1d5b285da1893b90507b081664ac27f1a8a3dc5b
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:43 2008 +0400
ACPICA: Fix for resource descriptor optimization issues for _CRS/_SRC
Fixed a problem where resource descriptor size optimization
could cause a problem when a _CRS resource template is passed
to a _SRS method. The _SRS resource template must use the same
descriptors (with the same size) as returned from _CRS. This
change affects the following resource descriptors: IRQ/IRQNoFlags
and StartDependendentFn/StartDependentFnNoPri.
http://bugzilla.kernel.org/show_bug.cgi?id=9487
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 3fa347770a8a9cb3568600380ce4b5c041b3ac0b
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:43 2008 +0400
ACPICA: Disassembler support for new ACPI tables
Implemented full disassembler support for the following new ACPI
tables: BERT, EINJ, and ERST. Partial disassembler support for
the complicated HEST table. These tables support the Windows
Hardware Error Architecture (WHEA).
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 7823665eccdc7e230d0a904c6ec01d5c70ee099b
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Fix for ACPI_HIDWORD macro
Fixed a regression introduced in version 20071114. The ACPI_HIDWORD
macro was inadvertently changed to return a 16-bit value instead of
a 32-bit value, truncating the upper Dword of a 64-bit value. This
macro is only used to display debug output, so no incorrect
calculations were made.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit b1dd9096fef08642eb509fbf2a40b3c7734dce1c
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Added new error messages
New messages for the 2 AE_SUPPORT cases.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 507f046c4dd17e9c94b5130ba184f8da90504685
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Add va_end statements as appropriate
Added missing va_end statements that should correspond with each
va_start statement.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 8c49c235774002708bd0da1c28c570073ebd963b
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Update version to 20080123
Update version to 20080123.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit bc7a36ab74e09da7bb63e2477b0740ac992b290e
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Fixes for Unload and DDBHandles
Implemented support for the use of DDBHandles as an Indexed
Reference, as per the ACPI spec.
http://www.acpica.org/bugzilla/show_bug.cgi?id=486.
Implemented support for UserTerm (Method invocation) for the Unload operator
as per the ACPI spec.
http://www.acpica.org/bugzilla/show_bug.cgi?id=580
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a6f4a4511e65942b93ded60d746094ec0e58ed8e
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Bulletproof disassembler for bad ACPI tables
Fixed a problem with the disassembler where invalid ACPI tables
could cause faults or infinite loops.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 970d9c9ec313daa1b41db0f8bdd1ca8cc2903822
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Include file support for new ACPI tables
Implemented header file support for new ACPI tables - BERT, ERST,
EINJ, HEST, IBFT, UEFI, WDAT. Disassembler support is forthcoming.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 47c08729bf1c60d522d020a7f8bc15d1c70e6ecb
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Fix for LoadTable operator, input strings
Fixed a problem with the LoadTable operator where the OemId
and OemTableId input strings could cause unexpected failures if
they were shorter than the maximum lengths allowed.
http://www.acpica.org/bugzilla/show_bug.cgi?id=576
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 200cce6a75061a3bf8d2e6b27c5cdcc7730893f1
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Fix for Load operator
Fixed a problem with the Load operator where an exception was not
returned in the case where the table is already loaded.
http://www.acpica.org/bugzilla/show_bug.cgi?id=463
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 9accd46459b8c068540451fdab07dbfcefaf7280
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:42 2008 +0400
ACPICA: Methods now implicitly return 0 in slack mode
Implemented an enhancement to the interpreter "slack mode". In the
absence of an explicit return or an implicitly returned object from
the last executed opcode, a control method will now implicitly
return an integer of value 0 for Microsoft compatibility.
http://www.acpica.org/bugzilla/show_bug.cgi?id=392
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 8246934b7cf99d1f0c053d57890775e5d0df9c33
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Fix for SizeOf when used with Buffers and Packages
Fixed a problem with the SizeOf operator when used with Package
and Buffer objects. These objects have deferred execution for some
arguments, and the execution is now completed before the SizeOf is
executed. This problem caused unexpected AE_PACKAGE_LIMIT errors
on some systems.
http://bugzilla.kernel.org/show_bug.cgi?id=9558
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit c351f2dd542a3980e96cf128e06d19f784c5ea3e
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Update version to 20071219
Update version to 20071219.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit ef805d956320ffa36d068673d5c5eb2a7d13209b
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Implemented full argument resolution support for the BankValue argument to BankField
Previously, only constants were supported, now any TermArg may
be used.
http://www.acpica.org/bugzilla/show_bug.cgi?id=387
http://www.acpica.org/bugzilla/show_bug.cgi?id=393
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 57345ee6b807d32e5eecf724a463378b80cc261c
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Undo accidental checkin of not-fully-tested mutex changes
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 941f48bb465b0b291f8435b1e3de95b0975b84bc
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Implemented full support for deferred execution for the TermArg string arguments for DataTableRegion
This enables forward references and full operand resolution for
the three string arguments. Similar to OperationRegion deferred
argument execution.)
http://www.acpica.org/bugzilla/show_bug.cgi?id=430
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 9aa6169f471771324b476a90d9392daa06d63a2d
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Fixed a problem with Index Fields where the Index register was incorrectly limited to a maximum of 32 bits
Now any size may be used.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 549f46044e1e207a2cbfdfb3f9a0d3fd5fd4105e
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Fixed a problem with AcpiGetDevices where the search of a branch of the device tree could be terminated prematurely
In accordance with the ACPI specification, the search is terminated
if a device is both not present and not functional (instead of
just not present.) Yakui Zhao.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 8a2e71a82375aa2aef571d5fa9064ba67c8856a5
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Update version to 20071114
Update version to 20071114.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1cb2ef6606e0abd8565f66b5f95267de1b390694
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Fixed a problem with CopyObject used in conjunction with the Index operator
The reference was incorrectly dereferenced before the copy. The
reference is now correctly copied.
http://bugzilla.kernel.org/show_bug.cgi?id=5391
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e5bcc811f78f294e7be8a0721b3fb513028c5af4
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:41 2008 +0400
ACPICA: Fixed a problem with Index references passed as method arguments
References passed as arguments to control methods were dereferenced
immediately (before control was passed to the called method). The
references are now correctly passed directly to the called
method.
http://bugzilla.kernel.org/show_bug.cgi?id=5389
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1f549a240ccb2755066587e1e6ef9f74f485a46a
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:40 2008 +0400
ACPICA: Fixed a problem with FromBCD and ToBCD with some compilers
On some compilers, the ShortDivide function worked incorrectly,
causing problems with the BCD functions with large input
values. (Truncation from 64-bit to 32-bit occurred.) Internal
http://www.acpica.org/bugzilla/show_bug.cgi?id=435
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit b160987df7f49ee9c048a43b70ebae613a7e1437
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:40 2008 +0400
ACPICA: Fixes a problem with control method references within packages
Completes the package changes started with version 20071019.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit f2d69559b31c368cfe3a51607d9cd5e8c0168875
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:40 2008 +0400
ACPICA: Cleanup of debug output
Improved output of object dump routine.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit b7f9f04228eae2cf5adc2ffeb494d4970a8dd8a5
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:40 2008 +0400
ACPICA: Cosmetic changes only, no functional changes
Lint changes, fix compiler warnings, etc.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1d18c05825c3f2b8933a7fc7f7528881e98deb04
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:40 2008 +0400
ACPICA: Cosmetic changes only, no functional changes
Lint changes, fix compiler warnings, etc.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 39adb11e56d8eef6169aeae38f65df26883ff49c
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:40 2008 +0400
ACPICA: Update version to 20071019
Update version to 20071019.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 49718b1741cb74d86eb8b1bd8f52ad6a013b40df
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:40 2008 +0400
ACPICA: Added additional parameter validation for LoadTable
Implemented additional parameter validation for the LoadTable
operator. The length of the input strings SignatureString,
OemIdString, and OemTableId are now checked for maximum
lengths.
http://www.acpica.org/bugzilla/show_bug.cgi?id=582
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit fe4078af56a7b7f37391712cf188df3202b03776
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:40 2008 +0400
ACPICA: Fix for Increment/Decrement operator, incorrect type change
Fixed a problem with the Increment and Decrement operators where
the type of the target object could be unexpectedly and incorrectly
changed.
http://www.acpica.org/bugzilla/show_bug.cgi?id=353
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 9e41d93c975d403380b7debe05517d630c8e2836
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:39 2008 +0400
ACPICA: Fixed a memory leak when Device or Thermal objects referenced in packages
Problem introduced in fix for Package references.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 7f4ac9f91383a0707de559dc8fbca986fc2d302f
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:39 2008 +0400
ACPICA: Fix for Load/LoadTable to specify load location
Fixed a problem with the Load and LoadTable operators where
the table location within the namespace was ignored. Instead,
the table was always loaded into the root or current scope.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit d8841647de7c4aa3f3ff5b8b8c4a3f042e848ff0
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:39 2008 +0400
ACPICA: Add error checks to prevent faults
Added additional error checking to prevent run-time faults.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 98af37fba9b3e601ca4bded51ef51a2be4e8c97b
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:39 2008 +0400
ACPICA: Add a table checksum verify for Load operator
Added a table checksum verification for the Load operator, in
the case where the load is from a buffer.
http://www.acpica.org/bugzilla/show_bug.cgi?id=578
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a13b8460c5b43a68192b599ce437168cc2ff04de
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:39 2008 +0400
ACPICA: Fix for memory leak related to DdbHandle objects
Fixed a memory leak where DdbHandle objects were not deleted
automatically at control method exit.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 61ce421bb761f607b802c268bd8bd6a0c928a661
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:39 2008 +0400
ACPICA: Fix a fault when storing DdbHandle to Debug object
Fixed a problem with the Debug object where a store of a DdbHandle
reference object to the Debug object could cause a fault.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 5eb691805f7ec5960fe9d5d7fc57a7fc3097bbd0
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:39 2008 +0400
ACPICA: Fix for fault if Load() fails
Fixed a problem with the Load operator when loading a table from
a buffer object. The input buffer was prematurely zeroed and/or
deleted.
http://www.acpica.org/bugzilla/show_bug.cgi?id=577
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 53cf174409a24e8388e1d554d27436275fc81fe7
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:39 2008 +0400
ACPICA: Fix for Alias operator to see target child objects
Fixed a problem with the Alias operator when the target of the
alias is a named ASL operator that opens a new scope -- Scope,
Device, PowerResource, Processor, and ThermalZone. In these cases,
any children of the original operator could not be accessed via
the alias, potentially causing unexpected AE_NOT_FOUND exceptions.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1c12a7dde1752f2c40fe170cabff463a0b362720
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:39 2008 +0400
ACPICA: update version number to 20070919
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 14808822a9cea782c2e6f8d39e438cc3891f6472
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:38 2008 +0400
ACPICA: Fix for namespace lookup problem
Fixed a problem where objects of certain types (Device,
ThermalZone, Processor, PowerResource) can be not found if they
are declared and referenced from within the same control method
http://www.acpica.org/bugzilla/show_bug.cgi?id=341.
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 3e08e2d2d6efb256aa035e300deb059bb333b6db
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Apr 10 19:06:38 2008 +0400
ACPICA: New interfaces for table event handlers
Designed and implemented new external interfaces to install and
remove handlers for ACPI table-related events. Current events that
are defined are LOAD and UNLOAD. These interfaces allow the host to
track ACPI tables as they are dynamically loaded and unloaded. See
AcpiInstallTableHandler and AcpiRemoveTableHandler.
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 698c0a0c299bd9389522e14dae1aff02070bac25
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:38 2008 +0400
ACPICA: Add minimal disassembly support for the SLIC table
SLIC - Software Licensing Description Table.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e20a679b4acf81a419bbe80beddedc988bf3bd51
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:38 2008 +0400
ACPICA: Support for iASL - multiple files and wildcards
Implemented support to allow multiple files to be
compiled/disassembled in a single invocation. This includes
command line wildcard support for both the Windows and Unix
versions of the compiler. This feature simplifies the disassembly
and compilation of multiple ACPI tables in a single directory.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 6deb65dd9d66ff70fa8f8665690295a1126f801a
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:38 2008 +0400
ACPICA: Updated error message for dynamic method serialization
Added more information to make the message clearer.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 5cc1b9b42663878330a4cc1d8020bb9289c46066
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:38 2008 +0400
ACPICA: Update version to 20070508
Update version to 20070508.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e5567afa5cfa19e45f93c9c8796e46187a2d12f4
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:38 2008 +0400
ACPICA: Fix for update of the Global Lock Handle
Fixed a problem where the global lock handle was not properly
updated if a thread that acquired the global lock via
executing AML code then attempted to acquire the lock via the
AcpiAcquireGlobalLock interface.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 235eebbdb501261e9960deb2a9a3459af44ec0ea
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:38 2008 +0400
ACPICA: Update version to 20070320
pdate version to 20070320
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 91d02132fea3a60d3db7bd72933e38e36cd9e4c7
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:38 2008 +0400
ACPICA: Fix for package reference counts
Prevents infinite loop of 'Large Reference Count' messages in
aslts-bdemo-b286 test.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 422f4f90a23437e3e9de31eab5feb2a13f0cbb38
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:37 2008 +0400
ACPICA: Increase maximum buffer size dumped to screen in buffer object dump
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit f02e9fa1ceee045f7d5c53d475032815752a2510
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:37 2008 +0400
ACPICA: Misc fixes for recent global lock code update
Fixes as a result of running full validation test suite.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a4df451a1055d97726ab890249bc3f941906fa75
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:37 2008 +0400
ACPICA: Removed obsolete ACPI_NO_INTEGER64_SUPPORT define
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a69c77c72094bfda1ed02336ec9a1bae186fd2fc
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:37 2008 +0400
ACPICA: Removed extraneous code
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 91e38d10b2b49b8a200111baa7714c4a7e658a4c
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:37 2008 +0400
ACPICA: Update comments for acquire/release mutex interfaces
pdate comments for acquire/release mutex interfaces
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit dbaaa9567543191faa933e78f979f5ff7385918c
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:37 2008 +0400
ACPICA: Fixed a couple compiler warnings for extra extern statements
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 4b6e16cf2bacbf328535097fa74f1494b1873c54
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:37 2008 +0400
ACPICA: Avoid use of invalid pointers in returned object field
During operand evaluation, ensure that the ReturnObj field is
cleared on error and only valid pointers are stored there.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 4e3156b183aa087bc19804b3295c7c1a71f64752
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:37 2008 +0400
ACPICA: changed order of interpretation of operand objects
The interpreter now evaluates operands in the order that they
appear (both in the
AML and ASL), instead of in reverse order. This previously
caused subtle incompatibilities with the MS interpreter as well
as being non-intuitive.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit ba886cd4ac957608777fbc8d137f6b9f0450e775
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:37 2008 +0400
ACPICA: Update for mutiple global lock acquisitions by same thread
Allows AcpiAcquireGlobalLock external interface to be called
multiple times by the
same thread. Allows use of AML fields that require the global
lock while the running AML is already holding the global lock.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit f654ecbfacb47d20e8cac087bbada1b947db846b
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:36 2008 +0400
ACPICA: Removed unused code
Handling of AML_NAME_OP as a Reference.Opcode is no longer
needed. Kernel bugzilla 2874
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 773069d48030e670cf2032a13ddf16a2e0034df3
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Apr 10 19:06:36 2008 +0400
ACPICA: Several fixes for internal method result stack
fixes STACK_OVERFLOW exception on nested method calls. internal
bugzilla 262 and 275.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit fe69af002e26ca39824f626459c16d642607b573
Author: eric miao <eric.miao at marvell.com>
Date: Thu Feb 14 15:48:23 2008 +0800
[MTD] [NAND] support for pxa3xx
This is preliminary since:
1. It supports only _one_ chip select at the moment. As there is no
existing platforms available using two chip selects of the NAND
controller, it shall really not include code for supporting the
2nd chip select for now, as such code cannot be verified.
2. It resorts to the default and simpliest memory based badblock
table
3. Only limited types of nand flash are currently supported. Most
PXA3xx processors come with on-chip NAND flash dies, so there
isn't much flexibility for other types of NAND.
4. The NAND controller should be configured to detect the device's
ID, thus making it difficult to use nand_scan_ident() to assist
the detection process (though it's not impossible)
TODO: fix all the above limitations of cuz :-)
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: Sergey Podstavin <spodstavin at ru.mvista.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit b73d7e4381311bea024bf7cedcba3dcf20f63aab
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Sat Feb 16 18:14:35 2008 +0100
[MTD] [OneNAND] unlikely(x) || unlikely(y) => unlikely(x || y)
Acked-By: Kyungmin Park <kyungmin.park at samsung.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 8e2537e4cb4e80b7032372a42069899b90a06e90
Author: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Date: Thu Feb 14 16:50:25 2008 +0100
[MTD] fix minor typo in the MTD map driver for SHARP SL series
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit b0d06afb60741c19e103ffd60927f68e17c9d199
Author: Peter Korsgaard <jacmet at sunsite.dk>
Date: Thu Feb 14 17:00:10 2008 +0100
[MTD] cmdlinepart: Missing partition info is not an error
Return 0 partitions instead of -EINVAL on no mtdpart= argument in kernel
cmdline or missing partition info for device.
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
Acked-by: Stefan Roese <sr at denx.de>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit c3f08b353519ee9c64308837199a9fcf83e863da
Author: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Date: Wed Jan 16 15:45:20 2008 +0100
[MTD] [MAPS] add support for Nvidia MCP55 to ck804xrom
This patch extends the existing MAPS driver for the Nvidia CK804 chipset
(ck804xrom.c) to also work on the Nvidia MCP55 chipset. As both chipsets
are rather similar, suporting them both with the same driver is easy.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 9010eff0eadfe4eb60c3f0c71573f0fc505c31e3
Author: Jeff Garzik <jeff at garzik.org>
Date: Fri Apr 18 19:22:58 2008 -0400
[IA64] minor irq handler cleanups
- remove unused 'irq' argument from pfm_do_interrupt_handler()
- remove pointless cast to void*
- add KERN_xxx prefix to printk()
- remove braces around singleton C statement
- in tioce_provider.c, start tioce_dma_consistent() and
tioce_error_intr_handler() function declarations in column 0
This change's main purpose is to prepare for the patchset in
jgarzik/misc-2.6.git#irq-remove, that explores removal of the
never-used 'irq' argument in each interrupt handler.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 4fa2f0e672ba16b55a34ecfa514ccd92e226d3d4
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Thu Apr 17 17:00:37 2008 +0900
[IA64] simplify notify hooks in mca.c
There are many notify_die() and almost all take same style with
ia64_mca_spin(). This patch defines macros and replace them all,
to reduce lines and to improve readability.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 284e54279597e0933d785580a43be0b0194dfa00
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Thu Apr 17 16:59:52 2008 +0900
[IA64] do notify DIE_MCA_MONARCH_PROCESS for each monarchs
There are 3 hooks in MCA handler, but this DIE_MCA_MONARCH_PROCESS
event does not notified other than for the first monarch.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 38477ad75188b2a7370fef7145f956e6c446928b
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Mon Apr 21 14:34:39 2008 -0700
[IA64] disable interrupts on exit of ia64_trace_syscall
While testing with CONFIG_VIRT_CPU_ACCOUNTING=y, I found that
I occasionally get very huge system time in some threads.
So I dug the issue and finally noticed that it was caused
because of an interrupt which interrupt in the following window:
> [arch/ia64/kernel/entry.S: (!CONFIG_PREEMPT && CONFIG_VIRT_CPU_ACCOUNTING)]
>
> ENTRY(ia64_leave_syscall)
> :
> (pUStk) rsm psr.i
> cmp.eq pLvSys,p0=r0,r0 // pLvSys=1: leave from syscall
> (pUStk) cmp.eq.unc p6,p0=r0,r0 // p6 <- pUStk
> .work_processed_syscall:
> adds r2=PT(LOADRS)+16,r12
> (pUStk) mov.m r22=ar.itc // fetch time at leave
> adds r18=TI_FLAGS+IA64_TASK_SIZE,r13
> ;;
> <<< window: from here >>>
> (p6) ld4 r31=[r18] // load current_thread_info()->flags
> ld8 r19=[r2],PT(B6)-PT(LOADRS)
> adds r3=PT(AR_BSPSTORE)+16,r12
> ;;
> mov r16=ar.bsp
> ld8 r18=[r2],PT(R9)-PT(B6)
> (p6) and r15=TIF_WORK_MASK,r31 // any work other than TIF_SYSCALL_TRACE?
> ;;
> ld8 r23=[r3],PT(R11)-PT(AR_BSPSTORE)
> (p6) cmp4.ne.unc p6,p0=r15, r0 // any special work pending?
> (p6) br.cond.spnt .work_pending_syscall
> ;;
> ld8 r9=[r2],PT(CR_IPSR)-PT(R9)
> ld8 r11=[r3],PT(CR_IIP)-PT(R11)
> (pNonSys) break 0 // bug check: we shouldn't be here if pNonSys is TRUE!
> ;;
> invala
> <<< window: to here >>>
> rsm psr.i | psr.ic // turn off interrupts and interruption collection
If pUStk is true, it means we are going to return user mode, hence we fetch
ar.itc to get time at leave from system.
It seems that it is not possible to interrupt the window if pUStk is true,
because interrupts are disabled early. And also disabling interrupt makes
sense because it is safe for referring current_thread_info()->flags.
However interrupting the window while pUStk is true was possible.
The route was:
ia64_trace_syscall
-> .work_pending_syscall_end
-> .work_processed_syscall
Only in case entering the window from this route, interrupts are enabled
during in the window even if pUStk is true. I suppose interrupts must be
disabled here anyway if pUStk is true.
I'm not sure but afraid that what kind of bad effect were there, other
than crazy system time which I found.
FYI, there was a commit 6f6d75825dc49b082906b84537b4df28293c2977 that
points out a bug at same point(exit of ia64_trace_syscall) in 2006.
It can be said that there was an another bug.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 7fe9296c80e9a4ee51b43fbfbceb5143751a9d5c
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:20:40 2008 +0300
[MTD] make struct rfd_ftl_tr static
This patch makes the needlessly global struct rfd_ftl_tr static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 607d1cb1042657177bf72247eeb85c0d8416bd51
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:20:38 2008 +0300
[MTD] [OneNAND] proper onenand_bbt_read_oob() prototype
This patch adds a proper prototype for onenand_bbt_read_oob() in
include/linux/mtd/onenand.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit eb8e31831a603f285ee9e6ffc59d5366e0ff8a8e
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:20:30 2008 +0300
[MTD] [NOR] cfi_cmdset_0020.c: make a function static
This patch makes the needlessly global cfi_staa_erase_varsize() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 5ce45d50056e20aca50f19229d8a7e003569ad26
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:20:24 2008 +0300
[MTD] ftl.c: make code static
This patch makes the following needlessly global code static:
- ftl_freepart()
- struct ftl_tr
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit ed262c4f5cb8291668c27c88a022bd7628f067a4
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:20:04 2008 +0300
[MTD] cmdlinepart.c: don't compare pointers with 0
Sparse spotted that 0 was compared to pointers.
While I was at it, I also moved the assignments out of the if's.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 456d9fc92eb8635d53e8facc57764464b8759173
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:20:02 2008 +0300
[MTD] mtdram.c should #include <linux/mtd/mtdram.h>
Every file should include the headers containing the externs for its
global functions (in this case for mtdram_init_device()).
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 51ee83df6151a3e618e65236e304e00ac8d95607
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:20:00 2008 +0300
[MTD] proper prototypes for nftl_{read,write}_oob()
This patch adds proper prototypes for nftl_{read,write}_oob() in
include/linux/mtd/nftl.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit a8e8aa25694f1781fafee4ee8e8f393e4b979b36
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:19:58 2008 +0300
[MTD] proper prototypes for inftl_{read,write}_oob()
This patch adds proper prototypes for inftl_{read,write}_oob() in
include/linux/mtd/inftl.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 950bcb2582ebeddb66a8e9349eaedf7ba69e195b
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:19:46 2008 +0300
[MTD] mtd/ofpart.c: add MODULE_LICENSE
This patch adds the missing MODULE_LICENSE("GPL").
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 576506645df01f3c1a9c2c9064201aa0ba4cb0ea
Author: Scott Wood <scottwood at freescale.com>
Date: Fri Apr 4 17:06:05 2008 -0500
[MTD] [NAND] fsl_elbc_nand: Fix SEQIN handling for large pages.
Previously, a READ command was erroneously issued rather than SEQIN.
Signed-off-by: Scott Wood <scottwood at freescale.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit f72561cf6c9d0671da57902bc2ffee03b074227a
Author: Mark Hindley <mark at hindley.org.uk>
Date: Mon Mar 31 14:25:03 2008 +0100
[MTD] Correct phram module param description
Signed-off-by: Mark Hindley <mark at hindley.org.uk>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit ced22070363ef50e4a47aadd003a81ebeaa3f917
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Tue Apr 22 15:13:40 2008 +0100
[JFFS2] semaphore->mutex conversion
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 52f8301437a0ba744265e0549ee7239eb85426fc
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sun Mar 30 21:59:37 2008 +0900
[MTD] [NAND] at91_nand: Make part_probes[] static
The part_probes[] should be static.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Acked-by: Jörn Engel <joern at logfs.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 1ff184225b15930ea118ac2130f074c741d34f08
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri Apr 18 13:44:27 2008 -0700
[MTD] [NAND] fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is
prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable MTD NAND
platform drivers, to re-enable auto loading.
NOTE: at91_nand for some reason disallows modular builds. I'm assuming that's
just an oversight that will be fixed.
[dbrownell at users.sourceforge.net: minor fix]
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 41d867c9ac852ce17069f8ae680f25877be97942
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri Apr 18 13:44:26 2008 -0700
[MTD] [MAPS] fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is
prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable MTD mapping
platform drivers, to re-enable auto loading.
NOTE oddness with physmap ... it's a legacy driver in some configs, which
means it can't always support hotplugging. (Not that most of these mapping
drivers would often be used as modules...)
[dbrownell at users.sourceforge.net: bugfix, more drivers, registration fixes]
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit c27e9b80bee039cfefa51c7af08b01eaab3dfb61
Author: Sebastian Siewior <bigeasy at tglx.de>
Date: Fri Apr 18 13:44:24 2008 -0700
[MTD] [NAND] fix possible Ooops in rfc_from4
I found this while I was looking how the rs_lib is working. The rs_decoder is
initialized _after_ the nand core code read the BBT table and _after_ the
partition table has been added. The driver has a private BBT description
which is in located in flash data so we Ooops if there is a bit flip _or_ if a
bit flips while reading the partition table.
This patch moves the initialization of the rs_lib before the first possible
access by nand core.
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Jörn Engel <joern at wh.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit cb53b3b99992b6c548d56cdf47bc710640ee2ee1
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 18 13:44:19 2008 -0700
[MTD] replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 35d086b143e52f43a70c85ab86c054cbf1c4ff26
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Tue Apr 22 12:25:26 2008 +0100
[MTD] [JEDEC] Fix whitespace noise in chip table
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 30d6a24eb8fdba2c6240bfec0eec4c8f2f058a1b
Author: Gordon Farquharson <gordonfarquharson at gmail.com>
Date: Fri Apr 18 13:44:18 2008 -0700
[MTD] [JEDEC] add support for the ST M29W400DB flash chip
Add support for the ST M29W400DB flash chip. which is used on the GLAN Tank
NAS.
Signed-off-by: Gordon Farquharson <gordonfarquharson at gmail.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit cca15841710da39490abc17f56b55703e3140955
Author: michael <trimarchi at gandalf.sssup.it>
Date: Fri Apr 18 13:44:17 2008 -0700
[JFFS2] add write verify on dataflash.
Add the write verification buffer to the dataflash. The mtd_dataflash has
the CONFIG_DATAFLASH_WRITE_VERIFY so is better a change to Kconfig.
Signed-off-by: Michael Trimarchi <trimarchimichael at yahoo.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 0bc88c59cc2f031a38ad5902d5764497549217c5
Author: Stephane Chazelas <stephane.chazelas at emerson.com>
Date: Fri Apr 18 13:44:15 2008 -0700
[MTD] block2mtd: logging typo fixes
Address a number of small issues mainly regarding the output made by this
driver to dmesg:
- Some of the blkmtd's had not been changed to block2mtd which caused
display problem
- the parse_err() macro was displaying "block2mtd: " twice
Signed-off-by: Stéphane Chazelas <stephane.chazelas at emerson.com>
Acked-by: Jörn Engel <joern at lazybastard.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 25dc30b4cd68df1de8932fe77ca574227d42a259
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Tue Apr 22 12:12:25 2008 +0100
[JFFS2] fix sparse warnings in gc.c
fs/jffs2/gc.c:1147:29: warning: symbol 'jeb' shadows an earlier one
fs/jffs2/gc.c:1084:89: originally declared here
fs/jffs2/gc.c:1197:29: warning: symbol 'jeb' shadows an earlier one
fs/jffs2/gc.c:1084:89: originally declared here
Rename the unused 'jeb' argument to avoid this. We could potentially
remove the argument, but GCC should be doing that anyway.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit bf66737ca85c41442e99c9d380eb7807d88bac1f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 18 13:44:14 2008 -0700
[JFFS2] fix sparse warning in write.c
fs/jffs2/write.c:585:28: warning: symbol 'fd' shadows an earlier one
fs/jffs2/write.c:536:27: originally declared here
No need to redeclare fd, use the original one, after this point,
fd is always reassigned before it used again.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 8ca646abb4503f39a7d235b89b9f8015e3ab4631
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Tue Apr 22 11:25:47 2008 +0100
[JFFS2] Fix sparse warning in nodemgmt.c
fs/jffs2/nodemgmt.c:60:8: warning: symbol 'ret' shadows an earlier one
fs/jffs2/nodemgmt.c:45:6: originally declared here
(reported by Harvey Harrison)
Just remove the offending declaration of 'int ret' and use the earlier one.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit f876a59dae09a353444913bdf73b125bc124a848
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 18 13:44:12 2008 -0700
[JFFS2] include function prototype for jffs2_ioctl
fs/jffs2/ioctl.c:14:5: warning: symbol 'jffs2_ioctl' was not declared.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit ec12cc74e998fa39e8d707d2deb3116f9838308a
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 18 13:44:12 2008 -0700
[MTD] [NAND] mtd/nand/cs553x_nand.c:part_probes[] static
Make the needlessly global part_probes[] static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Mart Raudsepp <mart.raudsepp at artecdesign.ee>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 7903cbabcb90a7d485e67062400481c321090a4f
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 18 13:44:11 2008 -0700
[MTD] mtdoops.c: make struct oops_cxt static again
struct oops_cxt needlessly became global.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 41bdf96006132db8ca6ad40d0189454fe620993a
Author: Mike Frysinger <vapier at gentoo.org>
Date: Fri Apr 18 13:44:10 2008 -0700
[MTD] [MAPS] Document MTD_PHYSMAP module name in kconfig
Help out users by telling them the module name in the Kconfig help when
using the MTD_PHYSMAP option.
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit f838bad1b3be8ca0c785ee0e0c570dfda74cf377
Merge: dd919660aacdf4adfcd279556aa03e595f7f0fc2 807501475fce0ebe68baedf87f202c3e4ee0d12c
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Tue Apr 22 12:34:25 2008 +0100
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit efa0f16b0d0e87ffbef311785fed0815b0240f46
Author: Robert Schedel <r.schedel at yahoo.de>
Date: Fri Apr 11 09:21:48 2008 +0200
HID: Suppress hidinput for Samsung IR control
Samsung USB remotes (0419:0001) report six keys via standard HID usage pages
(arrow keys, OK, Power). Kernel 2.6.25 maps those to input events (in addition
to the hiddev report). The remaining 43 keys are reported via proprietary HID
report page and therefore by hiddev only.
Applications using hiddev and input device might process the 6 standard keys
twice. To avoid this, the input device will be suppressed for the Samsung
remote with a quirk entry, forcing to use the hiddev device only.
LIRC already contains the proper support.
Signed-off-by: Robert Schedel <r.schedel at yahoo.de>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 42098a551c0cc25c9fb206c31a88c602dced312b
Author: Jiri Kosina <jkosina at suse.cz>
Date: Wed Apr 9 10:21:48 2008 +0200
HID: remove 60x GTCO devices from blacklist
Jeremy Robertson reports that GTCO engineers made a mistake and we don't
need 0x60x GTCO product ids blacklisted.
This mostly reverts dda3fd35, but leaves PID 0x1007 intact.
Reported-by: Jeremy Roberson <jeremy.roberson at einstruction.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 0dd91544429188b496a8136e3cffb337ff6f056b
Author: Mike Frysinger <vapier at gentoo.org>
Date: Tue Apr 8 10:20:36 2008 +0200
HID: export headers properly
I have people whining about using these headers in userspace, and they have
__KERNEL__ markings which implies they're supposed to be exported. I also
added the required linux/types.h include to hidraw.h since it uses the __u##
kernel types.
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Cc: Jiri Kosina <jikos at jikos.cz>
Cc: Dmitry Torokhov <dtor at mail.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 3e52a05f0ad63c984b5ab4743fcd501fe702ad77
Author: Jiri Kosina <jkosina at suse.cz>
Date: Fri Apr 4 16:50:12 2008 +0200
HID: WiseGroup 866 Dual Joypad needs output reports quirk
WiseGroup Ltd, MP-8866 Dual Joypad needs to skip output reports,
as it contains force-feedback output reports.
Reported-by: Anssi Hannula <anssi.hannula at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit f5c669fc7692e54a7d283d60f0c862124792757c
Author: Jiri Kosina <jkosina at suse.cz>
Date: Tue Apr 1 01:56:33 2008 +0200
HID: ThrustMaster FF driver is no longer experimental
There is no need to keep a few years old ThrustMaster force-feedback
driver as experimental.
HID_FF is currently marked experimental anyway, so this is even redundant.
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit c8f0f02f3cc86652a32640b101b1f779f7ea3076
Author: Jiri Kosina <jkosina at suse.cz>
Date: Mon Mar 31 23:49:22 2008 +0200
HID: Logitech diNovo Mini pad support
Logitech diNovo Mini needs DUPLICATE_USAGES quirk.
Reported-by: Tom Horsley <tom.horsley at att.net>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 69626f23bce6521367ac1e6a2a6e8fba8f0a848a
Author: Oliver Neukum <oliver at neukum.org>
Date: Mon Mar 31 16:27:30 2008 +0200
HID: fix race between open() and disconnect() in usbhid
There is a window:
task A task B
spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
usb_set_intfdata(intf, NULL);
spin_unlock_irq(&usbhid->inlock);
usb_kill_urb(usbhid->urbin);
usb_kill_urb(usbhid->urbout);
usb_kill_urb(usbhid->urbctrl);
del_timer_sync(&usbhid->io_retry);
cancel_work_sync(&usbhid->reset_work);
if (!hid->open++) {
res = usb_autopm_get_interface(usbhid->intf);
if (res < 0) {
hid->open--;
return -EIO;
}
}
if (hid_start_in(hid))
if (hid->claimed & HID_CLAIMED_INPUT)
hidinput_disconnect(hid);
in which an open() to an already disconnected device will submit an URB
to an undead device. In case disconnect() was called by an ioctl, this'll
oops. Fix by introducing a new flag and checking it in hid_start_in().
Signed-off-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit abdff0f7749a6696ba2a4238b675cbc55abcdb7a
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Mar 31 01:53:56 2008 +0200
HID: make hid_input_field and usbhid_modify_dquirk static
This patch makes the following needlessly global functions static:
- hid-core.c:hid_input_field()
- usbhid/hid-quirks.c:usbhid_modify_dquirk()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit b54ec3c13cf77d21bab25d8bb117f642561fdf4f
Author: Jiri Kosina <jkosina at suse.cz>
Date: Fri Mar 28 14:11:22 2008 +0100
HID: pass numbered reports properly to hidraw
The numbered reports need to be passed properly to hidraw (i.e. with the first
data field indicating the report number), otherwise userspace has no idea
about the identification of the report.
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 671d994cfbe10a9b2a474d26db2cef3c878846dc
Author: Jiri Kosina <jkosina at suse.cz>
Date: Wed Apr 2 11:34:10 2008 +0200
HID: fix misplaced rdesc quirk
This moves the misplaced rdesc quirk to the place where it belongs.
Reported-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit c17f9c901c4e62cbf857b831bcc3070380449b88
Author: Anssi Hannula <anssi.hannula at gmail.com>
Date: Tue Apr 1 01:51:11 2008 +0200
HID: force feedback driver for Logitech Rumblepad 2
Add force feedback support for Logitech Rumblepad 2.
Tested-By: Edgar Simo <bobbens at gmail.com>
Signed-off-by: Anssi Hannula <anssi.hannula at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 1d1bdd20008416a744c0c844e231e7ba69c11699
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Mar 19 21:55:04 2008 +0100
HID: move wait from hid to usbhid
Since only place where this is used is usbhid, move it there.
Signed-off-by: Jiri Slaby <jslaby at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 1b184cf37f5cf098f07725b483a2055e95725476
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Sun Mar 9 16:29:24 2008 +0100
HID: make function from dbg_hid
To check paramters even if debug is disabled, convert dbg_hid
to inline function with __attribute__(format) checking.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 282bfd4cbcc2bbeb1a2cad1f42debd378e0b5ac9
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Fri Mar 28 17:06:41 2008 +0100
HID: fix sparse warnings
Fix these sparse warnings:
.../hid/hid-core.c:100:15: warning: incorrect type in assignment (different signedness)
.../hid/hid-core.c:100:15: expected signed int [usertype] *value
.../hid/hid-core.c:100:15: got unsigned int *<noident>
by unsigned -> s32
.../hid/hid-input-quirks.c:336:10: warning: Using plain integer as NULL pointer
by 0 -> NULL
.../hid/usbhid/hid-core.c:786:46: warning: incorrect type in argument 3 (different signedness)
.../hid/usbhid/hid-core.c:786:46: expected int *max
.../hid/usbhid/hid-core.c:786:46: got unsigned int *<noident>
.../hid/usbhid/hid-core.c:787:47: warning: incorrect type in argument 3 (different signedness)
.../hid/usbhid/hid-core.c:787:47: expected int *max
.../hid/usbhid/hid-core.c:787:47: got unsigned int *<noident>
.../hid/usbhid/hid-core.c:788:48: warning: incorrect type in argument 3 (different signedness)
.../hid/usbhid/hid-core.c:788:48: expected int *max
.../hid/usbhid/hid-core.c:788:48: got unsigned int *<noident>
by int -> unsigned int
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 377e10fbb4ef219f540d06796e9fb0d3ec35a58f
Author: Anssi Hannula <anssi.hannula at gmail.com>
Date: Sat Mar 22 23:50:13 2008 +0100
HID: only dump report traffic with debug level 2
Currently using debug=1 with hid module prints out all sent and received
reports to the kernel log, while in many cases we only want to see the
report descriptors and hid-input mappings that are printed when a device
is probed.
Add new level debug=2, and only dump the report traffic with that level.
Signed-off-by: Anssi Hannula <anssi.hannula at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 02008faa031f7a87b6c9df8b503a64288c8b5493
Author: Pete Zaitcev <zaitcev at redhat.com>
Date: Thu Mar 20 10:14:02 2008 +0100
HID: patch to add NOGET for DMI/Acomdata
This must be the weirdest failure yet. My external disk stops processing
the storage commands the moment it receives a GET_REPORT. The firmware
does not crash; if I do rmmod hid, then SET-INTERFACE restores normal
operations. Still, I cannot live without the keyboard when I want backup
my files. Adding the NOGET quirk fixes this problem for me.
Signed-off-by: Pete Zaitcev <zaitcev at redhat.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 5f1ab74f650b392ebcaa7cf3283e56d8dc6c7e56
Author: Jiri Kosina <jkosina at suse.cz>
Date: Fri Mar 14 16:53:07 2008 +0100
HID: Sunplus Wireless Desktop needs report descriptor fixup
This device has reports lower logical maximum compared to the real
usages for Zoom+ and Zoom- it emits.
This patch bumps the values in the report descriptor up, and also
adjusts HID_MAX_USAGE accordingly.
Reported-by: Khelben Blackstaff <eye.of.the.8eholder at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 974faac46455076c709a745f546b348017ad18dc
Author: Jim Duchek <jim.duchek at gmail.com>
Date: Fri Mar 14 15:53:49 2008 +0100
HID: quirk for MS Wireless Desktop Receiver (model 1028)
Microsoft's wireless desktop receiver (Model 1028) has a bug in the report
descriptor -- namely, in four seperate places it uses USAGE_MIN and _MAX when
it quite obviously doesn't intend to.
In other words, it reports that it has pretty much _everything_ in 'consumer'
and 'generic desktop'. And then the X evdev driver believes I have a mouse
with 36 absolute axes and a huge pile of keys and buttons, when I in fact,
should have zero. 255/256 in three of the cases, and 0-1024 in another.
This patch fixes the report descriptor of this device before it enters the HID
parser.
Signed-off-by: Jim Duchek <jim.duchek at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit f345c37c37641beceb0e52f61bb4cbc72904ee09
Author: Pekka Sarnila <sarnila at adit.fi>
Date: Thu Mar 6 13:23:14 2008 +0100
HID: fixup fullspeed interval on highspeed Afatech DVB-T IR kbd
Many vendors highspeed devices give erroneously fullspeed interval value in
endpoint descriptor for interrupt endpoints. This quirk fixes up that by
recalculating the right value for highspeed device.
At the time of hid configuration this quirk calculates which highspeed interval
value gives same interval delay as, or next smaller then, what it would be if
the original value would be interpreted as fullspeed value. In subsequent urbs
that new value is used instead.
Forming the 'hid->name' in usb_hid_config() was moved up to accommodate more
descriptive printk reporting the fixup.
In this patch the quirk is set for one such device: Afatech DVB-T 2 infrared
HID-keyboard. It reports value 16 which means 4,069s in highspeed while
obviously 16ms was intended. In this case quirk calculates new value to be 8
which gives when interpreted as highspeed value 16ms as wanted. The behavior of
the device was verified to be what expected both before and after the patch.
Signed-off-by: Pekka Sarnila <sarnila at adit.fi>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit cf2a299e48cbeb6c942e1f765b92ca6058355f68
Author: Jean Delvare <khali at linux-fr.org>
Date: Mon Mar 3 11:48:43 2008 +0100
HID: fix build failure in hiddev_ioctl with gcc 3.2
Fix build failure in hiddev_ioctl with gcc 3.2:
http://bugzilla.kernel.org/show_bug.cgi?id=10121
The trick is to move the handling of ioctls which need to allocate
memory to separate functions.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit c5d18e984a313adf5a1a4ae69e0b1d93cf410229
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date: Tue Apr 22 00:46:42 2008 -0700
[IPSEC]: Fix catch-22 with algorithm IDs above 31
As it stands it's impossible to use any authentication algorithms
with an ID above 31 portably. It just happens to work on x86 but
fails miserably on ppc64.
The reason is that we're using a bit mask to check the algorithm
ID but the mask is only 32 bits wide.
After looking at how this is used in the field, I have concluded
that in the long term we should phase out state matching by IDs
because this is made superfluous by the reqid feature. For current
applications, the best solution IMHO is to allow all algorithms when
the bit masks are all ~0.
The following patch does exactly that.
This bug was identified by IBM when testing on the ppc64 platform
using the NULL authentication algorithm which has an ID of 251.
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 618442509128fe4514be94de70ce54075cd9a706
Author: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Date: Mon Apr 21 18:12:33 2008 -0700
SELinux fixups needed for preemptable RCU from -rt
The attached patch needs to move from -rt to mainline given preemptable RCU.
This patch fixes SELinux code that implicitly assumes that disabling
preemption prevents an RCU grace period from completing, an assumption that
is valid for Classic RCU, but not necessarily for preemptable RCU. Explicit
rcu_read_lock() calls are thus added.
Signed-off-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Acked-by: Steven Rostedt <srostedt at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 521b5d0c40386f4a9805cdec7bd979fc96a86aeb
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Fri Mar 28 00:46:41 2008 -0400
[PATCH] teach seq_file to discard entries
Allow ->show() return SEQ_SKIP; that will discard all
output from that element and move on.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 4e1b36fb485dd81b0818ef1bc8fb5c0f2923a283
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Mon Mar 24 00:16:03 2008 -0400
[PATCH] umount_tree() will unhash everything itself
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 8c3ee42e80ccead805806b3cb50b9855ceb957a2
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Sat Mar 22 18:00:39 2008 -0400
[PATCH] get rid of more nameidata passing in namespace.c
Further reduction of stack footprint (sys_pivot_root());
lose useless BKL in there, while we are at it.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit b5266eb4c8d1a2887a19aaec8144ee4ad1b054c3
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Sat Mar 22 17:48:24 2008 -0400
[PATCH] switch a bunch of LSM hooks from nameidata to path
Namely, ones from namespace.c
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 1a60a280778ff90270fc7390d9ec102f713a5a29
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Sat Mar 22 16:19:49 2008 -0400
[PATCH] lock exclusively in collect_mounts() and drop_collected_mounts()
Taking namespace_sem shared there isn't worth the trouble, especially with
vfsmount ID allocation about to be added. That way we know that umount_tree(),
copy_tree() and clone_mnt() are _always_ serialized by namespace_sem.
umount_tree() still needs vfsmount_lock (it manipulates hash chains, among
other things), but that's a separate story.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 6d59e7f582ef1c1988542d0fc3b36d0087b757ce
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Sat Mar 22 15:48:17 2008 -0400
[PATCH] move a bunch of declarations to fs/internal.h
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 7c3f944e29c02d71e13442e977cf4cec19c39e98
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Mon Apr 21 19:45:12 2008 -0700
time: Export set_normalized_timespec.
Sorry I have just realized set_normalized_timespec() (used in
timespec_sub()) is not exported, and link will fail because of it...
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 807501475fce0ebe68baedf87f202c3e4ee0d12c
Merge: 2848077044a5fdeb942bd1342c550da4c452d66a bc751fe6fff3ff894784acfed1bed8639b632c09
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 19:18:43 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ipath: Correct capitalization "IntX" -> "INTx"
IB/ipath: Remove tests of PCI_MSI in ipath_iba7220.c
IB/ipath: Remove dependency on PCI_MSI || HT_IRQ
IB/ipath: Build IBA7220 code unconditionally
IB/ipath: Remove reference to dev->class_dev
IB/ipath: Fix module parameter description for disable_sma
RDMA/nes: Remove unneeded function declarations
Fix up conflict in drivers/infiniband/hw/ipath/ipath_verbs.c (by picking
the solution from the infiniband branch)
commit bc751fe6fff3ff894784acfed1bed8639b632c09
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon Apr 21 18:19:15 2008 -0700
IB/ipath: Correct capitalization "IntX" -> "INTx"
Match what the PCI specification uses.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 44957572cc198f6fcee9569813722b9ae1bd1679
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon Apr 21 18:19:15 2008 -0700
IB/ipath: Remove tests of PCI_MSI in ipath_iba7220.c
The PCI MSI interface is stubbed out properly so that all the
functions just return failure if PCI_MSI=n, so there's no reason to
have "#ifdef CONFIG_PCI_MSI" blocks in ipath_iba7220.c.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 480f58e6143135680fc1e61ea2dedc72cf3d1f95
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon Apr 21 18:19:14 2008 -0700
IB/ipath: Remove dependency on PCI_MSI || HT_IRQ
Before IBA7220 support was added, the ipath driver didn't support any
hardware unless PCI_MSI and/or HT_IRQ was enabled. However, the
IBA7220 can generate INTx interrupts, so it makes sense to allow the
driver to be build even if PCI_MSI=n and HT_IRQ=n.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 37a6ab5227d856c175d8f3586050997bb10628d8
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon Apr 21 18:19:14 2008 -0700
IB/ipath: Build IBA7220 code unconditionally
The new IBA7220 code added a call to ipath_init_iba7220_funcs() that
is compiled unconditionally, but only built the IBA7220 code if
PCI_MSI is enabled. Fix this by building the IBA7220 file
unconditonally.
This fixes build breakage when PCI_MSI=n, HT_IRQ=y and
INFINIBAND_IPATH=y reported by Ingo Molnar <mingo at elte.hu>:
drivers/built-in.o: In function `ipath_init_one':
ipath_driver.c:(.devinit.text+0x1e5bc): undefined reference to `ipath_init_iba7220_funcs'
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 88a8317bcd2258e84a41c155590837036d6b80a8
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon Apr 21 18:19:14 2008 -0700
IB/ipath: Remove reference to dev->class_dev
Commit 124b4dcb ("IB/ipath: add calls to new 7220 code and enable in
build") inadvertently added core to set dev->class_dev.dev back into
ib_ipath. This is completely redundant since commit 1912ffbb ("IB: Set
class_dev->dev in core for nice device symlink"), which removed
class_dev setting from low-level drivers, and also will break the build
when class_dev is removed completely from struct ib_device.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 9862874d2138135dad9e78f61dbe415a4364945b
Author: Paul Bolle <pebolle at tiscali.nl>
Date: Mon Apr 21 18:19:13 2008 -0700
IB/ipath: Fix module parameter description for disable_sma
Describe disable_sma parameter with its name rather than the internal
ib_ipath_disable_sma variable name, so that the description shows up
properly in modinfo.
Signed-off-by: Paul Bolle <pebolle at tiscali.nl>
Acked-by: Ralph Campbell <ralph.campbell at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 6a5546e76c4b2367e03cb52884b97c94d6260a8c
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon Apr 21 18:19:12 2008 -0700
RDMA/nes: Remove unneeded function declarations
Remove redundant static declarations of functions that are defined
before they are used in the source.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 2848077044a5fdeb942bd1342c550da4c452d66a
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Tue Apr 22 10:24:24 2008 +1000
infiniband: class_device fallout
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 135cedad7457be6a96d5e151dfd48f7888a75e94
Merge: 8a3227268877b81096d7b7a841aaf51099ad2068 e70aa3fac1ac50c7a75ac676a1489dd1ea3b4be5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 17:23:30 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (26 commits)
mmc: sdio_ops.c should #include "sdio_ops.h"
mmc: proper prototypes for mmc_attach_*()
mmc: make __mmc_release_bus() static
sdhci: improve no card, no reset quirk
MMC: OMAP: Do not busy wait for end of command for ever
MMC: OMAP: Start new commands from work queue instead of irq
MMC: OMAP: Lazy clock shutdown
MMC: OMAP: Move failing command abortion to workqueue
MMC: OMAP: Use tasklet instead of workqueue for cover switch notification
MMC: OMAP: Check the get_cover_state function pointer if not set
MMC: OMAP: Using setup_timer instead of init_timer
MMC: OMAP: Abort stuck commands
MMC: OMAP: General cleanup for MMC multislot support
MMC: OMAP: Power functions modified to MMC multislot support
MMC: OMAP: Fix timeout calculation for MMC multislot support
MMC: OMAP: New release dma and abort xfer functions
MMC: OMAP: Add back cover switch support
MMC: OMAP: Introduce new multislot structure and change driver to use it
MMC: OMAP: Remove cover switch handling to allow adding multislot support
MMC: OMAP: Fix the BYTEBLOCK capability removal
...
commit 8a3227268877b81096d7b7a841aaf51099ad2068
Merge: e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b ec98c6b9b47df6df1c1fa6cf3d427414f8c2cf16
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 17:20:53 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Remove SunOS and Solaris binary support.
commit 0f5e64200f20fc8f5b759c4010082f577ab0af3f
Author: Eric Paris <eparis at redhat.com>
Date: Mon Apr 21 16:24:11 2008 -0400
SELinux: no BUG_ON(!ss_initialized) in selinux_clone_mnt_opts
The Fedora installer actually makes multiple NFS mounts before it loads
selinux policy. The code in selinux_clone_mnt_opts() assumed that the
init process would always be loading policy before NFS was up and
running. It might be possible to hit this in a diskless environment as
well, I'm not sure. There is no need to BUG_ON() in this situation
since we can safely continue given the circumstances.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit e9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b
Merge: 548453fd107f789f5f1bc2dc13cc432ceb3b5efd 838cb6aba4cebcf4fcd06b90e2adf890bef884ac
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 16:36:46 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
DOC: A couple corrections and clarifications in USB doc.
Generate a slightly more informative error msg for bad HZ
fix typo "is" -> "if" in Makefile
ext*: spelling fix prefered -> preferred
DOCUMENTATION: Use newer DEFINE_SPINLOCK macro in docs.
KEYS: Fix the comment to match the file name in rxrpc-type.h.
RAID: remove trailing space from printk line
DMA engine: typo fixes
Remove unused MAX_NODES_SHIFT
MAINTAINERS: Clarify access to OCFS2 development mailing list.
V4L: Storage class should be before const qualifier (sn9c102)
V4L: Storage class should be before const qualifier
sonypi: Storage class should be before const qualifier
intel_menlow: Storage class should be before const qualifier
DVB: Storage class should be before const qualifier
arm: Storage class should be before const qualifier
ALSA: Storage class should be before const qualifier
acpi: Storage class should be before const qualifier
firmware_sample_driver.c: fix coding style
MAINTAINERS: Add ati_remote2 driver
...
Fixed up trivial conflicts in firmware_sample_driver.c
commit 548453fd107f789f5f1bc2dc13cc432ceb3b5efd
Merge: 9fd91217b15751997cab35ad309b37b44eaa6774 fb199746303a6bfd6121834ec9e810471185c530
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 16:03:40 2008 -0700
Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block:
block: fix blk_register_queue() return value
block: fix memory hotplug and bouncing in block layer
block: replace remaining __FUNCTION__ occurrences
Kconfig: clean up block/Kconfig help descriptions
cciss: fix warning oops on rmmod of driver
cciss: Fix race between disk-adding code and interrupt handler
block: move the padding adjustment to blk_rq_map_sg
block: add bio_copy_user_iov support to blk_rq_map_user_iov
block: convert bio_copy_user to bio_copy_user_iov
loop: manage partitions in disk image
cdrom: use kmalloced buffers instead of buffers on stack
cdrom: make unregister_cdrom() return void
cdrom: use list_head for cdrom_device_info list
cdrom: protect cdrom_device_info list by mutex
cdrom: cleanup hardcoded error-code
cdrom: remove ifdef CONFIG_SYSCTL
commit 9fd91217b15751997cab35ad309b37b44eaa6774
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 12:51:04 2008 +0100
frv: unexport kmap_atomic_to_page
This patch removes the no longer used export of kmap_atomic_to_page.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit eb0cc5fe4e8d4928259852d9dc3cb1eeae90e48f
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 12:50:59 2008 +0100
frv: remove HARD_RESET_NOW()
HARD_RESET_NOW() was unused.
And one of the few remaining cli() users.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 19b5b517a8b81a448be9b2bdaf18a761a7b9799e
Merge: bda0c0afa7a694bb1459fd023515aca681e4d79a 95fff33b8e306a4331024bbd31c0999d5bf48fcf
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 16:01:40 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
SELinux: one little, two little, three little whitespaces, the avc.c saga.
SELinux: cleanup on isle selinuxfs.c
changing whitespace for fun and profit: policydb.c
SELinux: whitespace and formating fixes for hooks.c
SELinux: clean up printks
SELinux: sidtab.c whitespace, syntax, and static declaraction cleanups
SELinux: services.c whitespace, syntax, and static declaraction cleanups
SELinux: mls.c whitespace, syntax, and static declaraction cleanups
SELinux: hashtab.c whitespace, syntax, and static declaraction cleanups
SELinux: ebitmap.c whitespace, syntax, and static declaraction cleanups
SELinux: conditional.c whitespace, syntax, and static declaraction cleanups
SELinux: avtab.c whitespace, syntax, and static declaraction cleanups
SELinux: xfrm.c whitespace, syntax, and static declaraction cleanups
SELinux: nlmsgtab.c whitespace, syntax, and static declaraction cleanups
SELinux: netnode.c whitespace, syntax, and static declaraction cleanups
SELinux: netlink.c whitespace, syntax, and static declaraction cleanups
SELinux: netlabel.c whitespace, syntax, and static declaraction cleanups
SELinux: netif.c whitespace, syntax, and static declaraction cleanups
commit bda0c0afa7a694bb1459fd023515aca681e4d79a
Merge: 904e0ab54b7591b9cb01cfc0dbbedcc8bc0d949b af40b485ea2d957ae2f237ab0e33539ae8f29562
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:58:35 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (42 commits)
PCI: Change PCI subsystem MAINTAINER
PCI: pci-iommu-iotlb-flushing-speedup
PCI: pci_setup_bridge() mustn't be __devinit
PCI: pci_bus_size_cardbus() mustn't be __devinit
PCI: pci_scan_device() mustn't be __devinit
PCI: pci_alloc_child_bus() mustn't be __devinit
PCI: replace remaining __FUNCTION__ occurrences
PCI: Hotplug: fakephp: Return success, not ENODEV, when bus rescan is triggered
PCI: Hotplug: Fix leaks in IBM Hot Plug Controller Driver - ibmphp_init_devno()
PCI: clean up resource alignment management
PCI: aerdrv_acpi.c: remove unneeded NULL check
PCI: Update VIA CX700 quirk
PCI: Expose PCI VPD through sysfs
PCI: iommu: iotlb flushing
PCI: simplify quirk debug output
PCI: iova RB tree setup tweak
PCI: parisc: use generic pci_enable_resources()
PCI: ppc: use generic pci_enable_resources()
PCI: powerpc: use generic pci_enable_resources()
PCI: ia64: use generic pci_enable_resources()
...
commit 838cb6aba4cebcf4fcd06b90e2adf890bef884ac
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Apr 21 22:57:50 2008 +0000
DOC: A couple corrections and clarifications in USB doc.
A couple of corrections and clarifications in USB
documentation.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 904e0ab54b7591b9cb01cfc0dbbedcc8bc0d949b
Merge: 98a1e95f9b5919b55c71a01546415074282d30d5 c49a7f182c44c31ea460093eb263110824f6c98e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:57:09 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[HWRNG] omap: Minor updates
[CRYPTO] kconfig: Ordering cleanup
[CRYPTO] all: Clean up init()/fini()
[CRYPTO] padlock-aes: Use generic setkey function
[CRYPTO] aes: Export generic setkey
[CRYPTO] api: Make the crypto subsystem fully modular
[CRYPTO] cts: Add CTS mode required for Kerberos AES support
[CRYPTO] lrw: Replace all adds to big endians variables with be*_add_cpu
[CRYPTO] tcrypt: Change the XTEA test vectors
[CRYPTO] tcrypt: Shrink the tcrypt module
[CRYPTO] tcrypt: Change the usage of the test vectors
[CRYPTO] api: Constify function pointer tables
[CRYPTO] aes-x86-32: Remove unused return code
[CRYPTO] tcrypt: Shrink speed templates
[CRYPTO] tcrypt: Group common speed templates
[CRYPTO] sha512: Rename sha512 to sha512_generic
[CRYPTO] sha384: Hardware acceleration for s390
[CRYPTO] sha512: Hardware acceleration for s390
[CRYPTO] s390: Generic sha_update and sha_final
[CRYPTO] api: Switch to proc_create()
commit 98a1e95f9b5919b55c71a01546415074282d30d5
Merge: abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d 896c6fa1e59dd17e1ac2877c25cab19bbb24e666
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:56:19 2008 -0700
Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[ISDN] minor irq handler cleanups
drivers/char: minor irq handler cleanups
[PPC] minor irq handler cleanups
[BLACKFIN] minor irq handler cleanups
[SPARC] minor irq handler cleanups
ARM minor irq handler cleanup: avoid passing unused info to irq
commit 37679011c5a674eb80bff5c2b9b067bf16011d46
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Apr 21 22:56:14 2008 +0000
Generate a slightly more informative error msg for bad HZ
Generate a slightly more informative error msg for bad HZ
in include/linux/jiffies.h
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d
Merge: e16b27816462de700f9508d86954410c41105dc2 8349304d12cf1313bdbd6eb2083701d86809be24
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:54:34 2008 -0700
Merge branch 'isdn-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'isdn-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[ISDN] Hisax: eliminate many unnecessary references to CardType[]
[ISDN] HiSax: modularization prep
commit bc3c26fe65ecaa3fa96844219a9070a3e079697a
Author: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Date: Mon Apr 21 22:53:56 2008 +0000
fix typo "is" -> "if" in Makefile
It should be "if" but is written as "is"..
Signed-off-by: Uwe Kleine-Koenig <Uwe.Kleine-Koenig at digi.com>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit e16b27816462de700f9508d86954410c41105dc2
Author: Roland McGrath <roland at redhat.com>
Date: Sun Apr 20 13:10:12 2008 -0700
ptrace: compat_ptrace_request siginfo
This adds support for PTRACE_GETSIGINFO and PTRACE_SETSIGINFO in
compat_ptrace_request. It relies on existing arch definitions for
copy_siginfo_to_user32 and copy_siginfo_from_user32.
On powerpc, this fixes a longstanding regression of 32-bit ptrace
calls on 64-bit kernels vs native calls (64-bit calls or 32-bit
kernels). This can be seen in a 32-bit call using PTRACE_GETSIGINFO
to examine e.g. siginfo_t.si_addr from a signal that sets it.
(This was broken as of 2.6.24 and, I presume, many or all prior versions.)
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 553a56726be86c09cfa53c84da1ea0e2043e364e
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Sun Apr 20 10:51:01 2008 -0700
skbuff: fix missing kernel-doc notation
Add kernel-doc notation for ndisc_nodetype:
Warning(linux-2.6.25-git2//include/linux/skbuff.h:340): No description found for parameter 'ndisc_nodetype'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9a64388d83f6ef08dfff405a9d122e3dbcb6bf38
Merge: e80ab411e589e00550e2e6e5a6a02d59cc730357 14b3ca4022f050f8622ed282b734ddf445464583
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:50:49 2008 -0700
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (202 commits)
[POWERPC] Fix compile breakage for 64-bit UP configs
[POWERPC] Define copy_siginfo_from_user32
[POWERPC] Add compat handler for PTRACE_GETSIGINFO
[POWERPC] i2c: Fix build breakage introduced by OF helpers
[POWERPC] Optimize fls64() on 64-bit processors
[POWERPC] irqtrace support for 64-bit powerpc
[POWERPC] Stacktrace support for lockdep
[POWERPC] Move stackframe definitions to common header
[POWERPC] Fix device-tree locking vs. interrupts
[POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
[POWERPC] Remove unused __max_memory variable
[POWERPC] Simplify xics direct/lpar irq_host setup
[POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
[POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
[POWERPC] Use asm-generic/bitops/find.h in bitops.h
[POWERPC] 83xx: mpc8315 - fix USB UTMI Host setup
[POWERPC] 85xx: Fix the size of qe muram for MPC8568E
[POWERPC] 86xx: mpc86xx_hpcn - Temporarily accept old dts node identifier.
[POWERPC] 86xx: mark functions static, other minor cleanups
...
commit e80ab411e589e00550e2e6e5a6a02d59cc730357
Merge: 529a41e36673b518c9e091f3a8d932b6b9e3c461 ee959b00c335d7780136c5abda37809191fe52c3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:49:58 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits)
SCSI: convert struct class_device to struct device
DRM: remove unused dev_class
IB: rename "dev" to "srp_dev" in srp_host structure
IB: convert struct class_device to struct device
memstick: convert struct class_device to struct device
driver core: replace remaining __FUNCTION__ occurrences
sysfs: refill attribute buffer when reading from offset 0
PM: Remove destroy_suspended_device()
Firmware: add iSCSI iBFT Support
PM: Remove legacy PM (fix)
Kobject: Replace list_for_each() with list_for_each_entry().
SYSFS: Explicitly include required header file slab.h.
Driver core: make device_is_registered() work for class devices
PM: Convert wakeup flag accessors to inline functions
PM: Make wakeup flags available whenever CONFIG_PM is set
PM: Fix misuse of wakeup flag accessors in serial core
Driver core: Call device_pm_add() after bus_add_device() in device_add()
PM: Handle device registrations during suspend/resume
block: send disk "change" event for rescan_partitions()
sysdev: detect multiple driver registrations
...
Fixed trivial conflict in include/linux/memory.h due to semaphore header
file change (made irrelevant by the change to mutex).
commit 529a41e36673b518c9e091f3a8d932b6b9e3c461
Merge: c3823c479e1f86a0adc7bb76fcfded67b042afc3 43837b1e6c5aef803d57009a68db18df13e64892
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:46:17 2008 -0700
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
rose: Socket lock was not released before returning to user space
hci_usb: remove code obfuscation
drivers/net/appletalk: use time_before, time_before_eq, etc
drivers/atm: use time_before, time_before_eq, etc
hci_usb: do not initialize static variables to 0
tg3: 5701 DMA corruption fix
atm nicstar: Removal of debug code containing deprecated calls to cli()/sti()
iwlwifi: Fix unconditional access to station->tidp[].agg.
netfilter: Fix SIP conntrack build with NAT disabled.
netfilter: Fix SCTP nat build.
commit 1cc8dcf569a3fcefb7ae32652225f2bd3e85257e
Author: Benoit Boissinot <benoit.boissinot at ens-lyon.org>
Date: Mon Apr 21 22:45:55 2008 +0000
ext*: spelling fix prefered -> preferred
Spelling fix: prefered -> preferred
Signed-off-by: Benoit Boissinot <benoit.boissinot at ens-lyon.org>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit c3823c479e1f86a0adc7bb76fcfded67b042afc3
Merge: 5dfeaef89559d4968b0470adf749659f10d722f6 ed3fa7c9510cde67d232299cab8052ff50a08285
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:44:57 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: (25 commits)
avr32: Add hardware power-down function call
avr32: add include/asm-avr32/serial.h
avr32: don't offer PARPORT_PC
avr32: don't offer CONFIG_GEN_RTC
avr32: don't offer CONFIG_RTC
add include/asm-avr32/xor.h
avr32: Remove two unused #defines from mm/init.c
avr32: Implement set_rate(), set_parent() and mode() for pll1
avr32: Generic clockevents support
avr32: Move sleep code into mach-at32ap
avr32: Use constants from sysreg.h in asm.h
avr32: Delete mostly unused header asm/intc.h
avr32: start clocksource cleanup
avr32: pass i2c board info through at32_add_device_twi
avr32: cleanup - use _AC macro to define PAGE_SIZE
Generate raw keyboard codes for AVR32 architecture
atmel_usba_udc: Add support for AT91CAP9 UDPHS
atmel_usba_udc: Add missing kfree() in usba_udc_remove()
atmel_usba_udc: move endpoint declarations into platform data.
atmel_usba_udc: Kill GPIO_PIN_NONE
...
commit c0d1f29534f2bd6c5992831eb0f648522e9b0204
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Apr 21 22:44:50 2008 +0000
DOCUMENTATION: Use newer DEFINE_SPINLOCK macro in docs.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit dd89db1df98003fadafa711ab8bc497aaf92980a
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Apr 21 22:43:55 2008 +0000
KEYS: Fix the comment to match the file name in rxrpc-type.h.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 5dfeaef89559d4968b0470adf749659f10d722f6
Merge: 429f731dea577bdd43693940cdca524135287e6a 259aae864ceeb2b34e7bafa1ce18d096a357fab2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:43:43 2008 -0700
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
hrtimer: optimize the softirq time optimization
hrtimer: reduce calls to hrtimer_get_softirq_time()
clockevents: fix typo in tick-broadcast.c
jiffies: add time_is_after_jiffies and others which compare with jiffies
commit fdefa4d87e2f07ffe5888a7c2ed87dd12f9cfe37
Author: Nick Andrew <nick at nick-andrew.net>
Date: Mon Apr 21 22:42:58 2008 +0000
RAID: remove trailing space from printk line
drivers/md/*.[ch] contains only one more printk line with a trailing space.
Remove it.
Signed-off-by: Nick Andrew <nick at nick-andrew.net>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 429f731dea577bdd43693940cdca524135287e6a
Merge: 85b375a613085b78531ec86369a51c2f3b922f95 d2f5e80862d33a7746a40569840248a592dbc395
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:41:27 2008 -0700
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Deprecate the asm/semaphore.h files in feature-removal-schedule.
Convert asm/semaphore.h users to linux/semaphore.h
security: Remove unnecessary inclusions of asm/semaphore.h
lib: Remove unnecessary inclusions of asm/semaphore.h
kernel: Remove unnecessary inclusions of asm/semaphore.h
include: Remove unnecessary inclusions of asm/semaphore.h
fs: Remove unnecessary inclusions of asm/semaphore.h
drivers: Remove unnecessary inclusions of asm/semaphore.h
net: Remove unnecessary inclusions of asm/semaphore.h
arch: Remove unnecessary inclusions of asm/semaphore.h
commit 85b375a613085b78531ec86369a51c2f3b922f95
Merge: ec965350bb98bd291eb34f6ecddfdcfc36da1e6e cf816ecb533ab96b883dfdc0db174598b5b5c4d2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:40:55 2008 -0700
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (212 commits)
[ARM] pxa: Phycore pcm-990-specific code for the PXA270 Quick Capture driver
[ARM] pxa: V4L2 soc_camera driver for PXA270
[ARM] pxa: restrict availability of pxa2xx PCMCIA drivers
[ARM] 5005/1: BAST: Fix kset_name initialiser
[ARM] 4967/1: Adds functions to set clkout rate for Samsung S3C2410
[ARM] 4988/1: Add GPIO lib support to the EP93xx
[ARM] Add initial sparsemem support
[ARM] pxa: initialise PXA devices before platform init code
[ARM] 5002/1: tosa: add two more leds
[ARM] 5004/1: Tosa: make several unreferenced structures static.
[ARM] 5003/1: Shut up sparse warnings
[ARM] 4977/2: soc - pxa2xx-ac97 - Add missing clk_enable()
[ARM] 4976/1: zylonite: Configure GPIO for WM9713 IRQ line
[ARM] 4974/1: Drop unused leds-tosa.
[ARM] 4973/1: Tosa: use leds-gpio driver.
[ARM] 4972/1: Tosa: convert scoop GPIOs usage to generic gpio code
[ARM] 4971/1: pxaficp_ir: provide startup and shutdown hooks
[ARM] pxa: lubbock: move mis-placed SPI info
[ARM] 4970/1: tosa: correct gpio used for wake up.
[ARM] 4966/1: magician: add MFP pin configuration
...
commit ec965350bb98bd291eb34f6ecddfdcfc36da1e6e
Merge: 5f033bb9bc5cb3bb37a79e3ef131f50ecdcb72b0 486fdae21458bd9f4e125099bb3c38a4064e450e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:40:24 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel: (62 commits)
sched: build fix
sched: better rt-group documentation
sched: features fix
sched: /debug/sched_features
sched: add SCHED_FEAT_DEADLINE
sched: debug: show a weight tree
sched: fair: weight calculations
sched: fair-group: de-couple load-balancing from the rb-trees
sched: fair-group scheduling vs latency
sched: rt-group: optimize dequeue_rt_stack
sched: debug: add some debug code to handle the full hierarchy
sched: fair-group: SMP-nice for group scheduling
sched, cpuset: customize sched domains, core
sched, cpuset: customize sched domains, docs
sched: prepatory code movement
sched: rt: multi level group constraints
sched: task_group hierarchy
sched: fix the task_group hierarchy for UID grouping
sched: allow the group scheduler to have multiple levels
sched: mix tasks and groups
...
commit 8a5703f846e2363fc466aff3f53608340a1ae33f
Author: Sebastian Siewior <bigeasy at tglx.de>
Date: Mon Apr 21 22:38:45 2008 +0000
DMA engine: typo fixes
Spelling fixes for dmaengine.[ch]
Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
Acked-by: Maciej Sosnowski <maciej.sosnowski at intel.com>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 5f033bb9bc5cb3bb37a79e3ef131f50ecdcb72b0
Merge: fd9be4ce2e1eb407a8152f823698cc0d652bbec8 34d0559178393547505ec9492321255405f4e441
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:38:43 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (77 commits)
x86: UV startup of slave cpus
x86: integrate pci-dma.c
x86: don't do dma if mask is NULL.
x86: return conditional to mmu
x86: remove kludge from x86_64
x86: unify gfp masks
x86: retry allocation if failed
x86: don't try to allocate from DMA zone at first
x86: use a fallback dev for i386
x86: use numa allocation function in i386
x86: remove virt_to_bus in pci-dma_64.c
x86: adjust dma_free_coherent for i386
x86: move bad_dma_address
x86: isolate coherent mapping functions
x86: move dma_coherent functions to pci-dma.c
x86: merge iommu initialization parameters
x86: merge dma_supported
x86: move pci fixup to pci-dma.c
x86: move x86_64-specific to common code.
x86: move initialization functions to pci-dma.c
...
commit fd9be4ce2e1eb407a8152f823698cc0d652bbec8
Merge: b1af9ccce9cff5b48c37424dbdbb3aa9021915db ad775f5a8faa5845377f093ca11caf577404add9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:38:14 2008 -0700
Merge branch 'ro-bind.b6' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'ro-bind.b6' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (24 commits)
[PATCH] r/o bind mounts: debugging for missed calls
[PATCH] r/o bind mounts: honor mount writer counts at remount
[PATCH] r/o bind mounts: track numbers of writers to mounts
[PATCH] r/o bind mounts: check mnt instead of superblock directly
[PATCH] r/o bind mounts: elevate count for xfs timestamp updates
[PATCH] r/o bind mounts: make access() use new r/o helper
[PATCH] r/o bind mounts: write counts for truncate()
[PATCH] r/o bind mounts: elevate write count for chmod/chown callers
[PATCH] r/o bind mounts: elevate write count for open()s
[PATCH] r/o bind mounts: elevate write count for ioctls()
[PATCH] r/o bind mounts: write count for file_update_time()
[PATCH] r/o bind mounts: elevate write count for do_utimes()
[PATCH] r/o bind mounts: write counts for touch_atime()
[PATCH] r/o bind mounts: elevate write count for ncp_ioctl()
[PATCH] r/o bind mounts: elevate write count for xattr_permission() callers
[PATCH] r/o bind mounts: get write access for vfs_rename() callers
[PATCH] r/o bind mounts: write counts for link/symlink
[PATCH] r/o bind mounts: get callers of vfs_mknod/create/mkdir()
[PATCH] r/o bind mounts: elevate write count for rmdir and unlink.
[PATCH] r/o bind mounts: drop write during emergency remount
...
commit b1af9ccce9cff5b48c37424dbdbb3aa9021915db
Merge: cc216c5d429892872f70f76975e243aef7ad9db1 440fc172ae333c52c458401fe059afcc6e91eebf
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Apr 21 15:37:47 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (27 commits)
sh: Fix up L2 cache probe.
sh: Fix up SH-4A part probe.
sh: Add support for SH7723 CPU subtype.
sh: Fix up SH7763 build.
sh: Add migor_ts support to MigoR
sh: Add rs5c732b RTC support to MigoR
sh: Add I2C support to MigoR
sh: Add I2C platform data to sh7722
sh: MigoR NAND flash support using gen_flash
sh: MigoR NOR flash support using physmap-flash
sh: Fix up mach-types formatting from merge damage.
sh: r7780rp: Hook up the I2C and SMBus platform devices.
sh: Use phyical addresses for MigoR smc91x resources
sh: Use physical addresses for sh7722 USBF resources
sh: Add MigoR header file
Fix sh_keysc double free
sh: Fix up __access_ok() check for nommu.
sh: Allow optimized clear/copy page routines to be used on SH-2.
sh: Hook up the rest of the SH7770 serial ports.
sh: Add support for Solution Engine SH7721 board
...
commit 218ff137bc67252694420563d23d051ab9227f17
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Mon Apr 21 22:35:29 2008 +0000
Remove unused MAX_NODES_SHIFT
MAX_NODES_SHIFT is not referenced anywhere in the tree, so dump it.
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit c0ff1f26acdbb8dc67165b0bbf910f795f0a0ca3
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Apr 21 22:34:01 2008 +0000
MAINTAINERS: Clarify access to OCFS2 development mailing list.
The list is moderated for non-subscribers
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 22d56fce95f8cfcae8376e6da99e232583c61845
Author: Tobias Klauser <tklauser at distanz.ch>
Date: Mon Apr 21 22:32:16 2008 +0000
V4L: Storage class should be before const qualifier (sn9c102)
The C99 specification states in section 6.11.5:
The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit c81010bf41ec1e888e46898f57cd0e2cdac326a4
Author: Tobias Klauser <tklauser at distanz.ch>
Date: Mon Apr 21 22:30:21 2008 +0000
V4L: Storage class should be before const qualifier
The C99 specification states in section 6.11.5:
The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit b0cdb5e11800dd76d9bb69aa335c8a33ddc50f5a
Author: Tobias Klauser <tklauser at distanz.ch>
Date: Mon Apr 21 22:29:37 2008 +0000
sonypi: Storage class should be before const qualifier
The C99 specification states in section 6.11.5:
The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit f7e8dd5071340541587e588c8fb4404dd5b0462d
Author: Tobias Klauser <tklauser at distanz.ch>
Date: Mon Apr 21 22:28:49 2008 +0000
intel_menlow: Storage class should be before const qualifier
The C99 specification states in section 6.11.5:
The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit cbfa6f2a684e9fb7d6a5025b3893b8f93112683c
Author: Tobias Klauser <tklauser at distanz.ch>
Date: Mon Apr 21 22:27:50 2008 +0000
DVB: Storage class should be before const qualifier
The C99 specification states in section 6.11.5:
The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit b1d18dc06ba6b9056f95aaf1f8c464830846f87f
Author: Tobias Klauser <tklauser at distanz.ch>
Date: Mon Apr 21 22:26:40 2008 +0000
arm: Storage class should be before const qualifier
The C99 specification states in section 6.11.5:
The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 3f76d9841e9cf6dd969ff3aec96476dced9c53f8
Author: Tobias Klauser <tklauser at distanz.ch>
Date: Mon Apr 21 22:25:51 2008 +0000
ALSA: Storage class should be before const qualifier
The C99 specification states in section 6.11.5:
The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit b299c22c8c1024a5a89d19524e24b3e1d67e9eab
Author: Tobias Klauser <tklauser at distanz.ch>
Date: Mon Apr 21 22:24:53 2008 +0000
acpi: Storage class should be before const qualifier
The C99 specification states in section 6.11.5:
The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.
Signed-off-by: Tobias Klauser <tklauser at distanz.ch>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 58da495065134b45799bd02988ab658c3da6af25
Author: Pavel Machek <pavel at suse.cz>
Date: Mon Apr 21 22:23:30 2008 +0000
firmware_sample_driver.c: fix coding style
Fix coding style in firmware_sample_driver...
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 6f69a6d776f6f5921d73ad9648e43d9b59afeff4
Author: Ville Syrjala <syrjala at sci.fi>
Date: Mon Apr 21 22:21:10 2008 +0000
MAINTAINERS: Add ati_remote2 driver
Add myself as the ati_remote2 driver maintainer.
Signed-off-by: Ville Syrjala <syrjala at sci.fi>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit fda6ab8bbe2a2276d491aed1358975c8c516a243
Author: Cyril Brulebois <cyril.brulebois at kerlabs.com>
Date: Mon Apr 21 22:19:05 2008 +0000
Documentation: Remove last references to BitKeeper.
Remove BitKeeper from dontdiff. Point to the klibc git repository
instead of old BitKeeper ones.
Signed-off-by: Cyril Brulebois <cyril.brulebois at kerlabs.com>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 5309fbcc475084e6c1566084f770cef927937b7b
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon Apr 21 22:17:12 2008 +0000
Remove documentation of non-existent sk_alloc arg
As you can see, there's no zero_it arg (in fact code always uses __GFP_ZERO).
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit f5264481c8049673e2cc8c7aca410931f571ba2d
Author: Pavel Machek <pavel at suse.cz>
Date: Mon Apr 21 22:15:06 2008 +0000
trivial: small cleanups
These are small cleanups all over the tree.
Trivial style and comment changes to
fs/select.c, kernel/signal.c, kernel/stop_machine.c & mm/pdflush.c
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit 1fb7c6e4cba35b5e7cef88b58d0a2ad164d801a5
Author: Jesper Juhl <jesper.juhl at gmail.com>
Date: Mon Apr 21 22:12:32 2008 +0000
Correct a few trivial tree details in Documentation/SubmittingPatches
Correct maintainer name and URL.
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
commit ec98c6b9b47df6df1c1fa6cf3d427414f8c2cf16
Author: David S. Miller <davem at davemloft.net>
Date: Sun Apr 20 02:14:23 2008 -0700
[SPARC]: Remove SunOS and Solaris binary support.
As per Documentation/feature-removal-schedule.txt
Signed-off-by: David S. Miller <davem at davemloft.net>
commit d7ee147d4f84219a44670eb0db3a91e58d14a81c
Author: Arnd Hannemann <hannemann at nets.rwth-aachen.de>
Date: Mon Apr 21 14:46:22 2008 -0700
tcp: Make use of before macro in tcp_input.c
Make use of tcp before macro.
Signed-off-by: Arnd Hannemann <hannemann at nets.rwth-aachen.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 02651d20a3f90dab8920dad00dec8f62f2b6a7ea
Author: Mark Asselstine <mark.asselstine at windriver.com>
Date: Mon Apr 21 14:44:16 2008 -0700
hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c
These cli()/sti() calls are made in start_timer() and are therefor
redundant since the register_lock is now used to protect register
io from within scc_isr() and write_scc() (where all calls to
start_timer() originate).
Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 92998dd4951a84cbde447eeac4af5770718864b8
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Mon Apr 21 14:33:16 2008 -0700
[NETNS]: Remove empty ->init callback.
The netns start-stop engine can happily live with any of
init or exit callbacks set to NULL.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit cdd04d98f6922f5a7ba52714f077140d42bc67c9
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Mon Apr 21 14:28:45 2008 -0700
[DCCP]: Convert do_gettimeofday() to getnstimeofday().
What do_gettimeofday() does is to call getnstimeofday() and
to convert the result from timespec{} to timeval{}.
We do not always need timeval{} and we can convert timespec{}
when we really need (to print).
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Acked-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 633d424bf33dab99e77b36210fbd1b996e7823df
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Mon Apr 21 14:25:23 2008 -0700
[NETNS]: Don't initialize err variable twice.
The ip6_route_net_init() performs some unneeded actions.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 2aed2827dfc2e7d2e385fc1580529a8fc7f33d47
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Mon Apr 21 14:23:03 2008 -0700
[NETNS]: The ip6_fib_timer can work with garbage on net namespace stop.
The del_timer() function doesn't guarantee, that the timer callback
is not active by the time it exits.
Thus, the fib6_net_exit() may kfree() all the data, that is required
by the fib6_run_gc(). The race window is tiny, but slab poisoning can
trigger this bug.
Using del_timer_sync() will cure this.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit fc215fe7e6f0420afee0e0987fcc311929ee662f
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Mon Apr 21 14:09:44 2008 -0500
[POWERPC] ppc32: Fix errata for 603 CPUs
603 CPUs have the same issue that some 750 CPUs have in that they can crash
in funny ways if a store from an FPU register instruction is executed on a
register that has never been initialized since power on. This patch fixes
it by making sure all FP registers have been properly initialized at kernel
boot.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit c1c76743e98346eb052b707f0e054377a09441d1
Author: Mike Frysinger <vapier at gentoo.org>
Date: Mon Apr 21 11:35:39 2008 -0500
dlm: linux/{dlm,dlm_device}.h: cleanup for userspace
linux/dlm_device.h uses types from dlm.h and types.h, so pull them in. The
dlm.h header should use __u## rather than uint##_t types and thus pull in
linux/types.h for it.
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Signed-off-by: David Teigland <teigland at redhat.com>
commit 3d564fa3472d36cd6aa70514c37b8bbbec5b17ab
Author: David Teigland <teigland at redhat.com>
Date: Mon Apr 14 14:06:29 2008 -0500
dlm: common max length definitions
Add central definitions for max lockspace name length and max resource
name length. The lack of central definitions has resulted in scattered
private definitions which we can now clean up, including an unused one
in dlm_device.h.
Signed-off-by: David Teigland <teigland at redhat.com>
commit 2402211a8389282fd2942fad4511f02c0eeeffc5
Author: David Teigland <teigland at redhat.com>
Date: Fri Mar 14 15:09:15 2008 -0500
dlm: move plock code from gfs2
Move the code that handles cluster posix locks from gfs2 into the dlm
so that it can be used by both gfs2 and ocfs2.
Signed-off-by: David Teigland <teigland at redhat.com>
commit d44e0fc704143624b3e88fbf8fbcfda7a83fd299
Author: David Teigland <teigland at redhat.com>
Date: Tue Mar 18 14:22:11 2008 -0500
dlm: recover nodes that are removed and re-added
If a node is removed from a lockspace, and then added back before the
dlm is notified of the removal, the dlm will not detect the removal
and won't clear the old state from the node. This is fixed by using a
list of added nodes so the membership recovery can detect when a newly
added node is already in the member list.
Signed-off-by: David Teigland <teigland at redhat.com>
commit 761b9d3ffc953c24ceb55d8e12ff7e02b17e0484
Author: David Teigland <teigland at redhat.com>
Date: Thu Feb 21 11:25:42 2008 -0600
dlm: save master info after failed no-queue request
When a NOQUEUE request fails, the rsb res_master field is unnecessarily
reset to -1, instead of leaving the valid master setting in place. We
want to save the looked-up master values while the rsb is on the "toss
list" so that another lookup can be avoided if the rsb is soon reused.
The fix is to simply leave res_master value alone.
Signed-off-by: David Teigland <teigland at redhat.com>
commit 170e19ab2900b7c959d7a0e627fd12f383efcfa1
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Feb 13 23:29:38 2008 +0200
dlm: make dlm_print_rsb() static
dlm_print_rsb() can now become static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David Teigland <teigland at redhat.com>
commit 5416b704aef0b7350073421f4f6ac1a21bc213e7
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Feb 13 16:54:29 2008 -0800
dlm: match signedness between dlm_config_info and cluster_set
cluster_set is only called from the macro CLUSTER_ATTR which defines read/write
access functions. Make the signedness match to avoid sparse warnings every time
CLUSTER_ATTR is used (lines 149-159) all of the form:
fs/dlm/config.c:149:1: warning: incorrect type in argument 3 (different signedness)
fs/dlm/config.c:149:1: expected unsigned int *info_field
fs/dlm/config.c:149:1: got int extern [toplevel] *<noident>
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: David Teigland <teigland at redhat.com>
commit cc216c5d429892872f70f76975e243aef7ad9db1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Apr 20 21:59:13 2008 -0700
Fix RCU list iterator use of 'rcu_dereference()'
The RCU iterators used 'rcu_dereference()' on an already-fetched RCU
pointer value, which defeats the whole point of the exercise.
When we dereference a pointer protected by RCU, we need to make sure
that we only fetch the value _once_, because if the compiler ends up
re-loading it due to register pressure, the newly reloaded value could
be different from the previously fetched one, and you get inconsistent
results.
Cleaned-up, fixed, and the pointless list_for_each_safe_rcu #define
deleted by Paul Kenney.
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 87c448c2f2dd734910617274637e726c82d0af25
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Sat Apr 19 10:48:34 2008 -0500
[PPC] Remove mpc885ads and mpc86x ads boards from arch/ppc
We have a board port in arch/powerpc so we dont need this one anymore.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 546be91915a17e4faa9df91caa3ace0c92efa3ab
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Sat Apr 19 10:41:43 2008 -0500
[PPC] Remove mpc8272 ads board from arch/ppc
We have a board port in arch/powerpc so we dont need this one anymore.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 99b56cad8d64279c075b4e1b0ca28347e3c5267a
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Mon Apr 21 09:50:25 2008 +0100
[ARM] pxa: fix 0e623941bec7e80c97b076d346327b31ae17d84a
Place the dependency against the correct config symbol.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit ee008b4cdfb7082e1a57d63911d39bed0817d7d4
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Sun Apr 20 17:41:11 2008 +0100
[ARM] 5009/1: magician: remove to-be-deprecated defines for pxa_gpio_mode
Alternate function and direction setting is now handled
by the MFP config code or the generic GPIO API.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 2f131958efb62535f85915776e434de74d5eb274
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Sun Apr 20 17:40:11 2008 +0100
[ARM] 5008/1: magician: add magician specific input GPIOs to MFP config
Some input pin configuration that is not handled by drivers. This should
serve mostly as documentation.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit a1999cd1c1c9230c850379f59525c4a585191ed5
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Sun Apr 20 17:39:12 2008 +0100
[ARM] 5007/1: magician: properly request GPIOs used by the machine code itself
Registers some GPIOs used in magician.c with the GPIO API.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit a393c46b493de18242105c7f7e713822d179a717
Author: Jaya Kumar <jayakumar.arm at gmail.com>
Date: Sun Apr 20 07:25:00 2008 +0100
[ARM] 5006/1: Gumstix GPIO header fixup and defconfig fixup
This patch adds the include of the GPIO header needed to make gumstix
build. The defconfig is updated to 2.6.25 and disables PCMCIA since
that has not yet been implemented for gumstix.
Signed-off-by: Jaya Kumar <jayakumar.lkml at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit f25c3d613b12b4b6219d03e9930cac5f59541468
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Mon Apr 21 02:34:08 2008 -0700
[IPV4]: Convert do_gettimeofday() to getnstimeofday().
What do_gettimeofday() does is to call getnstimeofday() and
to convert the result from timespec{} to timeval{}.
After that, these callers convert the result again to msec.
Use getnstimeofday() and convert the units at once.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 263173af5b4635c07dd862255e5b767cd429c640
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 02:31:23 2008 -0700
[IPV4]: Make icmp_sk_init() static.
This patch makes the needlessly global icmp_sk_init() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 280a34c87fe07cb15df19bd798b23740223350fb
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 21 02:29:32 2008 -0700
[IPV6]: Make struct ip6_prohibit_entry_template static.
This patch makes the needlessly global struct
ip6_prohibit_entry_template static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1f29b0584dcb695589407a11bb7533fe21fa47c4
Author: Satoru SATOH <satoru.satoh at gmail.com>
Date: Mon Apr 21 02:27:58 2008 -0700
tcp: Trivial fix to correct function name in a comment in net/ipv4/tcp.c
This is a trivial fix to correct function name in a comment in
net/ipv4/tcp.c.
Signed-off-by: Satoru SATOH <satoru.satoh at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 95fff33b8e306a4331024bbd31c0999d5bf48fcf
Author: Eric Paris <eparis at redhat.com>
Date: Thu Apr 17 14:42:10 2008 -0400
SELinux: one little, two little, three little whitespaces, the avc.c saga.
avc.c was bad. It had whitespace and syntax issues which are against
our coding style. I have had a little chat with it and the result of
that conversation looked like this patch.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 1872981b51dac9d1f5bcae17803bf368f7fa19cd
Author: Eric Paris <eparis at redhat.com>
Date: Thu Apr 17 14:15:45 2008 -0400
SELinux: cleanup on isle selinuxfs.c
Why would anyone just clean up white space all day? Because they were
out too late last night and don't want to think for a day. So here is a
nice clean selinuxfs.c patch.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 2ced3dfd3148fd8e2170ff06d6f72fd9f2f7b639
Author: Eric Paris <eparis at redhat.com>
Date: Thu Apr 17 13:37:12 2008 -0400
changing whitespace for fun and profit: policydb.c
More formatting changes. Aside from the 80 character line limit even
the checkpatch scripts like this file now. Too bad I don't get paid by
the lines of code I change.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 828dfe1da54fce81f80f97275353ba33be09a76e
Author: Eric Paris <eparis at redhat.com>
Date: Thu Apr 17 13:17:49 2008 -0400
SELinux: whitespace and formating fixes for hooks.c
All whitespace and formatting. Nothing interesting to see here. About
the only thing to remember is that we aren't supposed to initialize
static variables to 0/NULL. It is done for us and doing it ourselves
puts them in a different section.
With this patch running checkpatch.pl against hooks.c only gives us
complaints about busting the 80 character limit and declaring extern's
in .c files. Apparently they don't like it, but I don't feel like going
to the trouble of moving those to .h files...
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 744ba35e455b0d5cf4f85208a8ca0edcc9976b95
Author: Eric Paris <eparis at redhat.com>
Date: Thu Apr 17 11:52:44 2008 -0400
SELinux: clean up printks
Make sure all printk start with KERN_*
Make sure all printk end with \n
Make sure all printk have the word 'selinux' in them
Change "function name" to "%s", __func__ (found 2 wrong)
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 11670889380b144adfa5a91dc184c8f6300c4b28
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:34 2008 -0400
SELinux: sidtab.c whitespace, syntax, and static declaraction cleanups
This patch changes sidtab.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 5d55a345c09ef1708bd341395792931a66306ba6
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:33 2008 -0400
SELinux: services.c whitespace, syntax, and static declaraction cleanups
This patch changes services.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 1a5e6f8729266154f34c84d25bb83942f99ba002
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:32 2008 -0400
SELinux: mls.c whitespace, syntax, and static declaraction cleanups
This patch changes mls.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 719a2f8e5f7b07a3be0d59fdc6edeb8120653918
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:31 2008 -0400
SELinux: hashtab.c whitespace, syntax, and static declaraction cleanups
This patch changes hashtab.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 7696ee80ac037959fc708156255d1bfec1f9ad70
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:30 2008 -0400
SELinux: ebitmap.c whitespace, syntax, and static declaraction cleanups
This patch changes ebitmap.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 7c2b240ef2ae05a0081b4004176fd5838cecc4f6
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:29 2008 -0400
SELinux: conditional.c whitespace, syntax, and static declaraction cleanups
This patch changes conditional.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit eb5df9a7ae794a7e352e0582011e9e2b586051b5
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:28 2008 -0400
SELinux: avtab.c whitespace, syntax, and static declaraction cleanups
This patch changes avtab.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 3c1c88ab8ad8d1f7db74f719f2649a070190fd5e
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:27 2008 -0400
SELinux: xfrm.c whitespace, syntax, and static declaraction cleanups
This patch changes xfrm.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit bfff3aa49765eb10053b58ee220949cfcc7a1a80
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:26 2008 -0400
SELinux: nlmsgtab.c whitespace, syntax, and static declaraction cleanups
This patch changes nlmsgtab.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 7b6b239c805ab372145c8a43ffa25529923d2658
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:25 2008 -0400
SELinux: netnode.c whitespace, syntax, and static declaraction cleanups
This patch changes netnode.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit c544c028e45feceeb48b629456d0eb43adc8eaaf
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:24 2008 -0400
SELinux: netlink.c whitespace, syntax, and static declaraction cleanups
This patch changes netlink.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit a6aaafeecca7ea1ddb5d7dac09e468ae14751fcd
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:23 2008 -0400
SELinux: netlabel.c whitespace, syntax, and static declaraction cleanups
This patch changes netlabel.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 338366cbba686a06f9e17f33c31d533901e8639f
Author: Eric Paris <eparis at redhat.com>
Date: Fri Apr 18 17:38:22 2008 -0400
SELinux: netif.c whitespace, syntax, and static declaraction cleanups
This patch changes netif.c to fix whitespace and syntax issues. Things that
are fixed may include (does not not have to include)
whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
location of { around structs and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit fb199746303a6bfd6121834ec9e810471185c530
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Mon Apr 21 09:51:06 2008 +0200
block: fix blk_register_queue() return value
blk_register_queue() returns -ENXIO when queue->request_fn is NULL. But there
are some block drivers that call blk_register_queue() via add_disk() with
queue->request_fn == NULL. (For example, brd, loop)
Although no one checks return value of blk_register_queue(), this patch makes
it return 0 instead of -ENXIO when queue->request_fn is NULL,
Also this patch adds warning when blk_register_queue() and
blk_unregister_queue() are called with queue == NULL rather than ignore
invalid usage silently.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: Jens Axboe <axboe at kernel.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 2472892a3ce17b177cc0d8099a6391949c75abf2
Author: Andi Kleen <andi at firstfloor.org>
Date: Mon Apr 21 09:51:05 2008 +0200
block: fix memory hotplug and bouncing in block layer
Only noticed this while hacking something else, no test case.
blk_max_low_pfn is initialized once at bootup by the block layer from
max_low_pfn. But max_low_pfn is not necessarily constant over the runtime of
the system when you consider memory hotplug. What could happen if that
someone adds memory later the block layer wouldn't get updated and then start
bouncing memory unnecessarily.
Also on 64bit blk_max_low_pfn actually isn't needed because it just disables
bouncing essentially and there is no highmem. And nobody can pass pfns >
max_low_pfn to the block layer, because those wouldn't have a struct page and
I suspect block layer wouldn't be very happy without that.
So set BLK_BOUNCE_HIGH to infinity (-1ULL) on 64bit. That avoids the problem
of having to update it on memory hotadd.
On 32bit I kept the same behaviour because at least on i386
memory hotadd only adds HIGHMEM, never lowmem.
BLK_BOUNCE_ANY is always set to infinity on both 32 and 64bit.
Signed-off-by: Andi Kleen <ak at suse.de>
Cc: Jens Axboe <jens.axboe at oracle.com>
Acked-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit cece933994428974f7a0ee1e8843ba5bd0b18563
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Apr 21 09:51:04 2008 +0200
block: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit ee86418d39f28dd10d27c9d7906d8c26c1293e69
Author: Nick Andrew <nick at nick-andrew.net>
Date: Mon Apr 21 09:51:04 2008 +0200
Kconfig: clean up block/Kconfig help descriptions
Modify the help descriptions of block/Kconfig for clarity, accuracy and
consistency.
Refactor the BLOCK description a bit. The wording "This permits ... to be
removed" isn't quite right; the block layer is removed when the option is
disabled, whereas most descriptions talk about what happens when the option is
enabled. Reformat the list of what is affected by disabling the block layer.
Add more examples of large block devices to LBD and strive for technical
accuracy; block devices of size _exactly_ 2TB require CONFIG_LBD, not only
"bigger than 2TB". Also try to say (perhaps not very clearly) that the config
option is only needed when you want to have individual block devices of size
>= 2TB, for example if you had 3 x 1TB disks in your computer you'd have a
total storage size of 3TB but you wouldn't need the option unless you want to
aggregate those disks into a RAID or LVM.
Improve terminology and grammar on BLK_DEV_IO_TRACE.
I also added the boilerplate "If unsure, say N" to most options.
Precisely say "2TB and larger" for LSF.
Indent the help text for BLK_DEV_BSG by 2 spaces in accordance with the
standard.
Signed-off-by: Nick Andrew <nick at nick-andrew.net>
Cc: "Randy.Dunlap" <rdunlap at xenotime.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 6195057f5809e93cdb1ec733f7b9c87fe2212f98
Author: scameron at beardog.cca.cpqcorp.net <scameron at beardog.cca.cpqcorp.net>
Date: Thu Apr 17 13:19:04 2008 +0200
cciss: fix warning oops on rmmod of driver
* Fix oops on cciss rmmod due to calling pci_free_consistent with
irqs disabled.
Signed-off-by: Stephen M. Cameron <scameron at beardog.cca.cpqcorp.net>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit e14ac67026b46e94478134df9521682fc6501ac0
Author: scameron at beardog.cca.cpqcorp.net <scameron at beardog.cca.cpqcorp.net>
Date: Thu Apr 17 13:19:03 2008 +0200
cciss: Fix race between disk-adding code and interrupt handler
Fix race condition between cciss_init_one(), cciss_update_drive_info(),
and cciss_check_queues().
Signed-off-by: Stephen M. Cameron <scameron at beardog.cca.cpqcorp.net>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit f18573abcc57844a7c3c12699d40eead8728cd8a
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Fri Apr 11 12:56:52 2008 +0200
block: move the padding adjustment to blk_rq_map_sg
blk_rq_map_user adjusts bi_size of the last bio. It breaks the rule
that req->data_len (the true data length) is equal to sum(bio). It
broke the scsi command completion code.
commit e97a294ef6938512b655b1abf17656cf2b26f709 was introduced to fix
the above issue. However, the partial completion code doesn't work
with it. The commit is also a layer violation (scsi mid-layer should
not know about the block layer's padding).
This patch moves the padding adjustment to blk_rq_map_sg (suggested by
James). The padding works like the drain buffer. This patch breaks the
rule that req->data_len is equal to sum(sg), however, the drain buffer
already broke it. So this patch just restores the rule that
req->data_len is equal to sub(bio) without breaking anything new.
Now when a low level driver needs padding, blk_rq_map_user and
blk_rq_map_user_iov guarantee there's enough room for padding.
blk_rq_map_sg can safely extend the last entry of a scatter list.
blk_rq_map_sg must extend the last entry of a scatter list only for a
request that got through bio_copy_user_iov. This patches introduces
new REQ_COPY_USER flag.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Tejun Heo <htejun at gmail.com>
Cc: Mike Christie <michaelc at cs.wisc.edu>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit afdc1a780ef84a54b613dae6f971407748aab61c
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Fri Apr 11 12:56:51 2008 +0200
block: add bio_copy_user_iov support to blk_rq_map_user_iov
With this patch, blk_rq_map_user_iov uses bio_copy_user_iov when a low
level driver needs padding or a buffer in sg_iovec isn't aligned. That
is, it uses temporary kernel buffers instead of mapping user pages
directly.
When a LLD needs padding, later blk_rq_map_sg needs to extend the last
entry of a scatter list. bio_copy_user_iov guarantees that there is
enough space for padding by using temporary kernel buffers instead of
user pages.
blk_rq_map_user_iov needs buffers in sg_iovec to be aligned. The
comment in blk_rq_map_user_iov indicates that drivers/scsi/sg.c also
needs buffers in sg_iovec to be aligned. Actually, drivers/scsi/sg.c
works with unaligned buffers in sg_iovec (it always uses temporary
kernel buffers).
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Tejun Heo <htejun at gmail.com>
Cc: Mike Christie <michaelc at cs.wisc.edu>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit c5dec1c3034f1ae3503efbf641ff3b0273b64797
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Fri Apr 11 12:56:49 2008 +0200
block: convert bio_copy_user to bio_copy_user_iov
This patch enables bio_copy_user to take struct sg_iovec (renamed
bio_copy_user_iov). bio_copy_user uses bio_copy_user_iov internally as
bio_map_user uses bio_map_user_iov.
The major changes are:
- adds sg_iovec array to struct bio_map_data
- adds __bio_copy_iov that copy data between bio and
sg_iovec. bio_copy_user_iov and bio_uncopy_user use it.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Tejun Heo <htejun at gmail.com>
Cc: Mike Christie <michaelc at cs.wisc.edu>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 476a4813cfddf7cf159956cc0e2d3c830c1507e3
Author: Laurent Vivier <Laurent.Vivier at bull.net>
Date: Wed Mar 26 12:11:53 2008 +0100
loop: manage partitions in disk image
This patch allows to use loop device with partitionned disk image.
Original behavior of loop is not modified.
A new parameter is introduced to define how many partition we want to be
able to manage per loop device. This parameter is "max_part".
For instance, to manage 63 partitions / loop device, we will do:
# modprobe loop max_part=63
# ls -l /dev/loop?*
brw-rw---- 1 root disk 7, 0 2008-03-05 14:55 /dev/loop0
brw-rw---- 1 root disk 7, 64 2008-03-05 14:55 /dev/loop1
brw-rw---- 1 root disk 7, 128 2008-03-05 14:55 /dev/loop2
brw-rw---- 1 root disk 7, 192 2008-03-05 14:55 /dev/loop3
brw-rw---- 1 root disk 7, 256 2008-03-05 14:55 /dev/loop4
brw-rw---- 1 root disk 7, 320 2008-03-05 14:55 /dev/loop5
brw-rw---- 1 root disk 7, 384 2008-03-05 14:55 /dev/loop6
brw-rw---- 1 root disk 7, 448 2008-03-05 14:55 /dev/loop7
And to attach a raw partitionned disk image, the original losetup is used:
# losetup -f etch.img
# ls -l /dev/loop?*
brw-rw---- 1 root disk 7, 0 2008-03-05 14:55 /dev/loop0
brw-rw---- 1 root disk 7, 1 2008-03-05 14:57 /dev/loop0p1
brw-rw---- 1 root disk 7, 2 2008-03-05 14:57 /dev/loop0p2
brw-rw---- 1 root disk 7, 5 2008-03-05 14:57 /dev/loop0p5
brw-rw---- 1 root disk 7, 64 2008-03-05 14:55 /dev/loop1
brw-rw---- 1 root disk 7, 128 2008-03-05 14:55 /dev/loop2
brw-rw---- 1 root disk 7, 192 2008-03-05 14:55 /dev/loop3
brw-rw---- 1 root disk 7, 256 2008-03-05 14:55 /dev/loop4
brw-rw---- 1 root disk 7, 320 2008-03-05 14:55 /dev/loop5
brw-rw---- 1 root disk 7, 384 2008-03-05 14:55 /dev/loop6
brw-rw---- 1 root disk 7, 448 2008-03-05 14:55 /dev/loop7
# mount /dev/loop0p1 /mnt
# ls /mnt
bench cdrom home lib mnt root srv usr
bin dev initrd lost+found opt sbin sys var
boot etc initrd.img media proc selinux tmp vmlinuz
# umount /mnt
# losetup -d /dev/loop0
Of course, the same behavior can be done using kpartx on a loop device,
but modifying loop avoids to stack several layers of block device (loop +
device mapper), this is a very light modification (40% of modifications
are to manage the new parameter).
Signed-off-by: Laurent Vivier <Laurent.Vivier at bull.net>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 22a9189fd073db3d03a4cf8b8c098aa207602de1
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Wed Mar 26 12:09:38 2008 +0100
cdrom: use kmalloced buffers instead of buffers on stack
If cdrom commands are issued to a scsi drive in most cases the buffer will be
filled via dma. This leads to bad stack corruption on non coherent platforms,
because the buffers are neither cache line aligned nor is the size a multiple
of the cache line size. Using kmalloced buffers avoids this.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 0a0c4114df4a6903bccb65b06cabb6ddc968f877
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Wed Mar 26 12:09:02 2008 +0100
cdrom: make unregister_cdrom() return void
Now unregister_cdrom() always returns 0.
Make it return void and update all callers that check the return value.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: Adrian McMenamin <adrian at mcmen.demon.co.uk>
Cc: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 7fd097d42b90afadae4867db5d580bcd7b3b596d
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Wed Mar 26 12:09:02 2008 +0100
cdrom: use list_head for cdrom_device_info list
Use list_head for cdrom_device_info list instead of opencoded
singly list handling.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 032d8d90ba23e1770604bbb1102ec77f5aa8ae44
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Wed Mar 26 12:09:01 2008 +0100
cdrom: protect cdrom_device_info list by mutex
This patch protects the list of cdrom_device_info by cdrom_mutex
when the file in /proc/sys/dev/cdrom/ is written.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 3c3f4e012ab3471e8bd19220ed897ae9700e5fdd
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Wed Mar 26 12:09:00 2008 +0100
cdrom: cleanup hardcoded error-code
This patch eliminates hardcoded return value of register_cdrom().
It also changes the return value to -EINVAL.
It is more appropriate than -2 (-ENOENT) because it is only
happen invalid usage of register_cdrom() by broken cdrom driver.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 17672cf0a7cec57dea4c2a6705bd73114d5e9265
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Wed Mar 26 12:08:59 2008 +0100
cdrom: remove ifdef CONFIG_SYSCTL
This patch removes #ifdef for CONFIG_SYSCTL by defining empty
cdrom_sysctl_register and cdrom_sysctl_unregister when CONFIG_SYSCTL
is not defined.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 259aae864ceeb2b34e7bafa1ce18d096a357fab2
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Sat Apr 19 21:31:26 2008 +0200
hrtimer: optimize the softirq time optimization
The previous optimization did not take the case into account where a
clock provides its own softirq_get_time() function.
Check for the availablitiy of the clock get time function first and
then check if we need to retrieve the time for both clocks via
hrtimer_softirq_gettime() to avoid a double evaluation of time in that
case as well.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 833883d9ac4cfb31c1c4419335e68e6895a05b6b
Author: Dimitri Sivanich <sivanich at sgi.com>
Date: Fri Apr 18 13:39:00 2008 -0700
hrtimer: reduce calls to hrtimer_get_softirq_time()
It seems that hrtimer_run_queues() is calling hrtimer_get_softirq_time() more
often than it needs to. This can cause frequent contention on systems with
large numbers of processors/cores.
With this patch, hrtimer_run_queues only calls hrtimer_get_softirq_time() if
there is a pending timer in one of the hrtimer bases, and only once.
This also combines hrtimer_run_queues() and the inline run_hrtimer_queue()
into one function.
[ tglx at linutronix.de: coding style ]
Signed-off-by: Dimitri Sivanich <sivanich at sgi.com>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 833df317f9ada91488898b005f4641bb674a3bae
Author: Glauber Costa <gcosta at redhat.com>
Date: Fri Apr 18 13:38:58 2008 -0700
clockevents: fix typo in tick-broadcast.c
braodcast -> broadcast
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 3f34d024c12e49fbce4009d094ae1d287084e511
Author: Dave Young <hidave.darkstar at gmail.com>
Date: Fri Apr 18 13:38:57 2008 -0700
jiffies: add time_is_after_jiffies and others which compare with jiffies
Most of time_after like macros usages just compare jiffies and another number,
so here add some time_is_* macros for convenience.
Signed-off-by: Dave Young <hidave.darkstar at gmail.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit af40b485ea2d957ae2f237ab0e33539ae8f29562
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Thu Apr 17 10:22:27 2008 -0700
PCI: Change PCI subsystem MAINTAINER
Jesse foolishly volunteered to handle PCI patches. Update MAINTAINERS to
reflect this.
Woho! Time to kick back and relax...
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 80b20dd853a2b00802e6254dc9f690f0da1a925c
Author: mark gross <mgross at linux.intel.com>
Date: Fri Apr 18 13:53:58 2008 -0700
PCI: pci-iommu-iotlb-flushing-speedup
The following patch is an update to use an array instead of a list of
IOVA's in the implementation of defered iotlb flushes. It takes
inspiration from sba_iommu.c
I like this implementation better as it encapsulates the batch process
within intel-iommu.c, and no longer touches iova.h (which is shared)
Performance data: Netperf 32byte UDP streaming
2.6.25-rc3-mm1:
IOMMU-strict : 58Mps @ 62% cpu
NO-IOMMU : 71Mbs @ 41% cpu
List-based IOMMU-default-batched-IOTLB flush: 66Mbps @ 57% cpu
with this patch:
IOMMU-strict : 73Mps @ 75% cpu
NO-IOMMU : 74Mbs @ 42% cpu
Array-based IOMMU-default-batched-IOTLB flush: 72Mbps @ 62% cpu
Signed-off-by: <mgross at linux.intel.com>
Cc: Grant Grundler <grundler at parisc-linux.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a391f19717984a8f70756b29074298f379fcfdbc
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 18 13:53:57 2008 -0700
PCI: pci_setup_bridge() mustn't be __devinit
WARNING: drivers/pci/built-in.o(.text+0x28ee9): Section mismatch in reference from the function pci_bus_assign_resources() to the function .devinit.text:pci_setup_bridge()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 5468ae617035f06ae1e07c264d6cdfcd721b539f
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 18 13:53:56 2008 -0700
PCI: pci_bus_size_cardbus() mustn't be __devinit
WARNING: drivers/pci/built-in.o(.text+0x28e1f): Section mismatch in reference from the function pci_bus_size_bridges() to the function .devinit.text:pci_bus_size_cardbus()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7f7b5de2c0e10aa35ad9909edb1af9f2aed2f5d0
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 18 13:53:55 2008 -0700
PCI: pci_scan_device() mustn't be __devinit
WARNING: drivers/pci/built-in.o(.text+0x150f): Section mismatch in reference from the function pci_scan_single_device() to the function .devinit.text:pci_scan_device()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit cbd4e055fc8f09db82d31a5ff6cec3c083cc97a8
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Apr 18 13:53:55 2008 -0700
PCI: pci_alloc_child_bus() mustn't be __devinit
WARNING: drivers/pci/built-in.o(.text+0xc4c): Section mismatch in reference from the function pci_add_new_bus() to the function .devinit.text:pci_alloc_child_bus()
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 66bef8c059015ba2b36bb5759080336feb01e680
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Mon Mar 3 19:09:46 2008 -0800
PCI: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit ca99eb8c2d56bdfff0161388b81e641f4e039b3f
Author: Trent Piepho <tpiepho at freescale.com>
Date: Mon Apr 7 16:04:16 2008 -0700
PCI: Hotplug: fakephp: Return success, not ENODEV, when bus rescan is triggered
The 'power' attribute of the fakephp driver originally only let one turn a
slot off. If one tried to turn a slot on (echo 1 > .../power), it would
return ENODEV, as fakephp did not support this function.
An old (pre-git) patch changed this:
2004/11/11 16:33:31-08:00 jdittmer
[PATCH] fakephp: add pci bus rescan ability
http://article.gmane.org/gmane.linux.kernel/251183
Now writing "1" to the power attribute has the effect of triggering a bus
rescan, but it still returns ENODEV, probably an oversight in the above
patch.
Using the BusyBox echo will not produce an error message, but will
trigger *two* bus rescans (and return an exit code of 1):
~ # strace echo -n 1 > /sys/bus/pci/slots/0000:00:00.0/power
...
write(1, "1", 1) = -1 ENODEV (No such device)
write(1, "1", 1) = -1 ENODEV (No such device)
exit(1) = ?
Using cp gives a write error, even though the write did happen and a rescan
was triggered:
~ # echo -n 1 > tmp ; cp tmp /sys/bus/pci/slots/0000:00:00.0/power
cp: Write Error: No such device
It seems much better to return success instead of failure. The actual
status of the bus rescan is hard to return. It happens asynchronously in a
work thread, so the sysfs store functions returns before any status is
ready (the whole point of the work queue). And even if it didn't do this,
the rescan doesn't have any clear status to return.
Signed-off-by: Trent Piepho <tpiepho at freescale.com>
CC: Jan Dittmer <jdittmer at ppp0.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 029c3c133ba2c3e0e48fdfacc08324bb3fa2a571
Author: Jesper Juhl <jesper.juhl at gmail.com>
Date: Sat Mar 22 00:07:13 2008 +0100
PCI: Hotplug: Fix leaks in IBM Hot Plug Controller Driver - ibmphp_init_devno()
In drivers/pci/hotplug/ibmphp_core.c::ibmphp_init_devno() we allocate
space dynamically for a PCI irq routing table by calling
pcibios_get_irq_routing_table(), but we never free the allocated space.
This patch frees the allocated space at the function exit points.
Spotted by the Coverity checker. Compile tested only.
Please consider applying.
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 884525655d07fdee9245716b998ecdc45cdd8007
Author: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Date: Sun Mar 30 19:50:14 2008 +0400
PCI: clean up resource alignment management
Done per Linus' request and suggestions. Linus has explained that
better than I'll be able to explain:
On Thu, Mar 27, 2008 at 10:12:10AM -0700, Linus Torvalds wrote:
> Actually, before we go any further, there might be a less intrusive
> alternative: add just a couple of flags to the resource flags field (we
> still have something like 8 unused bits on 32-bit), and use those to
> implement a generic "resource_alignment()" routine.
>
> Two flags would do it:
>
> - IORESOURCE_SIZEALIGN: size indicates alignment (regular PCI device
> resources)
>
> - IORESOURCE_STARTALIGN: start field is alignment (PCI bus resources
> during probing)
>
> and then the case of both flags zero (or both bits set) would actually be
> "invalid", and we would also clear the IORESOURCE_STARTALIGN flag when we
> actually allocate the resource (so that we don't use the "start" field as
> alignment incorrectly when it no longer indicates alignment).
>
> That wouldn't be totally generic, but it would have the nice property of
> automatically at least add sanity checking for that whole "res->start has
> the odd meaning of 'alignment' during probing" and remove the need for a
> new field, and it would allow us to have a generic "resource_alignment()"
> routine that just gets a resource pointer.
Besides, I removed IORESOURCE_BUS_HAS_VGA flag which was unused for ages.
Signed-off-by: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Cc: Linus Torvalds <torvalds at linux-foundation.org>
Cc: Gary Hade <garyhade at us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d75b305295c38ba9610ff3b2200f7d1989dc55fd
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Mar 31 01:41:01 2008 +0300
PCI: aerdrv_acpi.c: remove unneeded NULL check
There's no reason for checking pdev->bus for being NULL here (and we'd
anyway Oops 3 lines below if it was).
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit bc043274560f398225dad7f0e24c6a7610d3c08a
Author: Tim Yamin <tim.yamin at zonbu.com>
Date: Sun Mar 30 20:58:59 2008 +0100
PCI: Update VIA CX700 quirk
This follows up 53a9bf4267b8b1f958dbeb7c8c1ef21c82229b71. Some newer
CX700 BIOSes from our vendor have PCI Bus Parking disabled but PCI
Master read caching enabled. This creates problems such as system
freezing when both the network controller and the USB controller are
active and one of them is pretty busy (e.g. heavy network traffic).
This patch separates the checks and both the bus parking and the read
caching are disabled independently if either is enabled by the BIOS.
Signed-off-by: Tim Yamin <tim.yamin at zonbu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 94e6108803469a37ee1e3c92dafdd1d59298602f
Author: Ben Hutchings <bhutchings at solarflare.com>
Date: Wed Mar 5 16:52:39 2008 +0000
PCI: Expose PCI VPD through sysfs
Vital Product Data (VPD) may be exposed by PCI devices in several
ways. It is generally unsafe to read this information through the
existing interfaces to user-land because of stateful interfaces.
This adds:
- abstract operations for VPD access (struct pci_vpd_ops)
- VPD state information in struct pci_dev (struct pci_vpd)
- an implementation of the VPD access method specified in PCI 2.2
(in access.c)
- a 'vpd' binary file in sysfs directories for PCI devices with VPD
operations defined
It adds a probe for PCI 2.2 VPD in pci_scan_device() and release of
VPD state in pci_release_dev().
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 5e0d2a6fc094a9b5047998deefeb1254c66856ee
Author: mark gross <mgross at linux.intel.com>
Date: Tue Mar 4 15:22:08 2008 -0800
PCI: iommu: iotlb flushing
This patch is for batching up the flushing of the IOTLB for the DMAR
implementation found in the Intel VT-d hardware. It works by building a list
of to be flushed IOTLB entries and a bitmap list of which DMAR engine they are
from.
After either a high water mark (250 accessible via debugfs) or 10ms the list
of iova's will be reclaimed and the DMAR engines associated are IOTLB-flushed.
This approach recovers 15 to 20% of the performance lost when using the IOMMU
for my netperf udp stream benchmark with small packets. It can be disabled
with a kernel boot parameter "intel_iommu=strict".
Its use does weaken the IOMMU protections a bit.
Signed-off-by: Mark Gross <mgross at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 0255f543d9888fb5c5fbcd265ca2eee2d6ecff6a
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Mar 4 15:22:07 2008 -0800
PCI: simplify quirk debug output
print_fn_descriptor_symbol() prints the address if we don't have a symbol,
so no need to print both.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit ddf02886cbe665d67ca750750196ea5bf524b10b
Author: mark gross <mgross at linux.intel.com>
Date: Tue Mar 4 15:22:04 2008 -0800
PCI: iova RB tree setup tweak
The following patch merges two functions into one allowing for a 3%
reduction in overhead in locating, allocating and inserting pages for
use in IOMMU operations.
Its a bit of a eye-crosser so I welcome any RB-tree / MM experts to take
a look. It works by re-using some of the information gathered in the
search for the pages to use in setting up the IOTLB's in the insertion
of the iova structure into the RB tree.
Signed-off-by: <mgross at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c9e9e0bfc52ae93c246149c3b9d3a1e11677ca1a
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Mar 4 11:56:55 2008 -0700
PCI: parisc: use generic pci_enable_resources()
Use the generic pci_enable_resources() instead of the arch-specific code.
Unlike this arch-specific code, the generic version:
- checks PCI_NUM_RESOURCES (11), not DEVICE_COUNT_RESOURCE (12), resources
- skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set
- skips ROM resources unless IORESOURCE_ROM_ENABLE is set
- checks for resource collisions with "!r->parent"
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-by: Kyle McMartin <kyle at mcmartin.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e789920d0497bb3d7eb146382b9ca8137662fabb
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Mar 4 11:56:57 2008 -0700
PCI: ppc: use generic pci_enable_resources()
Use the generic pci_enable_resources() instead of the arch-specific code.
Unlike this arch-specific code, the generic version:
- checks PCI_NUM_RESOURCES (11), not 6, resources
- skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set
- skips ROM resources unless IORESOURCE_ROM_ENABLE is set
- checks for resource collisions with "!r->parent", not IORESOURCE_UNSET
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7cfb5f9aaec6f0fc45ff323841e6d62f67e7ffad
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Mar 4 11:56:56 2008 -0700
PCI: powerpc: use generic pci_enable_resources()
Use the generic pci_enable_resources() instead of the arch-specific code.
The generic version is functionally equivalent, but uses dev_printk.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d981f163fe7af0c55db585fbf513a8e14803a6e8
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Mar 4 11:56:52 2008 -0700
PCI: ia64: use generic pci_enable_resources()
Use the generic pci_enable_resources() instead of the arch-specific code.
Unlike this arch-specific code, the generic version:
- does not check for a NULL dev pointer
- skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 10f000a2fd805e8ccfe988e8615545467bb7f7df
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Mar 4 11:56:48 2008 -0700
PCI: alpha: use generic pci_enable_resources()
Use the generic pci_enable_resources() instead of the arch-specific code.
Unlike this arch-specific code, the generic version:
- skips resources unless requested in "mask"
- skips ROM resources unless IORESOURCE_ROM_ENABLE is set
- checks for resource collisions with "!r->parent"
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b81d988c04cacb1f7ffb76cbff2d150eb9f02948
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Mar 4 11:57:01 2008 -0700
PCI: x86: use generic pci_enable_resources()
Use the generic pci_enable_resources() instead of the arch-specific code.
Unlike this arch-specific code, the generic version:
- checks for resource collisions with "!r->parent"
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 842de40d93e00a5c40a1a7f520a6fbe422994e99
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Tue Mar 4 11:56:47 2008 -0700
PCI: add generic pci_enable_resources()
Each architecture has its own pcibios_enable_resources() implementation.
These differ in many minor ways that have nothing to do with actual
architectural differences. Follow-on patches will make most arches
use this generic version instead.
This version is based on powerpc, which seemed most up-to-date. The only
functional difference from the x86 version is that this uses "!r->parent"
to check for resource collisions instead of "!r->start && r->end".
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 7d715a6c1ae5785d00fb9a876b5abdfc43abc44b
Author: Shaohua Li <shaohua.li at intel.com>
Date: Mon Feb 25 09:46:41 2008 +0800
PCI: add PCI Express ASPM support
PCI Express ASPM defines a protocol for PCI Express components in the D0
state to reduce Link power by placing their Links into a low power state
and instructing the other end of the Link to do likewise. This
capability allows hardware-autonomous, dynamic Link power reduction
beyond what is achievable by software-only controlled power management.
However, The device should be configured by software appropriately.
Enabling ASPM will save power, but will introduce device latency.
This patch adds ASPM support in Linux. It introduces a global policy for
ASPM, a sysfs file /sys/module/pcie_aspm/parameters/policy can control
it. The interface can be used as a boot option too. Currently we have
below setting:
-default, BIOS default setting
-powersave, highest power saving mode, enable all available ASPM
state and clock power management
-performance, highest performance, disable ASPM and clock power
management
By default, the 'default' policy is used currently.
In my test, power difference between powersave mode and performance mode
is about 1.3w in a system with 3 PCIE links.
Note: some devices might not work well with aspm, either because chipset
issue or device issue. The patch provide API (pci_disable_link_state),
driver can disable ASPM for specific device.
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 657472e9ccd9fccb82b775eb691c4b25b27451da
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Feb 18 09:44:13 2008 -0700
PCI: remove "pci=routeirq" noise from dmesg
The "pci=routeirq" option was added in 2004, and I don't get any valid
reports anymore. The option is still mentioned in kernel-parameters.txt.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit cb3576fa34e36907e292f408cb6c258f4fd112ad
Author: Gary Hade <garyhade at us.ibm.com>
Date: Fri Feb 8 14:00:52 2008 -0800
PCI: Include PCI domain in PCI bus names on x86/x86_64
The PCI bus names included in /proc/iomem and /proc/ioports are
of the form 'PCI Bus #XX' where XX is the bus number. This patch
changes the naming to 'PCI Bus XXXX:YY' where XXXX is the domain
number and YY is the bus number. For example, PCI bus 14 in
domain 0 will show as 'PCI Bus 0000:14' instead of 'PCI Bus #14'.
This change makes the naming consistent with other architectures
such as ia64 where multiple PCI domain support has been around
longer.
Signed-off-by: Gary Hade <garyhade at us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 21c6847406784fde73ad5ea47c2c3434714d58d1
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Feb 4 23:50:11 2008 -0800
PCI: #if 0 pci_cleanup_aer_correct_error_status()
#if 0 the no longer used pci_cleanup_aer_correct_error_status().
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Stephen Hemminger <shemminger at linux-foundation.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4c44bac8645e0ce0249c53cc154f56b5543af232
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Sat Feb 2 22:24:47 2008 -0800
PCI: pcie AER: don't check _OSC when acpi is disabled
[PATCH] pcie AER: don't check _OSC when acpi is disabled
when acpi=off or pci=noacpi, get warning
AER service couldn't init device 0000:00:0a.0:pcie01 - no _OSC support
AER service couldn't init device 0000:00:0e.0:pcie01 - no _OSC support
AER service couldn't init device 0000:00:0f.0:pcie01 - no _OSC support
AER service couldn't init device 0000:80:0b.0:pcie01 - no _OSC support
AER service couldn't init device 0000:80:0e.0:pcie01 - no _OSC support
AER service couldn't init device 0000:80:0f.0:pcie01 - no _OSC support
so don't check _OSC in aer_osc_setup
Signed-off-by: Yinghai Lu <yinghai.lu at sun.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 5ff580c10ec06fd296bd23d4570c1a95194094a0
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Thu Feb 14 14:56:56 2008 -0800
PCI: remove global list of PCI devices
This patch finally removes the global list of PCI devices. We are
relying entirely on the list held in the driver core now, and do not
need a separate "shadow" list as no one uses it.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c71c68a04ba7672b9373ef04173114c211bb9f88
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Wed Feb 20 15:14:24 2008 -0600
PCI: remove parisc consumer of the pci global_list
Remove the parisc usage of the global_list, as it's not needed anymore.
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6355f3d1c6994812e4384027b785989323dd7c75
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Thu Feb 14 14:56:56 2008 -0800
PCI: remove pcibios_fixup_ghosts()
This function was obviously never being used since early 2.5 days as any
device that it would try to remove would never really be removed from
the system due to the PCI device list being held in the driver core, not
the general list of PCI devices.
As we have not had a single report of a problem here in 4 years, I think
it's safe to remove now.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 8a1bc9013a03d41a0e36ee413bb6f97281b30bd1
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Thu Feb 14 14:56:56 2008 -0800
PCI: add is_added flag to struct pci_dev
This lets us check if the device is really added to the driver core or
not, which is what we need when walking some of the bus lists. The flag
is there in anticipation of getting rid of the other PCI device list,
which is what we used to check in this situation.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 70308923d317f2ad4973c30d90bb48ae38761317
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Feb 13 22:30:39 2008 -0800
PCI: make no_pci_devices() use the pci_bus_type list
no_pci_devices() should use the driver core list of PCI devices, not our
"separate" one.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 1ba6ab11d8fbd8d29afec4e39236e1255ae0339a
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Feb 13 15:06:38 2008 -0800
PCI: remove initial bios sort of PCI devices on x86
We currently keep 2 lists of PCI devices in the system, one in the
driver core, and one all on its own. This second list is sorted at boot
time, in "BIOS" order, to try to remain compatible with older kernels
(2.2 and earlier days). There was also a "nosort" option to turn this
sorting off, to remain compatible with even older kernel versions, but
that just ends up being what we have been doing from 2.5 days...
Unfortunately, the second list of devices is not really ever used to
determine the probing order of PCI devices or drivers[1]. That is done
using the driver core list instead. This change happened back in the
early 2.5 days.
Relying on BIOS ording for the binding of drivers to specific device
names is problematic for many reasons, and userspace tools like udev
exist to properly name devices in a persistant manner if that is needed,
no reliance on the BIOS is needed.
Matt Domsch and others at Dell noticed this back in 2006, and added a
boot option to sort the PCI device lists (both of them) in a
breadth-first manner to help remain compatible with the 2.4 order, if
needed for any reason. This option is not going away, as some systems
rely on them.
This patch removes the sorting of the internal PCI device list in "BIOS"
mode, as it's not needed at all anymore, and hasn't for many years.
I've also removed the PCI flags for this from some other arches that for
some reason defined them, but never used them.
This should not change the ordering of any drivers or device probing.
[1] The old-style pci_get_device and pci_find_device() still used this
sorting order, but there are very few drivers that use these functions,
as they are deprecated for use in this manner. If for some reason, a
driver rely on the order and uses these functions, the breadth-first
boot option will resolve any problem.
Cc: Matt Domsch <Matt_Domsch at dell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3b57eff02c37c79e6254884d374a6a9233e11efc
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Feb 13 13:32:24 2008 -0800
PCI Hotplug: the ibm driver is not dependant on PCI_LEGACY
This was marked incorrectly for some reason. Allow the ibmphp driver to
be built even if PCI_LEGACY is not enabled.
Cc: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 33ae6ef26d65ef5d15e80d95a9df1252eaed93e8
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Feb 13 13:32:24 2008 -0800
PCI Hotplug: make cpcihp driver use modern apis
This removes the depandancy of the cpcihp driver from the PCI_LEGACY
config option by removing its usage of the pci_find_bus() function.
Cc: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Scott Murray <scottm at somanetworks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 95247b57ed844511a212265b45cf9a919753aea1
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Feb 13 11:03:58 2008 -0800
PCI: clean up search.c a lot
This cleans up the search.c file, now using the pci list of devices that
are created for the driver core, instead of relying on our separate list
of devices. It's better to use the functions already created for this
kind of thing, instead of rolling our own all the time.
This work is done in anticipation of getting rid of that second list of
pci devices all together.
And it ends up saving code, always a nice benefit.
This also removes one compiler warning for when CONFIG_PCI_LEGACY is
enabled as we no longer internally use the deprecated functions anymore.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 34220909a26b7f7cfc71e88ce01856c2563fe1d4
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Feb 13 09:32:03 2008 -0800
PCI: remove pci_get_device_reverse
This removes the pci_get_device_reverse function as there should not be
any need to walk pci devices backwards anymore. All users of this call
are now gone from the tree, so it is safe to remove it.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a2b5d877840f29b5fbb5f53b63dfcbf8bc0aea47
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Feb 13 09:32:03 2008 -0800
PCI: remove pci_get_device_reverse from calgary driver
This isn't needed, we can just walk the devices in bus order with no
problems at all, as we really want to remove pci_get_device_reverse from
the kernel tree.
Acked-by: Muli Ben-Yehuda <muli at il.ibm.com>
Cc: Jon Mason <jdmason at kudzu.us>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 448432c4b8e2e3189177d6dbd16b8a8d83c5c11c
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Tue Feb 12 13:36:20 2008 -0800
PCI: remove pci_find_present
No one is using this function anymore for quite some time, so remove it.
Everyone calls pci_dev_present() instead anyway...
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 2baad5f96b498812626eadb6f6af3eb41d8656a3
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Feb 13 23:30:12 2008 +0200
PCI: #if 0 pci_assign_resource_fixed()
An unused function that bloated the kernel only when CONFIG_EMBEDDED was
enabled...
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4b5ff469234b8ab5cd05f4a201cbb229896729d0
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Mon Mar 10 17:16:32 2008 -0700
PCI: doc/pci: create Documentation/PCI/ and move files into it
Create Documentation/PCI/ and move PCI-related files to it.
Fix a few instances of trailing whitespace.
Update references to the new file locations.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c49a7f182c44c31ea460093eb263110824f6c98e
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Wed Apr 16 19:24:42 2008 +0800
[HWRNG] omap: Minor updates
Minor cleanups to the OMAP RNG:
- Comment update re RNG status:
* yes, it works on 16xx; "rngtest" is quite happy
* it's fast enough that polling vs IRQ is a non-issue
- Get rid of BUG_ON
- Help GCC not be stupid about inlining (object code shrink)
- Remove "sparse" warning
- Cope with new hotplug rule requiring "platform:" modalias
And make the file header match kernel conventions.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 584fffc8b1965cc09ebc4b7608bafcbf12ad5244
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Sat Apr 5 21:04:48 2008 +0800
[CRYPTO] kconfig: Ordering cleanup
Ciphers, block modes, name it, are grouped together and sorted.
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 3af5b90bde5000abc739996cb03fd718e753d053
Author: Kamalesh Babulal <kamalesh at linux.vnet.ibm.com>
Date: Sat Apr 5 21:00:57 2008 +0800
[CRYPTO] all: Clean up init()/fini()
On Thu, Mar 27, 2008 at 03:40:36PM +0100, Bodo Eggert wrote:
> Kamalesh Babulal <kamalesh at linux.vnet.ibm.com> wrote:
>
> > This patch cleanups the crypto code, replaces the init() and fini()
> > with the <algorithm name>_init/_fini
>
> This part ist OK.
>
> > or init/fini_<algorithm name> (if the
> > <algorithm name>_init/_fini exist)
>
> Having init_foo and foo_init won't be a good thing, will it? I'd start
> confusing them.
>
> What about foo_modinit instead?
Thanks for the suggestion, the init() is replaced with
<algorithm name>_mod_init ()
and fini () is replaced with <algorithm name>_mod_fini.
Signed-off-by: Kamalesh Babulal <kamalesh at linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 7dc748e4e720c1a98185363096ad7582e9113092
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Tue Apr 1 21:24:50 2008 +0800
[CRYPTO] padlock-aes: Use generic setkey function
The Padlock AES setkey routine is the same as exported by the generic
implementation. So we could use it.
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Cc: Michal Ludvig <michal at logix.cz>
Tested-by: Stefan Hellermann <stefan at the2masters.de>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 5427663f498e19b441277de72ce7a685511f247c
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Tue Apr 1 20:58:51 2008 +0800
[CRYPTO] aes: Export generic setkey
The key expansion routine could be get little more generic, become
a kernel doc entry and then get exported.
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Tested-by: Stefan Hellermann <stefan at the2masters.de>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit c3715cb90f722b1cf5f6f073be02cc8a49659b90
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Sun Mar 30 16:36:09 2008 +0800
[CRYPTO] api: Make the crypto subsystem fully modular
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 76cb9521795a167ae3d206343c072f602d84f815
Author: Kevin Coffman <kwc at citi.umich.edu>
Date: Mon Mar 24 21:26:16 2008 +0800
[CRYPTO] cts: Add CTS mode required for Kerberos AES support
Implement CTS wrapper for CBC mode required for support of AES
encryption support for Kerberos (rfc3962).
Signed-off-by: Kevin Coffman <kwc at citi.umich.edu>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit fd4609a8e00a867303783ade62d67953fb72adc8
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Fri Mar 14 16:22:53 2008 +0800
[CRYPTO] lrw: Replace all adds to big endians variables with be*_add_cpu
replace all:
big_endian_variable = cpu_to_beX(beX_to_cpu(big_endian_variable) +
expression_in_cpu_byteorder);
with:
beX_add_cpu(&big_endian_variable, expression_in_cpu_byteorder);
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: David S. Miller <davem at davemloft.net>
Cc: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit f0df30b1f7f2bf8588613b2c012b8859b06849f1
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Thu Mar 13 20:29:07 2008 +0800
[CRYPTO] tcrypt: Change the XTEA test vectors
The third test vector of ECB-XTEA-ENC fails for me all other
are fine. I could not find a RFC or something else where they
are defined. The test vector has not been modified since git
started recording histrory. The implementation is very close
(not to say equal) to what is available as Public Domain (they
recommend 64 rounds and the in kernel uses 32). Therefore I
belive that there is typo somewhere and tcrypt reported always
*fail* instead of *okey*.
This patch replaces input + result of the third test vector with
result + input from the third decryption vector. The key is the
same, the other three test vectors are also the reverse.
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit de224c309b5631bdaae3fcd6880cfb93b52f5a53
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Thu Mar 13 20:21:51 2008 +0800
[CRYPTO] tcrypt: Shrink the tcrypt module
Currently the tcrypt module is about 2 MiB on x86-32. The
main reason for the huge size is the data segment which contains
all the test vectors for each algorithm. The test vectors are
staticly allocated in an array and the size of the array has been
drastically increased by the merge of the Salsa20 test vectors.
With a hint from Benedigt Spranger I found a way how I could
convert those fixed-length arrays to strings which are flexible
in size. VIM and regex were also very helpfull :)
So, I am talking about a shrinking of ~97% on x86-32:
text data bss dec hex filename
18309 2039708 20 2058037 1f6735 tcrypt-b4.ko
45628 23516 80 69224 10e68 tcrypt.ko
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 562954d5e01d08154cf15c7e12e6e9ec803f50f7
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Thu Mar 13 20:20:28 2008 +0800
[CRYPTO] tcrypt: Change the usage of the test vectors
The test routines (test_{cipher,hash,aead}) are makeing a copy
of the test template and are processing the encryption process
in place. This patch changes the creation of the copy so it will
work even if the source address of the input data isn't an array
inside of the template but a pointer.
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 48c8949ea8460216783dd33640121187b9531b60
Author: Jan Engelhardt <jengelh at computergmbh.de>
Date: Thu Mar 13 19:37:45 2008 +0800
[CRYPTO] api: Constify function pointer tables
Signed-off-by: Jan Engelhardt <jengelh at computergmbh.de>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 744b5a28109e6a107c24a1426ee22f92b17995e9
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Tue Mar 11 21:29:47 2008 +0800
[CRYPTO] aes-x86-32: Remove unused return code
The return parameter isn't used remove it.
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit d5dc392742a9818e2766a63f3533980543e18060
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Tue Mar 11 21:27:11 2008 +0800
[CRYPTO] tcrypt: Shrink speed templates
The speed templates as it look always the same. The key size
is repeated for each block size and we test always the same
block size. The addition of one inner loop makes it possible
to get rid of the struct and it is possible to use a tiny
u8 array :)
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 477035c2abdcff7583369e5777cb7be1bb1dbea8
Author: Sebastian Siewior <sebastian at breakpoint.cc>
Date: Tue Mar 11 21:24:26 2008 +0800
[CRYPTO] tcrypt: Group common speed templates
Some crypto ciphers which are impleneted support similar key sizes
(16,24 & 32 byte). They can be grouped together and use a common
templatte instead of their own which contains the same data.
Signed-off-by: Sebastian Siewior <sebastian at breakpoint.cc>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 78f8b3a24022c48fe600f4aba415d63ceeaec9cd
Author: Jan Glauber <jang at linux.vnet.ibm.com>
Date: Thu Mar 6 19:55:38 2008 +0800
[CRYPTO] sha512: Rename sha512 to sha512_generic
Rename sha512 to sha512_generic and add a MODULE_ALIAS for sha512
so all sha512 implementations can be loaded automatically.
Keep the broken tabs so git recognizes this as a rename.
Signed-off-by: Jan Glauber <jang at linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 4e2c6d7f4d8f466f4420e10dda7126537de09c94
Author: Jan Glauber <jang at linux.vnet.ibm.com>
Date: Thu Mar 6 19:53:50 2008 +0800
[CRYPTO] sha384: Hardware acceleration for s390
Exploit the System z10 hardware acceleration for SHA384.
Signed-off-by: Jan Glauber <jang at linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 291dc7c0996b09a7c58b2cf6e9cc3495123a607e
Author: Jan Glauber <jang at linux.vnet.ibm.com>
Date: Thu Mar 6 19:52:00 2008 +0800
[CRYPTO] sha512: Hardware acceleration for s390
Exploit the System z10 hardware acceleration for SHA512.
Signed-off-by: Jan Glauber <jang at linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 604973f1fe41b817c1badb3df2008fe641e50ae6
Author: Jan Glauber <jang at linux.vnet.ibm.com>
Date: Thu Mar 6 19:50:20 2008 +0800
[CRYPTO] s390: Generic sha_update and sha_final
The sha_{update|final} functions are similar for every sha variant.
Since that is error-prone and redundant replace these functions by
a shared generic implementation for s390.
Signed-off-by: Jan Glauber <jang at linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 607424d8583365418a337aa51e83403c8bd213ed
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Wed Mar 5 19:27:51 2008 +0800
[CRYPTO] api: Switch to proc_create()
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 896c6fa1e59dd17e1ac2877c25cab19bbb24e666
Author: Jeff Garzik <jeff at garzik.org>
Date: Wed Oct 31 05:42:50 2007 -0400
[ISDN] minor irq handler cleanups
- reference irq number in CardState structure
- remove now-unused 'intno' argument from rs_interrupt_elsa()
- cs->irq_func() should be defined using standard irq_handler_t
- add KERN_DEBUG to printk() where appropriate
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9d29672c64505f2d7f707701b829715705308a69
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Sun Apr 20 16:07:43 2008 -0700
[NET]: Expose netdevice dev_id through sysfs
Expose dev_id to userspace, because it helps to disambiguate between
interfaces where the MAC address is unique.
This should allow us to simplify the handling of persistent naming for
S390 network devices in udev -- because it can depend on a simple
attribute of the device like the other match criteria, rather than
having a special case for SUBSYSTEMS=="ccwgroup".
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f7d0e5a506396419eb731b6c6cd97ed23c9245c7
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Sun Apr 20 16:06:22 2008 -0700
skbuff: fix missing kernel-doc notation
Add kernel-doc notation for ndisc_nodetype:
Warning(linux-2.6.25-git2//include/linux/skbuff.h:340): No description found for parameter 'ndisc_nodetype'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a6f97b293b08877d945ea3f28926aa446dd7ca2e
Author: Jeff Garzik <jeff at garzik.org>
Date: Wed Oct 31 05:20:49 2007 -0400
drivers/char: minor irq handler cleanups
- remove always-false tests
- don't overload 'irq' argument, pass data properly via dev_id
- remove pointless casts from void*
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 047f7617eba3653ff3bcfbe902986903fff2ed3b
Author: Bernard Pidoux <f6bvp at amsat.org>
Date: Sun Apr 20 15:58:07 2008 -0700
[ROSE]: Fix soft lockup wrt. rose_node_list_lock
[ INFO: possible recursive locking detected ]
2.6.25 #3
---------------------------------------------
ax25ipd/3811 is trying to acquire lock:
(rose_node_list_lock){-+..}, at: [<f8d31f1a>] rose_get_neigh+0x1a/0xa0
[rose]
but task is already holding lock:
(rose_node_list_lock){-+..}, at: [<f8d31fed>]
rose_route_frame+0x4d/0x620 [rose]
other info that might help us debug this:
6 locks held by ax25ipd/3811:
#0: (&tty->atomic_write_lock){--..}, at: [<c0259a1c>]
tty_write_lock+0x1c/0x50
#1: (rcu_read_lock){..--}, at: [<c02aea36>] net_rx_action+0x96/0x230
#2: (rcu_read_lock){..--}, at: [<c02ac5c0>] netif_receive_skb+0x100/0x2f0
#3: (rose_node_list_lock){-+..}, at: [<f8d31fed>]
rose_route_frame+0x4d/0x620 [rose]
#4: (rose_neigh_list_lock){-+..}, at: [<f8d31ff7>]
rose_route_frame+0x57/0x620 [rose]
#5: (rose_route_list_lock){-+..}, at: [<f8d32001>]
rose_route_frame+0x61/0x620 [rose]
stack backtrace:
Pid: 3811, comm: ax25ipd Not tainted 2.6.25 #3
[<c0147e27>] print_deadlock_bug+0xc7/0xd0
[<c0147eca>] check_deadlock+0x9a/0xb0
[<c0149cd2>] validate_chain+0x1e2/0x310
[<c0149b95>] ? validate_chain+0xa5/0x310
[<c010a7d8>] ? native_sched_clock+0x88/0xc0
[<c0149fa1>] __lock_acquire+0x1a1/0x750
[<c014a5d1>] lock_acquire+0x81/0xa0
[<f8d31f1a>] ? rose_get_neigh+0x1a/0xa0 [rose]
[<c03201a3>] _spin_lock_bh+0x33/0x60
[<f8d31f1a>] ? rose_get_neigh+0x1a/0xa0 [rose]
[<f8d31f1a>] rose_get_neigh+0x1a/0xa0 [rose]
[<f8d32404>] rose_route_frame+0x464/0x620 [rose]
[<c031ffdd>] ? _read_unlock+0x1d/0x20
[<f8d31fa0>] ? rose_route_frame+0x0/0x620 [rose]
[<f8d1c396>] ax25_rx_iframe+0x66/0x3b0 [ax25]
[<f8d1f42f>] ? ax25_start_t3timer+0x1f/0x40 [ax25]
[<f8d1e65b>] ax25_std_frame_in+0x7fb/0x890 [ax25]
[<c0320005>] ? _spin_unlock_bh+0x25/0x30
[<f8d1bdf6>] ax25_kiss_rcv+0x2c6/0x800 [ax25]
[<c02a4769>] ? sock_def_readable+0x59/0x80
[<c014a8a7>] ? __lock_release+0x47/0x70
[<c02a4769>] ? sock_def_readable+0x59/0x80
[<c031ffdd>] ? _read_unlock+0x1d/0x20
[<c02a4769>] ? sock_def_readable+0x59/0x80
[<c02a4d3a>] ? sock_queue_rcv_skb+0x13a/0x1d0
[<c02a4c45>] ? sock_queue_rcv_skb+0x45/0x1d0
[<f8d1bb30>] ? ax25_kiss_rcv+0x0/0x800 [ax25]
[<c02ac715>] netif_receive_skb+0x255/0x2f0
[<c02ac5c0>] ? netif_receive_skb+0x100/0x2f0
[<c02af05c>] process_backlog+0x7c/0xf0
[<c02aeb0c>] net_rx_action+0x16c/0x230
[<c02aea36>] ? net_rx_action+0x96/0x230
[<c012bd53>] __do_softirq+0x93/0x120
[<f8d2a68a>] ? mkiss_receive_buf+0x33a/0x3f0 [mkiss]
[<c012be37>] do_softirq+0x57/0x60
[<c012c265>] local_bh_enable_ip+0xa5/0xe0
[<c0320005>] _spin_unlock_bh+0x25/0x30
[<f8d2a68a>] mkiss_receive_buf+0x33a/0x3f0 [mkiss]
[<c025ea37>] pty_write+0x47/0x60
[<c025c620>] write_chan+0x1b0/0x220
[<c0259a1c>] ? tty_write_lock+0x1c/0x50
[<c011fec0>] ? default_wake_function+0x0/0x10
[<c0259bea>] tty_write+0x12a/0x1c0
[<c025c470>] ? write_chan+0x0/0x220
[<c018bbc6>] vfs_write+0x96/0x130
[<c0259ac0>] ? tty_write+0x0/0x1c0
[<c018c24d>] sys_write+0x3d/0x70
[<c0104d1e>] sysenter_past_esp+0x5f/0xa5
=======================
BUG: soft lockup - CPU#0 stuck for 61s! [ax25ipd:3811]
Pid: 3811, comm: ax25ipd Not tainted (2.6.25 #3)
EIP: 0060:[<c010a9db>] EFLAGS: 00000246 CPU: 0
EIP is at native_read_tsc+0xb/0x20
EAX: b404aa2c EBX: b404a9c9 ECX: 017f1000 EDX: 0000076b
ESI: 00000001 EDI: 00000000 EBP: ecc83afc ESP: ecc83afc
DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
CR0: 8005003b CR2: b7f5f000 CR3: 2cd8e000 CR4: 000006f0
DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
DR6: ffff0ff0 DR7: 00000400
[<c0204937>] delay_tsc+0x17/0x30
[<c02048e9>] __delay+0x9/0x10
[<c02127f6>] __spin_lock_debug+0x76/0xf0
[<c0212618>] ? spin_bug+0x18/0x100
[<c0147923>] ? __lock_contended+0xa3/0x110
[<c0212998>] _raw_spin_lock+0x68/0x90
[<c03201bf>] _spin_lock_bh+0x4f/0x60
[<f8d31f1a>] ? rose_get_neigh+0x1a/0xa0 [rose]
[<f8d31f1a>] rose_get_neigh+0x1a/0xa0 [rose]
[<f8d32404>] rose_route_frame+0x464/0x620 [rose]
[<c031ffdd>] ? _read_unlock+0x1d/0x20
[<f8d31fa0>] ? rose_route_frame+0x0/0x620 [rose]
[<f8d1c396>] ax25_rx_iframe+0x66/0x3b0 [ax25]
[<f8d1f42f>] ? ax25_start_t3timer+0x1f/0x40 [ax25]
[<f8d1e65b>] ax25_std_frame_in+0x7fb/0x890 [ax25]
[<c0320005>] ? _spin_unlock_bh+0x25/0x30
[<f8d1bdf6>] ax25_kiss_rcv+0x2c6/0x800 [ax25]
[<c02a4769>] ? sock_def_readable+0x59/0x80
[<c014a8a7>] ? __lock_release+0x47/0x70
[<c02a4769>] ? sock_def_readable+0x59/0x80
[<c031ffdd>] ? _read_unlock+0x1d/0x20
[<c02a4769>] ? sock_def_readable+0x59/0x80
[<c02a4d3a>] ? sock_queue_rcv_skb+0x13a/0x1d0
[<c02a4c45>] ? sock_queue_rcv_skb+0x45/0x1d0
[<f8d1bb30>] ? ax25_kiss_rcv+0x0/0x800 [ax25]
[<c02ac715>] netif_receive_skb+0x255/0x2f0
[<c02ac5c0>] ? netif_receive_skb+0x100/0x2f0
[<c02af05c>] process_backlog+0x7c/0xf0
[<c02aeb0c>] net_rx_action+0x16c/0x230
[<c02aea36>] ? net_rx_action+0x96/0x230
[<c012bd53>] __do_softirq+0x93/0x120
[<f8d2a68a>] ? mkiss_receive_buf+0x33a/0x3f0 [mkiss]
[<c012be37>] do_softirq+0x57/0x60
[<c012c265>] local_bh_enable_ip+0xa5/0xe0
[<c0320005>] _spin_unlock_bh+0x25/0x30
[<f8d2a68a>] mkiss_receive_buf+0x33a/0x3f0 [mkiss]
[<c025ea37>] pty_write+0x47/0x60
[<c025c620>] write_chan+0x1b0/0x220
[<c0259a1c>] ? tty_write_lock+0x1c/0x50
[<c011fec0>] ? default_wake_function+0x0/0x10
[<c0259bea>] tty_write+0x12a/0x1c0
[<c025c470>] ? write_chan+0x0/0x220
[<c018bbc6>] vfs_write+0x96/0x130
[<c0259ac0>] ? tty_write+0x0/0x1c0
[<c018c24d>] sys_write+0x3d/0x70
[<c0104d1e>] sysenter_past_esp+0x5f/0xa5
=======================
Since rose_route_frame() does not use rose_node_list we can safely
remove rose_node_list_lock spin lock here and let it be free for
rose_get_neigh().
Signed-off-by: Bernard Pidoux <f6bvp at amsat.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e8f39549580e04e0b8edd11bae834ae7f8322fc8
Author: Jeff Garzik <jeff at garzik.org>
Date: Wed Oct 31 05:15:20 2007 -0400
[PPC] minor irq handler cleanups
- whitespace cleanups
- remove pointless prototype (uses always follow func implementation)
- 'irq' argument is used here purely as a local variable. rename
argument to 'dummy' and define 'irq' as local to make this plain.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
Acked-by: Kumar Gala <galak at kernel.crashing.org>
commit 349a2444cfcd6c078a8410c19cd7a950ff89bd96
Author: Jeff Garzik <jeff at garzik.org>
Date: Wed Oct 31 05:11:45 2007 -0400
[BLACKFIN] minor irq handler cleanups
- use standard irq_handler_t to define irq handler function arguments
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 5dc0742b41066e1e141f2b4b00557e563a83fccc
Author: Jeff Garzik <jeff at garzik.org>
Date: Wed Oct 31 05:08:48 2007 -0400
[SPARC] minor irq handler cleanups
- mark timer_interrupt() static
- sparc_floppy_request_irq() prototype should use irq_handler_t
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
Acked-by: David S. Miller <davem at davemloft.net>
commit 90968eb5a415a0fe6ffb617af35b3a5321bd4497
Author: Jeff Garzik <jeff at garzik.org>
Date: Wed Oct 31 05:07:08 2007 -0400
ARM minor irq handler cleanup: avoid passing unused info to irq
Reduce human confusion a bit, by /not/ passing an unused value to
arm_rtc_interrupt()
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8349304d12cf1313bdbd6eb2083701d86809be24
Author: Jeff Garzik <jeff at garzik.org>
Date: Wed Oct 31 03:42:07 2007 -0400
[ISDN] Hisax: eliminate many unnecessary references to CardType[]
For the vast majority of CardType[card->typ] uses (but not all!),
the string is constant for each driver. Therefore, we may replace
CardType[card->typ] with the actual string describing the driver, making
each printk() a bit more simple.
This also has the nice, intended side effect of greatly reducing
external references to hisax global CardType[]. This will be of value
once the ISDN drivers are converted to the ISA/PCI/PNP hotplug APIs.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d38c8475b4f3a684ac673dcedc88ffdb17b74882
Author: Jeff Garzik <jeff at garzik.org>
Date: Fri Feb 15 23:41:15 2008 -0500
[ISDN] HiSax: modularization prep
Pass a function pointer into the core HiSax probe function checkcard(),
in order to facilitate modular drivers passing in their own setup
routines.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d8d9075cf6023340a1603720a9a59815f14a5219
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sun Apr 20 16:40:47 2008 +0100
[ARM] fix lh7a40x/kev7a400 build
arch/arm/mach-lh7a40x/arch-kev7a400.c: In function `kev7a400_cpld_handler':
arch/arm/mach-lh7a40x/arch-kev7a400.c:80: error: structure has no member named `handle'
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 434b825e1fc9ef7971fc962734278ffbab36a1ab
Author: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Date: Sun Apr 20 18:00:33 2008 +0300
UBI: print media information earlier
Print information about logicale eraseblock size, sub-page
size and so on at early stage, befor an attempt to attach
the MTD device was made. This is more convenient to do so
because the attempt to attach may fail, and the information
is never printed then.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
commit 14b3ca4022f050f8622ed282b734ddf445464583
Author: Paul Mackerras <paulus at samba.org>
Date: Sun Apr 20 17:57:10 2008 +1000
[POWERPC] Fix compile breakage for 64-bit UP configs
The rearrangements in 945feb174b14e7098cc7ecf0cf4768d35bc52f9c
("[POWERPC] irqtrace support for 64-bit powerpc") caused 64-bit
non-SMP configs to fail to compile with a message about
local_irq_save being undefined in include/linux/proportions.h.
This follows the lead of x86 in including <linux/irqflags.h> in
asm/system.h, which fixes the problem.
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 9c0c44dbd9bc380bee53e2f768c4ad5410b8aae2
Author: Roland McGrath <roland at redhat.com>
Date: Sun Apr 20 08:19:24 2008 +1000
[POWERPC] Define copy_siginfo_from_user32
Define the copy_siginfo_from_user32 entry point for powerpc, so
that generic CONFIG_COMPAT code can call it. We already had the
code rolled into compat_sys_rt_sigqueueinfo, this just moves it
out into the canonical function that other arch's define.
Signed-off-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit e4cc58944c1e2ce41e3079d4eb60c95e7ce04b2b
Author: Andreas Schwab <schwab at suse.de>
Date: Sun Apr 20 02:25:13 2008 +1000
[POWERPC] Add compat handler for PTRACE_GETSIGINFO
Current versions of gdb require a working implementation of
PTRACE_GETSIGINFO for proper watchpoint support. Since struct siginfo
contains pointers it must be converted when passed to a 32-bit debugger.
Signed-off-by: Andreas Schwab <schwab at suse.de>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 585468e5d5962660867c269e26f0a4b89a599473
Author: Jochen Friedrich <jochen at scram.de>
Date: Sat Apr 19 00:23:03 2008 +1000
[POWERPC] i2c: Fix build breakage introduced by OF helpers
Fix build breakage introduced in commit "[POWERPC] i2c: OF helpers for
the i2c API". If i2c-core is compiled as a module, the helper needs
to be compiled as a module, as well. Rename i2c.c to of_i2c.c to
avoid name space conflict.
[paulus at samba.org: Changed dependency from OF to PPC_OF to avoid
sparc{32,64} allmodconfig breakage.]
Signed-off-by: Jochen Friedrich <jochen at scram.de>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit ee959b00c335d7780136c5abda37809191fe52c3
Author: Tony Jones <tonyj at suse.de>
Date: Fri Feb 22 00:13:36 2008 +0100
SCSI: convert struct class_device to struct device
It's big, but there doesn't seem to be a way to split it up smaller...
Signed-off-by: Tony Jones <tonyj at suse.de>
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Cc: Roland Dreier <rolandd at cisco.com>
Cc: Sean Hefty <sean.hefty at intel.com>
Cc: Hal Rosenstock <hal.rosenstock at gmail.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 56d110e852b0b1c85ad6c9bfe1cb4473ceb16402
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Tue Mar 11 12:50:38 2008 -0700
DRM: remove unused dev_class
The struct class_device *dev_class is not used in the struct drm_head
structure at all, so remove it as class_device is being removed entirely
from the kernel.
Cc: David Airlie <airlied at linux.ie>
Cc: Tony Jones <tonyj at suse.de>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 05321937469a8592d6a6d35f1d38ca882d243044
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Thu Mar 6 00:13:36 2008 +0100
IB: rename "dev" to "srp_dev" in srp_host structure
This sets us up to be able to convert the srp_host to use a struct
device instead of a class_device.
Based on a original patch from Tony Jones, but split up into this piece
by Greg.
Signed-off-by: Tony Jones <tonyj at suse.de>
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Reviewed-by: Roland Dreier <rolandd at cisco.com>
Cc: Sean Hefty <sean.hefty at intel.com>
Cc: Hal Rosenstock <hal.rosenstock at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit f4e91eb4a81559da87a3843758a641b5cc590b65
Author: Tony Jones <tonyj at suse.de>
Date: Fri Feb 22 00:13:36 2008 +0100
IB: convert struct class_device to struct device
This converts the main ib_device to use struct device instead of struct
class_device as class_device is going away.
Signed-off-by: Tony Jones <tonyj at suse.de>
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Cc: Roland Dreier <rolandd at cisco.com>
Cc: Sean Hefty <sean.hefty at intel.com>
Cc: Hal Rosenstock <hal.rosenstock at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c4c66cf1787d408066fbfc69209185701f5df15f
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Tue Mar 4 00:13:36 2008 +0100
memstick: convert struct class_device to struct device
struct class_device is going away, struct device should be used instead.
Signed-off-by: Tony Jones <tonyj at suse.de>
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Cc: Alex Dubov <oakad at yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 2b3a302a09735276e13421db56c20045a48eb06d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Mar 4 16:41:05 2008 -0800
driver core: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 2424b5dd062cbe3e0578ae7b11a1b360ad22f451
Author: Dan Williams <dan.j.williams at intel.com>
Date: Mon Apr 7 15:35:01 2008 -0700
sysfs: refill attribute buffer when reading from offset 0
Requiring userspace to close and re-open sysfs attributes has been the
policy since before 2.6.12. It allows userspace to get a consistent
snapshot of kernel state and consume it with incremental reads and seeks.
Now, if the file position is zero the kernel assumes userspace wants to see
the new value. The application for this change is to allow a userspace
RAID metadata handler to check the state of an array without causing any
memory allocations. Thus not causing writeback to a raid array that might
be blocked waiting for userspace to take action.
Cc: Neil Brown <neilb at suse.de>
Acked-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b844eba292b477cda14582bfc6f535deed57a82d
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date: Sun Mar 23 20:28:24 2008 +0100
PM: Remove destroy_suspended_device()
After 2.6.24 there was a plan to make the PM core acquire all device
semaphores during a suspend/hibernation to protect itself from
concurrent operations involving device objects. That proved to be
too heavy-handed and we found a better way to achieve the goal, but
before it happened, we had introduced the functions
device_pm_schedule_removal() and destroy_suspended_device() to allow
drivers to "safely" destroy a suspended device and we had adapted some
drivers to use them. Now that these functions are no longer necessary,
it seems reasonable to remove them and modify their users to use the
normal device unregistration instead.
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Acked-by: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 138fe4e069798d9aa948a5402ff15e58f483ee4e
Author: Konrad Rzeszutek <ketuzsezr at darnok.org>
Date: Wed Apr 9 19:50:41 2008 -0700
Firmware: add iSCSI iBFT Support
Add /sysfs/firmware/ibft/[initiator|targetX|ethernetX] directories along with
text properties which export the the iSCSI Boot Firmware Table (iBFT)
structure.
What is iSCSI Boot Firmware Table? It is a mechanism for the iSCSI tools to
extract from the machine NICs the iSCSI connection information so that they
can automagically mount the iSCSI share/target. Currently the iSCSI
information is hard-coded in the initrd. The /sysfs entries are read-only
one-name-and-value fields.
The usual set of data exposed is:
# for a in `find /sys/firmware/ibft/ -type f -print`; do echo -n "$a: "; cat $a; done
/sys/firmware/ibft/target0/target-name: iqn.2007.com.intel-sbx44:storage-10gb
/sys/firmware/ibft/target0/nic-assoc: 0
/sys/firmware/ibft/target0/chap-type: 0
/sys/firmware/ibft/target0/lun: 00000000
/sys/firmware/ibft/target0/port: 3260
/sys/firmware/ibft/target0/ip-addr: 192.168.79.116
/sys/firmware/ibft/target0/flags: 3
/sys/firmware/ibft/target0/index: 0
/sys/firmware/ibft/ethernet0/mac: 00:11:25:9d:8b:01
/sys/firmware/ibft/ethernet0/vlan: 0
/sys/firmware/ibft/ethernet0/gateway: 192.168.79.254
/sys/firmware/ibft/ethernet0/origin: 0
/sys/firmware/ibft/ethernet0/subnet-mask: 255.255.252.0
/sys/firmware/ibft/ethernet0/ip-addr: 192.168.77.41
/sys/firmware/ibft/ethernet0/flags: 7
/sys/firmware/ibft/ethernet0/index: 0
/sys/firmware/ibft/initiator/initiator-name: iqn.2007-07.com:konrad.initiator
/sys/firmware/ibft/initiator/flags: 3
/sys/firmware/ibft/initiator/index: 0
For full details of the IBFT structure please take a look at:
ftp://ftp.software.ibm.com/systems/support/system_x_pdf/ibm_iscsi_boot_firmware_table_v1.02.pdf
[akpm at linux-foundation.org: fix build]
Signed-off-by: Konrad Rzeszutek <konradr at linux.vnet.ibm.com>
Cc: Mike Christie <michaelc at cs.wisc.edu>
Cc: Peter Jones <pjones at redhat.com>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 95bc6a10830de469eee94c17fb1c37b3b1430715
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Fri Mar 28 14:22:52 2008 -0700
PM: Remove legacy PM (fix)
Source file was removed. Need to remove docbook reference also.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Pavel Machek <pavel at suse.cz>
Cc: Rafael J. Wysocki <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c6a2a3dc26da72e431c293d02549593f9c041f63
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Thu Mar 27 01:13:34 2008 -0400
Kobject: Replace list_for_each() with list_for_each_entry().
Use the more concise list_for_each_entry(), which allows for the
deletion of the to_kobj() routine at the same time.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c6f87733823d69a8f12e391688ceeb1ff4922530
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Thu Mar 13 22:41:52 2008 -0400
SYSFS: Explicitly include required header file slab.h.
After an experimental deletion of the unnecessary inclusion of
<linux/slab.h> from the header file <linux/percpu.h>, the following
files under fs/sysfs were exposed as needing to explicitly include
<linux/slab.h>.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3f62e5700b2a679ae987b32a68126dd6dcf2488f
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Thu Mar 13 17:07:03 2008 -0400
Driver core: make device_is_registered() work for class devices
device_is_registered() can use the kobject value for this, so it will
now work with devices that are associated with only a class, not a bus
and a driver.
Cc: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9a3df1f7de0ecaf77a1dde86f2a4dc020f37f87e
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Wed Mar 19 22:39:13 2008 +0100
PM: Convert wakeup flag accessors to inline functions
This patch (as1058) improves the wakeup macros in include/linux/pm.h.
All but the trivial ones are converted to inline routines, which
requires moving them to a separate header file since they depend on
the definition of struct device.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d288e47c471e1090e80c62ad95882fafbf3f499d
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Wed Mar 19 22:37:42 2008 +0100
PM: Make wakeup flags available whenever CONFIG_PM is set
The various wakeup flags and their accessor macros in struct
dev_pm_info should be available whenever CONFIG_PM is enabled, not
just when CONFIG_PM_SLEEP is on. Otherwise remote wakeup won't always
be configurable for runtime power management. This patch (as1056b)
fixes the oversight.
David Brownell adds:
More accurately, fixes the "regression" ... as noted sometime
last summer, after 296699de6bdc717189a331ab6bbe90e05c94db06
introduced CONFIG_SUSPEND. But that didn't make the regression
list for that kernel, ergo the delay in fixing it.
[rjw: rebased]
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 74081f8667d73ad59961cf63be5f0e9d6a87c8a3
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Wed Mar 19 22:35:13 2008 +0100
PM: Fix misuse of wakeup flag accessors in serial core
This patch (as1059) fixes a mistake in the way the serial core
initializes a device's wakeup settings. It should use the accessor
routine instead of relying on a macro producing an lvalue.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 57eee3d23e8833ca18708b374c648235691942ba
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date: Wed Mar 12 00:59:38 2008 +0100
Driver core: Call device_pm_add() after bus_add_device() in device_add()
Include dpm_sysfs_add() into device_pm_add(), in analogy with
device_pm_remove(), and modify device_add() to call the latter after
bus_add_device(), to avoid situations in which the PM core may
attempt to suspend a device the registration of which has not been
successful.
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Acked-by: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 58aca23226a19983571bd3b65167521fc64f5869
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date: Wed Mar 12 00:57:22 2008 +0100
PM: Handle device registrations during suspend/resume
Modify the PM core to protect its data structures, specifically the
dpm_active list, from being corrupted if a child of the currently
suspending device is registered concurrently with its ->suspend()
callback. In that case, since the new device (the child) is added
to dpm_active after its parent, the PM core will attempt to
suspend it after the parent, which is wrong.
Introduce a new member of struct dev_pm_info, called 'sleeping',
and use it to check if the parent of the device being added to
dpm_active has been suspended, in which case the device registration
fails. Also, use 'sleeping' for checking if the ordering of devices
on dpm_active is correct.
Introduce variable 'all_sleeping' that will be set to 'true' once all
devices have been suspended and make new device registrations fail
until 'all_sleeping' is reset to 'false', in order to avoid having
unsuspended devices around while the system is going into a sleep state.
Remove pm_sleep_rwsem which is not necessary any more.
Special thanks to Alan Stern for discussions and suggestions that
lead to the creation of this patch.
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Acked-by: Pavel Machek <pavel at ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6bcf19d02a5d7e627fa054f2f10e0a8d830df326
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Sun Mar 9 21:26:02 2008 +0100
block: send disk "change" event for rescan_partitions()
Userspace likes to get notified that the disk may have changed, when
rescan_partitions() is called after partitioning or media change. It will
make it possible to update the state of the disk with the "change" event,
before the following partition "add" events are handled.
Cc: David Zeuthen <david at fubar.dk>
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit da009f39f85a3ee9deeb10f0f05ddd4efdd67020
Author: Ben Dooks <ben at fluff.org>
Date: Tue Mar 4 15:09:06 2008 -0800
sysdev: detect multiple driver registrations
I've just found how easy it is to accidentally register a sysdev_driver for
two different classes. When this happens, bad things happen as the
sysdev_driver structure keeps has the list entry for the driver
registration.
The following patch makes a WARN_ON() if this happens, although I think
BUG_ON or returning -EAGAIN could also be valid responses to this.
Signed-off-by: Ben Dooks <ben at fluff.org>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6c847402e1c69c1cfe2bddeadc8391bacbb3d0a5
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Tue Mar 4 15:09:05 2008 -0800
driver core: cpu: fix section mismatch in cpu.c:store_online
Fix following warning:
WARNING: vmlinux.o(.text+0x64609c): Section mismatch in reference from the function store_online() to the function .cpuinit.text:cpu_up()
store_online() is defined inside a HOTPLUG_CPU block so references are OK.
Ignore references by annotating store_online() with __ref.
Note: This is needed because cpu_up() most likely should not have been
__cpuinit but all the hotplug cpu code misuses the __cpuinit annotation.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 35d313b8744dc64c31b9cfcdb083112937643b45
Author: Pavel Machek <pavel at ucw.cz>
Date: Thu Feb 21 13:58:10 2008 +0100
power_state: remove it from driver core
power_state is scheduled for removal, and it is used only for debug
prints by driver core. Remove it.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 0c81eed4b9d6273124c7ab5eb99760b4d3a3cb9e
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Thu Feb 21 00:35:54 2008 +0100
PNP: add all PNP card device id's as individual aliases
The current PNP combined card + devices module aliase can
never ever match anything, because these values are not available
all at the same time to request a module.
Instead of adding the combined alias, we add the device id's
all as individual aliases. Device id's are exported by the PNP
bus and can now properly used to request the loading of a
matching module.
The module snd-sbawe currently exports aliases, which can never
match anything:
alias: pnp:cCTLXXXXdCTL0045dCTL0022*
alias: pnp:cCTLXXXXdCTL0044dCTL0023*
alias: pnp:cCTLXXXXdCTL0042dCTL0022*
alias: pnp:cCTLXXXXdCTL0041dCTL0021*
alias: pnp:cCTLXXXXdCTL0031dCTL0021*
alias: pnp:cCTL00eddCTL0041dCTL0070*
alias: pnp:cCTL00e9dCTL0045dCTL0022*
alias: pnp:cCTL00e4dCTL0045dCTL0022*
alias: pnp:cCTL00c7dCTL0045dCTL0022*
alias: pnp:cCTL00c5dCTL0045dCTL0022*
alias: pnp:cCTL00c3dCTL0045dCTL0022*
alias: pnp:cCTL00c1dCTL0042dCTL0022*
alias: pnp:cCTL00b2dCTL0044dCTL0023*
alias: pnp:cCTL009edCTL0044dCTL0023*
alias: pnp:cCTL009ddCTL0042dCTL0022*
alias: pnp:cCTL009fdCTL0041dCTL0021*
alias: pnp:cCTL009cdCTL0041dCTL0021*
alias: pnp:cCTL009adCTL0041dCTL0021*
alias: pnp:cCTL0054dCTL0031dCTL0021*
alias: pnp:cCTL0048dCTL0031dCTL0021*
alias: pnp:cCTL0047dCTL0031dCTL0021*
alias: pnp:cCTL0046dCTL0031dCTL0021*
alias: pnp:cCTL0045dCTL0031dCTL0021*
alias: pnp:cCTL0044dCTL0031dCTL0021*
alias: pnp:cCTL0043dCTL0031dCTL0021*
alias: pnp:cCTL0042dCTL0031dCTL0021*
alias: pnp:cCTL0039dCTL0031dCTL0021*
alias: pnp:cCTL0035dCTL0031dCTL0021*
With this patch it exports only the device id's, as properly
matchable aliases:
alias: pnp:dCTL0070*
alias: pnp:dCTL0045*
alias: pnp:dCTL0023*
alias: pnp:dCTL0044*
alias: pnp:dCTL0022*
alias: pnp:dCTL0042*
alias: pnp:dCTL0041*
alias: pnp:dCTL0021*
alias: pnp:dCTL0031*
Now, the exported value of the PNP bus can be used to autoload
a matching module:
$ modprobe --first-time -n -v pnp:dCTL0045
insmod /lib/modules/2.6.24-rc6-g5b825ed2-dirty/kernel/sound/core/snd-rawmidi.ko
insmod /lib/modules/2.6.24-rc6-g5b825ed2-dirty/kernel/sound/drivers/mpu401/snd-mpu401-uart.ko
insmod /lib/modules/2.6.24-rc6-g5b825ed2-dirty/kernel/sound/core/snd-hwdep.ko
insmod /lib/modules/2.6.24-rc6-g5b825ed2-dirty/kernel/sound/isa/sb/snd-sb-common.ko
insmod /lib/modules/2.6.24-rc6-g5b825ed2-dirty/kernel/sound/isa/sb/snd-sb16-csp.ko
insmod /lib/modules/2.6.24-rc6-g5b825ed2-dirty/kernel/sound/isa/sb/snd-sb16-dsp.ko
insmod /lib/modules/2.6.24-rc6-g5b825ed2-dirty/kernel/sound/drivers/opl3/snd-opl3-lib.ko
insmod /lib/modules/2.6.24-rc6-g5b825ed2-dirty/kernel/sound/isa/sb/snd-sbawe.ko
$ grep CTL0045 /sys/bus/pnp/devices/*/id
/sys/bus/pnp/devices/01:01.00/id:CTL0045
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4b65fc8cfbd1d1cfcc78865af72608e3b6cc9d9b
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Wed Feb 20 16:07:07 2008 -0800
firmware: clean up samples for coding style issues
This fixes up a number of coding style issues in the firmware sample files.
Yeah, it still doesn't build properly yet, that's next...
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Marcel Holtmann <marcel at holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d289bf7bdd84d636054acb0b3d14a4708f8a8233
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Feb 20 13:20:50 2008 -0800
firmware: move firmware_class from Documentation/ to samples/
Move the firmware_class sample drivers to samples/ so that they are
buildable and can be maintained.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Acked-by: Marcel Holtmann <marcel at holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3612e06b2c1cec41e9a59da3eec673a206af4643
Author: David Rientjes <rientjes at google.com>
Date: Tue Feb 19 17:39:02 2008 -0800
sysfs: small header file cleanup for SYSFS=n
Convert sysfs_remove_bin_file() to have a return type of 'void' for
!CONFIG_SYSFS configurations. Also removes unnecessary colons from empty
void functions.
Signed-off-by: David Rientjes <rientjes at google.com>
Reviewed-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 1429db83e276c2a16c7ea83bdcf0dcd3a36e406d
Author: Joe Perches <joe at perches.com>
Date: Tue Feb 26 19:08:42 2008 -0800
driver core: Convert debug functions declared inline __attribute__((format (printf,x,y) to statement expression macros
When DEBUG is not defined, pr_debug and dev_dbg and some
other local debugging functions are specified as:
"inline __attribute__((format (printf, x, y)))"
This is done to validate printk arguments when not debugging.
Converting these functions to macros or statement expressions
"do { if (0) printk(fmt, ##arg); } while (0)"
or
"({ if (0) printk(fmt, ##arg); 0; })
makes at least gcc 4.2.2 produce smaller objects.
This has the additional benefit of allowing the optimizer to
avoid calling functions like print_mac that might have been
arguments to the printk.
defconfig x86 current:
$ size vmlinux
text data bss dec hex filename
4716770 474560 618496 5809826 58a6a2 vmlinux
all converted: (More patches follow)
$ size vmlinux
text data bss dec hex filename
4716642 474560 618496 5809698 58a622 vmlinux
Even kernel/sched.o, which doesn't even use these
functions, becomes smaller.
It appears that merely having an indirect include
of <linux/device.h> can cause bigger objects.
$ size sched.inline.o sched.if0.o
text data bss dec hex filename
31385 2854 328 34567 8707 sched.inline.o
31366 2854 328 34548 86f4 sched.if0.o
The current preprocessed only kernel/sched.i file contains:
# 612 "include/linux/device.h"
static inline __attribute__((always_inline)) int __attribute__ ((format (printf, 2, 3)))
dev_dbg(struct device *dev, const char *fmt, ...)
{
return 0;
}
# 628 "include/linux/device.h"
static inline __attribute__((always_inline)) int __attribute__ ((format (printf, 2, 3)))
dev_vdbg(struct device *dev, const char *fmt, ...)
{
return 0;
}
Removing these unused inlines from sched.i shrinks sched.o
Signed-off-by: Joe Perches <joe at perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 00a41db522c77af33ea5ee9837d4f043ce150249
Author: Badari Pulavarty <pbadari at us.ibm.com>
Date: Mon Feb 11 09:23:18 2008 -0800
driver core: register_memory/unregister_memory clean ups and bugfix
register_memory()/unregister_memory() never gets called with
"root". unregister_memory() is accessing kobject_name of
the object just freed up. Since no one uses the code,
lets take the code out. And also, make register_memory() static.
Another bug fix - before calling unregister_memory()
remove_memory_block() gets a ref on kobject. unregister_memory()
need to drop that ref before calling sysdev_unregister().
Signed-off-by: Badari Pulavarty <pbadari at us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit da19cbcf71cde3c09587b5924d113f0c7f1fd23a
Author: Daniel Walker <dwalker at mvista.com>
Date: Mon Feb 4 23:35:47 2008 -0800
driver core: memory: semaphore to mutex
Signed-off-by: Daniel Walker <dwalker at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 610ad5064cb90aec35f5837bbde3d316fe02aca7
Author: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Date: Fri Apr 11 11:07:39 2008 +0200
UIO: hold a reference to the device's owner while the device is open
Otherwise the device might just disappear while /dev/uioX is being used
which results in an Oops.
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Signed-off-by: Hans J Koch <hjk at linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b54f2863a26d2b7c002d96abcde149940733c8e6
Author: Ben Nizette <bn at niasdigital.com>
Date: Thu Mar 13 22:27:30 2008 +1100
UIO: Implement a UIO interface for the SMX Cryptengine
This patch implements a UIO interface for the SMX Cryptengine.
The Cryptengine found on the Nias Digital SMX board is best suited
for a UIO interface. It is not wired in to the cryptographic API
as the engine handles it's own keys, algorithms, everything. All
that we know about is that if there's room in the buffer, you can
write data to it and when there's data ready, you read it out again.
There isn't necessarily even any direct correlation between data
going in and data coming out again, the engine may consume or
generate data all on its own.
This driver is for proprietary hardware but we're always told to
submit the drivers anyway; here you are. :-)
This is version 4 of this patch and addresses all issues raised by
Hans-Jürgen Koch and Paul Mundt in their reviews. Slightly altered
is Paul's suggestion to use DRV_NAME and DRV_VERSION as the UIO
version and name. While at the moment they are the same, there
is no reason for them to stay that way. Nevertheless we now at
least provide a MODULE_VERSION macro to keep modinfo happy.
Signed-off-by: Ben Nizette <bn at niasdigital.com>
Acked-by: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Hans J Koch <hjk at linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a2a6024692ec86a9c1452ecf14da7ede0704911a
Author: Hans-Jürgen Koch <hjk at linutronix.de>
Date: Sun Feb 3 01:48:28 2008 +0100
UIO: Remove needless PCI_DEVICE_ID definition from uio_cif.c
Meanwhile, PCI_DEVICE_ID_PLX_9030 is defined in pci_ids.h, no need to
define it again in the driver.
Signed-off-by: Hans J. Koch <hjk at linutronix.de>
CC: Benedikt Spranger <b.spranger at linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 2dc034a85d4164b90fa883a1226afb971174bcc5
Author: Hans-Jürgen Koch <hjk at linutronix.de>
Date: Tue Feb 19 21:07:19 2008 +0100
UIO: arch/arm/Kconfig: Make UIO available on ARM architecture
Source drivers/uio/Kconfig to make UIO available in menuconfig if ARCH=arm.
Signed-off-by: Hans J Koch <hjk at linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 0732460b3ad484c037dad8961bc4300610dd7613
Author: Denis Cheng <crquan at gmail.com>
Date: Sat Feb 2 17:51:36 2008 +0800
uio: mark pci_device_id hilscher_pci_ids[] __devinitdata
Signed-off-by: Denis Cheng <crquan at gmail.com>
Signed-off-by: Hans J. Koch <hjk at linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit ae210f188614bb3d1ee3f19c64e28e3cdd44877c
Author: Denis Cheng <crquan at gmail.com>
Date: Sat Feb 2 17:51:35 2008 +0800
uio: Kconfig improvements
Signed-off-by: Denis Cheng <crquan at gmail.com>
Signed-off-by: Hans J. Koch <hjk at linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c1ebdae514a356c71c09035f5141d94aab5e8fe4
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Tue Feb 26 09:36:38 2008 -0800
kobject: catch kobjects that are not initialized
Add warnings to kobject_put() to catch kobjects that are cleaned up but
were never initialized to begin with.
Cc: Kay Sievers <kay.sievers at vrfy.org>
Cc: Hannes Reinecke <hare at suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 43837b1e6c5aef803d57009a68db18df13e64892
Author: Bernard Pidoux <f6bvp at amsat.org>
Date: Sat Apr 19 18:41:51 2008 -0700
rose: Socket lock was not released before returning to user space
================================================
[ BUG: lock held when returning to user space! ]
------------------------------------------------
xfbbd/3683 is leaving the kernel with locks still held!
1 lock held by xfbbd/3683:
#0: (sk_lock-AF_ROSE){--..}, at: [<c8cd1eb3>] rose_connect+0x73/0x420 [rose]
INFO: task xfbbd:3683 blocked for more than 120 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
xfbbd D 00000246 0 3683 3669
c6965ee0 00000092 c02c5c40 00000246 c0f6b5f0 c0f6b5c0 c0f6b5f0 c0f6b5c0
c0f6b614 c6965f18 c024b74b ffffffff c06ba070 00000000 00000000 00000001
c6ab07c0 c012d450 c0f6b634 c0f6b634 c7b5bf10 c0d6004c c7b5bf10 c6965f40
Call Trace:
[<c024b74b>] lock_sock_nested+0x6b/0xd0
[<c012d450>] ? autoremove_wake_function+0x0/0x40
[<c02488f1>] sock_fasync+0x41/0x150
[<c0249e69>] sock_close+0x19/0x40
[<c0175d54>] __fput+0xb4/0x170
[<c0176018>] fput+0x18/0x20
[<c017300e>] filp_close+0x3e/0x70
[<c01744e9>] sys_close+0x69/0xb0
[<c0103bda>] sysenter_past_esp+0x5f/0xa5
=======================
INFO: lockdep is turned off.
Signed-off-by: Bernard Pidoux <f6bvp at amsat.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit d129f188abf14bbc13816667e4c0d465aac2c934
Author: Pavel Machek <pavel at suse.cz>
Date: Sat Apr 19 18:17:26 2008 -0700
hci_usb: remove code obfuscation
_urb_free is an alias for kfree... making code longer & harder to
read. Remove it.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b132fba18bb5e30ed13ce3c623c18eb1e5795534
Author: Julia Lawall <julia at diku.dk>
Date: Sat Apr 19 18:15:41 2008 -0700
drivers/net/appletalk: use time_before, time_before_eq, etc
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ change_compare_np @
expression E;
@@
(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)
@ include depends on change_compare_np @
@@
#include <linux/jiffies.h>
@ no_include depends on !include && change_compare_np @
@@
#include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 420635f517cf1bb8929caf80ce5a30e827b9df42
Author: Julia Lawall <julia at diku.dk>
Date: Sat Apr 19 18:14:50 2008 -0700
drivers/atm: use time_before, time_before_eq, etc
The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ change_compare_np @
expression E;
@@
(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)
@ include depends on change_compare_np @
@@
#include <linux/jiffies.h>
@ no_include depends on !include && change_compare_np @
@@
#include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a8827113abb5bd1506d9be78115950d213d9a071
Author: Pavel Machek <pavel at suse.cz>
Date: Sat Apr 19 18:13:40 2008 -0700
hci_usb: do not initialize static variables to 0
hci_usb: do not initialize static variables to 0.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 41588ba1ae166eaba0a70abf2d7ff064ad9331d3
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Sat Apr 19 18:12:33 2008 -0700
tg3: 5701 DMA corruption fix
Herbert Xu's commit fb93134dfc2a6e6fbedc7c270a31da03fce88db9, entitled
"[TCP]: Fix size calculation in sk_stream_alloc_pskb", has triggered a
bug in the 5701 where the 5701 DMA engine will corrupt outgoing
packets. This problem only happens when the starting address of the
packet matches a certain range of offsets and only when the 5701 is
placed downstream of a particular Intel bridge.
This patch detects the problematic bridge and if present, readjusts the
starting address of the packet data to a dword aligned boundary.
Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 36ef408061da9e012375547d69b27cc1f537b044
Author: Mark Asselstine <mark.asselstine at windriver.com>
Date: Sat Apr 19 18:10:46 2008 -0700
atm nicstar: Removal of debug code containing deprecated calls to cli()/sti()
Code within NS_DEBUG_SPINLOCKS contained deprecated cli()/sti()
function calls. NS_DEBUG_SPINLOCKS and the associated code seems to
be of little use these days so the strategy of removing this code
rather then updating it to use spinlocks has been taken.
Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
Reviewed-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 344234de54891ed15bf8127e4640ff9238076d6c
Author: David S. Miller <davem at davemloft.net>
Date: Sat Apr 19 18:09:39 2008 -0700
iwlwifi: Fix unconditional access to station->tidp[].agg.
Reportred by Ingo Molnar:
drivers/net/wireless/iwlwifi/iwl-debugfs.c: In function 'iwl_dbgfs_stations_read':
drivers/net/wireless/iwlwifi/iwl-debugfs.c:256: error: 'struct iwl4965_tid_data' has no member named 'agg'
Needs CONFIG_IWL4965_HT protection.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e1f9a464026011b3f7d0f7b6dfab3e562e870a46
Author: Patrick McHardy <kaber at trash.net>
Date: Sat Apr 19 17:53:52 2008 -0700
netfilter: Fix SIP conntrack build with NAT disabled.
Reported by Ingo Molnar.
The SIP helper is also useful without NAT. This patch adds an ifdef
around the RTP call optimization for NATed clients.
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4e9d8a70e4a48e146a0eaaa5a666f0a4889d873d
Author: Patrick McHardy <kaber at trash.net>
Date: Sat Apr 19 17:52:51 2008 -0700
netfilter: Fix SCTP nat build.
We need to select LIBCRC32C.
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ed3fa7c9510cde67d232299cab8052ff50a08285
Author: Peter Ma <peterma at mediamatech.com>
Date: Sat Apr 19 00:24:25 2008 -0700
avr32: Add hardware power-down function call
This patch adds in the indirect call to pm_power_off(), as is done in
other architectures (e.g. ARM).
Tested on NGW100, with custom board with GPIO control over main DC
power.
Signed-off-by: Peter Ma <pma at mediamatech.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 29a0c39386a4c33af21f1d92ebce277a7535ec7e
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 21:42:20 2008 +0300
avr32: add include/asm-avr32/serial.h
On Mon, Apr 14, 2008 at 03:36:24PM +0100, Alan Cox wrote:
> On Mon, 14 Apr 2008 17:17:21 +0300
> Adrian Bunk <bunk at kernel.org> wrote:
>
> > This patch fixes the following build error:
> >
> > <-- snip -->
> >
> > ...
> > CC [M] drivers/serial/8250.o
> > /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/serial/8250.c:95:24: error: asm/serial.h: No such file or directory
> > make[3]: *** [drivers/serial/8250.o] Error 1
> >
> > <-- snip -->
> >
> > Signed-off-by: Adrian Bunk <bunk at kernel.org>
> >
> > ---
> > 3cb4ef80d75e118ccfd44f7006aea3db54afb31c diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
> > index b1bbaa0..b0e216d 100644
> > --- a/drivers/serial/Kconfig
> > +++ b/drivers/serial/Kconfig
> > @@ -11,7 +11,7 @@ menu "Serial drivers"
> > # The new 8250/16550 serial drivers
> > config SERIAL_8250
> > tristate "8250/16550 and compatible serial support"
> > - depends on (BROKEN || !SPARC)
> > + depends on (BROKEN || !SPARC) && !AVR32
> > select SERIAL_CORE
> > ---help---
>
> NAK.
>
> Add an asm/serial.h to the platform as it has PCI so will have 8250 PCI
> devices available to it. A copy of the MIPS one should be right.
Patch below.
> Alan
cu
Adrian
<-- snip -->
This patch fixes the following build error with CONFIG_SERIAL_8250:
<-- snip -->
...
CC [M] drivers/serial/8250.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/serial/8250.c:95:24: error: asm/serial.h: No such file or directory
make[3]: *** [drivers/serial/8250.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit cf2d3ff994f19151fb9200c94c24daaed82700a2
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:16:53 2008 +0300
avr32: don't offer PARPORT_PC
This patch fixes the following compile error:
<-- snip -->
...
CC [M] drivers/parport/parport_pc.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/parport/parport_pc.c:67:25: error: asm/parport.h: No such file or directory
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/parport/parport_pc.c: In function 'parport_pc_find_ports':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/parport/parport_pc.c:3215: error: implicit declaration of function 'parport_pc_find_nonpci_ports'
make[3]: *** [drivers/parport/parport_pc.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit cc65d90fcffe82f516ce5c9e1b8423841868d035
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:16:44 2008 +0300
avr32: don't offer CONFIG_GEN_RTC
This patch fixes the following compile error:
<-- snip -->
...
CC [M] drivers/char/genrtc.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/char/genrtc.c:58:21: error: asm/rtc.h: No such file or directory
...
make[3]: *** [drivers/char/genrtc.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 17015aafd6d356d5d780a6f2c286a9ff137eb211
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:16:40 2008 +0300
avr32: don't offer CONFIG_RTC
This patch fixes the following compile error:
<-- snip -->
...
CC [M] drivers/char/rtc.o
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/char/rtc.c:70:
/home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mc146818rtc.h:16:59: error: asm/mc146818rtc.h: No such file or directory
...
make[3]: *** [drivers/char/rtc.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 5e840eca468135cd9a392da5004e5016a3006d43
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 17:16:32 2008 +0300
add include/asm-avr32/xor.h
This patch fixes the following compile error with CONFIG_MD_RAID456
on avr32:
<-- snip -->
...
CC [M] crypto/xor.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/crypto/xor.c:23:21: error: asm/xor.h: No such file or directory
/home/bunk/linux/kernel-2.6/git/linux-2.6/crypto/xor.c: In function 'calibrate_xor_blocks':
/home/bunk/linux/kernel-2.6/git/linux-2.6/crypto/xor.c:131: error: 'XOR_TRY_TEMPLATES' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/crypto/xor.c:131: error: (Each undeclared identifier is reported only once
/home/bunk/linux/kernel-2.6/git/linux-2.6/crypto/xor.c:131: error: for each function it appears in.)
make[2]: *** [crypto/xor.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit e6bef83af76dc373a27b3e9b617f65daa7dff2f4
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Thu Apr 10 06:40:54 2008 +0200
avr32: Remove two unused #defines from mm/init.c
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 35bf50ccc80584a1404982f02fc4368e991ff55c
Author: Hans-Christian Egtvedt <hcegtvedt at atmel.com>
Date: Wed Dec 19 09:29:19 2007 +0100
avr32: Implement set_rate(), set_parent() and mode() for pll1
This patch is a take two of adding full functionality to PLL1 on
AT32AP7000. This allows board-specific code and drivers to configure
and enable PLL1. This is useful when precise control over the
frequency of e.g. a genclock is needed and requested by users for the
ABDAC device.
The patch is based upon previous patches from both Haavard Skinnemoen
and David Brownell.
Signed-off-by: Hans-Christian Egtvedt <hcegtvedt at atmel.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit e723ff666a5da8f7fda4e36ebfeafac2175a5c6e
Author: David Brownell <david-b at pacbell.net>
Date: Thu Feb 14 11:24:02 2008 -0800
avr32: Generic clockevents support
This combines three patches from David Brownell:
* avr32: tclib support
* avr32: simplify clocksources
* avr32: Turn count/compare into a oneshot clockevent device
Register both TC blocks (instead of just the first one) so that
the AT32/AT91 tclib code will pick them up (instead of just the
avr32-only PIT-style clocksource).
Rename the first one and its resources appropriately.
More cleanups to the cycle counter clocksource code
- Disable all the weak symbol magic; remove the AVR32-only TCB-based
clocksource code (source and header).
- Mark the __init code properly.
- Don't forget to report IRQF_TIMER.
- Make the system work properly with this clocksource, by preventing
use of the CPU "idle" sleep state in the idle loop when it's used.
Package the avr32 count/compare timekeeping support as a oneshot
clockevent device, so it supports NO_HZ and high res timers.
This means it also supports plugging in other clockevent devices
and clocksources.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit 7e59128f31e0c57d52e86d57730d4c9281494dda
Author: Haavard Skinnemoen <hskinnemoen at atmel.com>
Date: Sun Feb 24 23:24:26 2008 +0100
avr32: Move sleep code into mach-at32ap
Create a new file, pm-at32ap700x.S, in mach-at32ap and move the CPU
idle sleep code there. Make it possible to disable the sleep code.
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit 02f99d1ca70d190ce12d040971819be22ea710c8
Author: Haavard Skinnemoen <hskinnemoen at atmel.com>
Date: Sun Feb 24 23:19:22 2008 +0100
avr32: Use constants from sysreg.h in asm.h
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit 46acb55b4b745256a33b2eaeb6d21fffdb091745
Author: Haavard Skinnemoen <hskinnemoen at atmel.com>
Date: Sun Feb 24 14:09:25 2008 +0100
avr32: Delete mostly unused header asm/intc.h
Move the only thing that was actually implemented and used in
asm/intc.h, intc_get_pending(), into asm/irq.h and delete asm/intc.h
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit 62c6df62f9575cffd673bfc395270e6896a12a60
Author: David Brownell <david-b at pacbell.net>
Date: Tue Feb 12 14:45:49 2008 -0800
avr32: start clocksource cleanup
Start cleaning up the AVR32 clocksource mess, starting with the cycle
counter clocksource: remove unneeded pseudo-RTC (just inline that
call to mktime) and associated build warning, and unused sysdev.
Add comment about the problem using the cycle counter register,
and adjust the clocksource rating accordingly. Later patches can
make this usable again (by disabling use of the idle state and
providing a proper clocksource without the weak binding hacks)
and move towards TCB-based clockevent support (including high
resolution timers) that's shared between AT91 and AVR32.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit 040b28fc0a69281a46adcebd6b31dd74da4a8d49
Author: Ben Nizette <bn at niasdigital.com>
Date: Thu Feb 7 15:28:57 2008 +1100
avr32: pass i2c board info through at32_add_device_twi
New-style I2C drivers require that motherboard-mounted I2C devices are
registered with the I2C core, typically at arch_initcall time. This
can be done nice and neat by passing the struct i2c_board_info[]
through at32_add_device_twi just like we do for the SPI board info.
While we've got the hood up, remove a duplicate declaration of
at32_add_device_twi() in board.h.
[hskinnemoen at atmel.com: add missing i2c_board_info forward-declaration]
Signed-Off-By: Ben Nizette <bn at niasdigital.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit e573ebb0326f2f4a29ee2bd143bfc88ab0332926
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Sun Feb 3 14:22:18 2008 +0300
avr32: cleanup - use _AC macro to define PAGE_SIZE
PAGE_SIZE is used both from assembly and C code. We want to have type
specifiers when using it from C, but this will make the assembler
confused, so we need to make it conditional.
This is exactly what the _AC macro is for, so using it allows us to
get rid of a few lines of cpp noise.
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit 3a4e832cccc5baba98ba010e38c58266954228a7
Author: Hans-Christian Egtvedt <hcegtvedt at atmel.com>
Date: Tue Dec 4 13:15:41 2007 +0100
Generate raw keyboard codes for AVR32 architecture
This patchs adds the AVR32 architecture to the list of archs to generate a
table of raw keyboard keycodes.
Signed-off-by: Hans-Christian Egtvedt <hcegtvedt at atmel.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen at atmel.com>
commit e1c25dc638db01600069b3f9167d1b35f8d574b5
Merge: 03414e57ad9875d0c8bfa5a4a65813cb2157372e 16a45bc82e61891daec1ffcd057679bdf962aeb8
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Sat Apr 19 20:38:41 2008 -0400
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/usba-2.6.26 into base
commit 03414e57ad9875d0c8bfa5a4a65813cb2157372e
Merge: 3925e6fc1f774048404fdd910b0345b06c699eb4 3ee08aea72f44a6d176af7a97f3ad0c67bc65a44
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Sat Apr 19 20:38:13 2008 -0400
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/tclib into base
commit a3dab293539031b0970585b9b355cebbc91ecbd4
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Apr 14 21:41:32 2008 +0300
make nfs_automount_list static
nfs_automount_list can now become static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit daa7da5fd3040e08e3d7878cd0667c1f4cfd338a
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Apr 11 11:50:58 2008 -0400
NFS: remove duplicate flags assignment from nfs_validate_mount_data
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 63649bd7080a6a50fabcb1935f4b7c4e64155066
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Thu Apr 17 20:42:09 2008 +0400
NFS - fix potential NULL pointer dereference v2
There is possible NULL pointer dereference if kstr[n]dup failed.
So fix them for safety.
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit cd019f7517206a74d8cdb64d5c82b1f76be608cc
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Thu Apr 17 17:03:58 2008 -0400
SUNRPC: Don't change the RPCSEC_GSS context on a credential that is in use
When a server rejects our credential with an AUTH_REJECTEDCRED or similar,
we need to refresh the credential and then retry the request.
However, we do want to allow any requests that are in flight to finish
executing, so that we can at least attempt to process the replies that
depend on this instance of the credential.
The solution is to ensure that gss_refresh() looks up an entirely new
RPCSEC_GSS credential instead of attempting to create a context for the
existing invalid credential.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 7b6962b0a6000df48c8a5fd967d262f77704101b
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Thu Apr 17 16:53:01 2008 -0400
SUNRPC: Fix a race in gss_refresh_upcall()
If the downcall completes before we get the spin_lock then we currently
fail to refresh the credential.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 7c1d71cf56feebfb5b98219b9d11dfc3a2feca62
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Thu Apr 17 16:52:57 2008 -0400
SUNRPC: Don't disconnect more than once if retransmitting NFSv4 requests
NFSv4 requires us to ensure that we break the TCP connection before we're
allowed to retransmit a request. However in the case where we're
retransmitting several requests that have been sent on the same
connection, we need to ensure that we don't interfere with the attempt to
reconnect and/or break the connection again once it has been established.
We therefore introduce a 'connection' cookie that is bumped every time a
connection is broken. This allows requests to track if they need to force a
disconnection.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 636ac43318ce6939c1698fb67e714d421314ed71
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Thu Apr 17 14:00:47 2008 -0400
SUNRPC: Remove the unused export of xprt_force_disconnect
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 06b4b681ababc20596aa947595714710f557131d
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Wed Apr 16 16:51:38 2008 -0400
SUNRPC: remove XS_SENDMSG_RETRY
The condition for exiting from the loop in xs_tcp_send_request() should be
that we find we're not making progress (i.e. number of bytes sent is 0).
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit d2b831416365e8b1f27809b62d5e4260883956cc
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Mon Apr 14 18:13:37 2008 -0400
SUNRPC: Protect creds against early garbage collection
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit a2b2bb8822c78806930bbb4d4c5bb3ae69648fd0
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Tue Apr 8 16:02:17 2008 -0400
NFSv4: Attempt to use machine credentials in SETCLIENTID calls
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 7c67db3a8a98045744f06fcd6d8f476d9df0ba5c
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Mon Apr 7 20:50:11 2008 -0400
NFSv4: Reintroduce machine creds
We need to try to ensure that we always use the same credentials whenever
we re-establish the clientid on the server. If not, the server won't
recognise that we're the same client, and so may not allow us to recover
state.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 78ea323be6380a9313e87fe241809e912e8ae401
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Mon Apr 7 20:49:28 2008 -0400
NFSv4: Don't use cred->cr_ops->cr_name in nfs4_proc_setclientid()
With the recent change to generic creds, we can no longer use
cred->cr_ops->cr_name to distinguish between RPCSEC_GSS principals and
AUTH_SYS/AUTH_NULL identities. Replace it with the rpc_authops->au_name
instead...
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 441092415770ddec648800701895913c4bfd60c1
Author: Fred Isaman <iisaman at citi.umich.edu>
Date: Wed Apr 2 15:21:15 2008 +0300
nfs: fix printout of multiword bitfields
Benny points out that zero-padding of multiword bitfields is necessary,
and that delimiting each word is nice to avoid endianess confusion.
bhalevy: without zero padding output can be ambiguous. Also,
since the printed array of two 32-bit unsigned integers is not a
64-bit number, delimiting the output with a semicolon makes more sense.
Signed-off-by: Fred Isaman <iisaman at citi.umich.edu>
Signed-off-by: Benny Halevy <bhalevy at panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 856dff3d3875bdc8b88e4a65779873af76776a69
Author: Benny Halevy <bhalevy at panasas.com>
Date: Mon Mar 31 17:39:06 2008 +0300
nfs: return negative error value from nfs{,4}_stat_to_errno
All use sites for nfs{,4}_stat_to_errno negate their return value.
It's more efficient to return a negative error from the stat_to_errno convertors
rather than negating its return value everywhere. This also produces slightly
smaller code.
Signed-off-by: Benny Halevy <bhalevy at panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit d11d10cc05c94a32632d6928d15a1034200dd9a5
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Wed Apr 2 14:44:05 2008 -0400
NLM/lockd: Ensure client locking calls use correct credentials
Now that we've added the 'generic' credentials (that are independent of the
rpc_client) to the nfs_open_context, we can use those in the NLM client to
ensure that the lock/unlock requests are authenticated to whoever
originally opened the file.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit c4d7c402b788b73dc24f1e54a57f89d3dc5eb7bc
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Tue Apr 1 20:26:52 2008 -0400
NFS: Remove the buggy lock-if-signalled case from do_setlk()
Both NLM and NFSv4 should be able to clean up adequately in the case where
the user interrupts the RPC call...
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 5f50c0c6d644d6c8180d9079c13c5d9de3adeb34
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Tue Apr 1 20:26:22 2008 -0400
NLM/lockd: Fix a race when cancelling a blocking lock
We shouldn't remove the lock from the list of blocked locks until the
CANCEL call has completed since we may be racing with a GRANTED callback.
Also ensure that we send an UNLOCK if the CANCEL request failed. Normally
that should only happen if the process gets hit with a fatal signal.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 6b4b3a752b3464f2fd9fe2837fb19270c23c1d6b
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Wed Apr 2 14:40:53 2008 -0400
NLM/lockd: Ensure that nlmclnt_cancel() returns results of the CANCEL call
Currently, it returns success as long as the RPC call was sent. We'd like
to know if the CANCEL operation succeeded on the server.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 8ec7ff74448f65ac963e330795d771ab14ec8408
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Fri Mar 28 16:04:51 2008 -0400
NLM: Remove the signal masking in nlmclnt_proc/nlmclnt_cancel
The signal masks have been rendered obsolete by the preceding patch.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit dc9d8d048168ff61c458bec06b28996cb90b182a
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Fri Mar 28 16:04:36 2008 -0400
NLM/lockd: convert __nlm_async_call to use rpc_run_task()
Peter Staubach comments:
> In the course of investigating testing failures in the locking phase of
> the Connectathon testsuite, I discovered a couple of things. One was
> that one of the tests in the locking tests was racy when it didn't seem
> to need to be and two, that the NFS client asynchronously releases locks
> when a process is exiting.
...
> The Single UNIX Specification Version 3 specifies that: "All locks
> associated with a file for a given process shall be removed when a file
> descriptor for that file is closed by that process or the process holding
> that file descriptor terminates.".
>
> This does not specify whether those locks must be released prior to the
> completion of the exit processing for the process or not. However,
> general assumptions seem to be that those locks will be released. This
> leads to more deterministic behavior under normal circumstances.
The following patch converts the NFSv2/v3 locking code to use the same
mechanism as NFSv4 for sending asynchronous RPC calls and then waiting for
them to complete. This ensures that the UNLOCK and CANCEL RPC calls will
complete even if the user interrupts the call, yet satisfies the
above request for synchronous behaviour on process exit.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 5e7f37a76fa5b604949020b7317962262812b2dd
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Tue Apr 1 18:58:49 2008 -0400
NLM/lockd: Add a reference counter to struct nlm_rqst
When we replace the existing synchronous RPC calls with asynchronous calls,
the reference count will be needed in order to allow us to examine the
result of the RPC call.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 536ff0f809b0f4d56e1c41e66768d330668e0a55
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Fri Apr 4 15:08:02 2008 -0400
NFSv4: Ensure we don't corrupt fl->fl_flags in nfs4_proc_unlck
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 4a9af59fee0701d9db99bc148d87b8852d6d6dd8
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Tue Apr 1 18:57:06 2008 -0400
NLM/lockd: Ensure we don't corrupt fl->fl_flags in nlmclnt_unlock()
Also fix up nlmclnt_lock() so that it doesn't pass modified versions of
fl->fl_flags to nlmclnt_cancel() and other helpers.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 1e799b673c6b82b336ab13c48b5651d511ca3000
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Fri Mar 21 16:19:41 2008 -0400
SUNRPC: Fix read ordering problems with req->rq_private_buf.len
We want to ensure that req->rq_private_buf.len is updated before
req->rq_received, so that call_decode() doesn't use an old value for
req->rq_rcv_buf.len.
In 'call_decode()' itself, instead of using task->tk_status (which is set
using req->rq_received) must use the actual value of
req->rq_private_buf.len when deciding whether or not the received RPC reply
is too short.
Finally ensure that we set req->rq_rcv_buf.len to zero when retrying a
request. A typo meant that we were resetting req->rq_private_buf.len in
call_decode(), and then clobbering that value with the old rq_rcv_buf.len
again in xprt_transmit().
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit c1d519312dcdf11532fed9f99a8ecc3547ffd9d6
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Mon Apr 7 13:20:54 2008 -0400
NFSv4: Only increment the sequence id if the server saw it
It is quite possible that the OPEN, CLOSE, LOCK, LOCKU,... compounds fail
before the actual stateful operation has been executed (for instance in the
PUTFH call). There is no way to tell from the overall status result which
operations were executed from the COMPOUND.
The fix is to move incrementing of the sequence id into the XDR layer,
so that we do it as we process the results from the stateful operation.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 35d05778e25ee16dbddb60331be0bc1309efba19
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Sat Apr 5 15:54:17 2008 -0400
NFSv4: Remove bogus call to nfs4_drop_state_owner() in _nfs4_open_expired()
There should be no need to invalidate a perfectly good state owner just
because of a stale filehandle. Doing so can cause the state recovery code
to break, since nfs4_get_renew_cred() and nfs4_get_setclientid_cred() rely
on finding active state owners.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit dbae4c73f08b8a7980cc912954ade3d4c1fb6147
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Mon Apr 14 14:54:53 2008 -0400
NFS: Ensure that rpc_run_task() errors are propagated back to the caller
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit c9d8f89d9816c1d16ada492aa547a4d692508c0d
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Tue Apr 15 16:56:39 2008 -0400
NFS: Ensure that the write code cleans up properly when rpc_run_task() fails
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit fdd1e74c89fe39259a29c494209abad63ff76f82
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Tue Apr 15 16:33:58 2008 -0400
NFS: Ensure that the read code cleans up properly when rpc_run_task() fails
In the case of readpage() we need to ensure that the pages get unlocked,
and that the error is flagged.
In the case of O_DIRECT, we need to ensure that the pages are all released.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 73e3302f60c0e11a0db0b34b903f591139c4f937
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Fri Apr 11 16:03:54 2008 -0400
NFS: Fix nfs_wb_page() to always exit with an error or a clean page
It is possible for nfs_wb_page() to sometimes exit with 0 return value, yet
the page is left in a dirty state.
For instance in the case where the server rebooted, and the COMMIT request
failed, then all the previously "clean" pages which were cached by the
server, but were not guaranteed to have been writted out to disk,
have to be redirtied and resent to the server.
The fix is to have nfs_wb_page_priority() check that the page is clean
before it exits...
This fixes a condition that triggers the BUG_ON(PagePrivate(page)) in
nfs_create_request() when we're in the nfs_readpage() path.
Also eliminate a redundant BUG_ON(!PageLocked(page)) while we're at it. It
turns out that clear_page_dirty_for_io() has the exact same test.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 080a1f148df0615f7a610e4776dd8f3fb706f54f
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Sat Apr 19 14:22:31 2008 -0400
SUNRPC: Don't attempt to destroy expired RPCSEC_GSS credentials..
..and always destroy using a 'soft' RPC call. Destroying GSS credentials
isn't mandatory; the server can always cope with a few credentials not
getting destroyed in a timely fashion.
This actually fixes a hang situation. Basically, some servers will decide
that the client is crazy if it tries to destroy an RPC context for which
they have sent an RPCSEC_GSS_CREDPROBLEM, and so will refuse to talk to it
for a while.
The regression therefor probably was introduced by commit
0df7fb74fbb709591301871a38aac7735a1d6583.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit b6ddf64ffe9d59577a9176856bb6fe69a539f573
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Thu Apr 17 18:52:19 2008 -0400
SUNRPC: Fix up xprt_write_space()
The rest of the networking layer uses SOCK_ASYNC_NOSPACE to signal whether
or not we have someone waiting for buffer memory. Convert the SUNRPC layer
to use the same idiom.
Remove the unlikely()s in xs_udp_write_space and xs_tcp_write_space. In
fact, the most common case will be that there is nobody waiting for buffer
space.
SOCK_NOSPACE is there to tell the TCP layer whether or not the cwnd was
limited by the application window. Ensure that we follow the same idiom as
the rest of the networking layer here too.
Finally, ensure that we clear SOCK_ASYNC_NOSPACE once we wake up, so that
write_space() doesn't keep waking things up on xprt->pending.
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 24b74bf0c9e08cbda74d3c64af69ad402ed54e04
Author: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: Sat Apr 19 13:15:47 2008 -0400
SUNRPC: Fix a bug in call_decode()
call_verify() can, under certain circumstances, free the RPC slot. In that
case, our cached pointer 'req = task->tk_rqstp' is invalid. Bug was
introduced in commit 220bcc2afd7011b3e0569fc178331fa983c92c1b (SUNRPC:
Don't call xprt_release in call refresh).
Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
commit 4bc1dca4b0eb4dfbf100895bfc1256f21e3c901a
Author: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Date: Sat Apr 19 20:44:31 2008 +0300
UBI: fix mean EC calculation
(a + b) / (c + d) != a / c + b / d. The old code errornously
assumed this incorrect formuld. Instead, just sum all erase
counters in a 64-bit variable and divide to the number of EBs
at the end.
Thanks to Adrian Hunter for pointing this out.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
commit d2f5e80862d33a7746a40569840248a592dbc395
Author: Matthew Wilcox <matthew at wil.cx>
Date: Sat Apr 19 13:49:34 2008 -0400
Deprecate the asm/semaphore.h files in feature-removal-schedule.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit 486fdae21458bd9f4e125099bb3c38a4064e450e
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 19 12:11:10 2008 +0200
sched: build fix
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b9b158fe1ca2c166ff918de30cb098eafcae487a
Author: Viktor Radnai <viktor.radnai at gmail.com>
Date: Sat Apr 19 19:45:01 2008 +0200
sched: better rt-group documentation
Viktor was nice enough to enhance the document based on my replies to
his questions on the subject.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit c24b7c524421f9ea9d9ebab55f80cfb1f3fb77a3
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Apr 18 10:55:34 2008 +0200
sched: features fix
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f00b45c145981b43c7e7f66315ac77534c938cbf
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: /debug/sched_features
provide a text based interface to the scheduler features; this saves the
'user' from setting bits using decimal arithmetic.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 06379aba522ebdabca37446ea988a23c43c03c67
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 19 09:25:58 2008 +0200
sched: add SCHED_FEAT_DEADLINE
unused at the moment.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7ba2e74ab5a0518bc953042952dd165724bc70c9
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: debug: show a weight tree
Print a tree of weights.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8f1bc385cfbab474db6c27b5af1e439614f3025c
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: fair: weight calculations
In order to level the hierarchy, we need to calculate load based on the
root view. That is, each task's load is in the same unit.
A
/ \
B 1
/ \
2 3
To compute 1's load we do:
weight(1)
--------------
rq_weight(A)
To compute 2's load we do:
weight(2) weight(B)
------------ * -----------
rq_weight(B) rw_weight(A)
This yields load fractions in comparable units.
The consequence is that it changes virtual time. We used to have:
time_{i}
vtime_{i} = ------------
weight_{i}
vtime = \Sum vtime_{i} = time / rq_weight.
But with the new way of load calculation we get that vtime equals time.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4a55bd5e97b1775913f88f11108a4f144f590e89
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: fair-group: de-couple load-balancing from the rb-trees
De-couple load-balancing from the rb-trees, so that I can change their
organization.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ac884dec6d4a7df252150af875cffddf8f1d9c15
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: fair-group scheduling vs latency
Currently FAIR_GROUP sched grows the scheduler latency outside of
sysctl_sched_latency, invert this so it stays within.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 58d6c2d72f8628f39e8689fbde8aa177fcf00a37
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: rt-group: optimize dequeue_rt_stack
Now that the group hierarchy can have an arbitrary depth the O(n^2) nature
of RT task dequeues will really hurt. Optimize this by providing space to
store the tree path, so we can walk it the other way.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d19ca30874f2ad343d054e0b5c0576744afeecd4
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: debug: add some debug code to handle the full hierarchy
Add some extra debug output so we can get a better overview of the
full hierarchy.
We print the cgroup path after each cfs_rq, so we can see what group
we're looking at.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 18d95a2832c1392a2d63227a7a6d433cb9f2037e
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: fair-group: SMP-nice for group scheduling
Implement SMP nice support for the full group hierarchy.
On each load-balance action, compile a sched_domain wide view of the full
task_group tree. We compute the domain wide view when walking down the
hierarchy, and readjust the weights when walking back up.
After collecting and readjusting the domain wide view, we try to balance the
tasks within the task_groups. The current approach is a naively balance each
task group until we've moved the targeted amount of load.
Inspired by Srivatsa Vaddsgiri's previous code and Abhishek Chandra's H-SMP
paper.
XXX: there will be some numerical issues due to the limited nature of
SCHED_LOAD_SCALE wrt to representing a task_groups influence on the
total weight. When the tree is deep enough, or the task weight small
enough, we'll run out of bits.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
CC: Abhishek Chandra <chandra at cs.umn.edu>
CC: Srivatsa Vaddagiri <vatsa at linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 1d3504fcf5606579d60b649d19f44b3871c1ddae
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Tue Apr 15 14:04:23 2008 +0900
sched, cpuset: customize sched domains, core
[rebased for sched-devel/latest]
- Add a new cpuset file, having levels:
sched_relax_domain_level
- Modify partition_sched_domains() and build_sched_domains()
to take attributes parameter passed from cpuset.
- Fill newidle_idx for node domains which currently unused but
might be required if sched_relax_domain_level become higher.
- We can change the default level by boot option 'relax_domain_level='.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4d5f35533fb9b2cd553cec6611195bcbfb7ffd84
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date: Tue Apr 15 14:03:17 2008 +0900
sched, cpuset: customize sched domains, docs
This patch introduces new feature of cpuset - sched domain customization.
This version provides a per-cpuset file 'sched_relax_domain_level' that
enable us to change the searching range of scheduler, which used to limit
how many cpus the scheduler searches at some schedule events, such as
wakening task and running out of runqueue.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b758149c02638146a835f42097dd1950a6cae638
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: prepatory code movement
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b40b2e8eb52192a8a22d707ed37925792b7bdfd1
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: rt: multi level group constraints
multi level rt constraints
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f473aa5e025bc8e0c5fe9352f65178a54adadec2
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: task_group hierarchy
Add the full parent<->child relation thing into task_groups as well.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit eff766a65c60237bfa865160c3129de31fab591b
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:45:00 2008 +0200
sched: fix the task_group hierarchy for UID grouping
UID grouping doesn't actually have a task_group representing the root of
the task_group tree. Add one.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ec7dc8ac73e4a56ed03b673f026f08c0d547f597
Author: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Date: Sat Apr 19 19:44:59 2008 +0200
sched: allow the group scheduler to have multiple levels
This patch makes the group scheduler multi hierarchy aware.
[a.p.zijlstra at chello.nl: rt-parts and assorted fixes]
Signed-off-by: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 354d60c2ff72d86627dfe2089d186824abf4bb8e
Author: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Date: Sat Apr 19 19:44:59 2008 +0200
sched: mix tasks and groups
This patch allows tasks and groups to exist in the same cfs_rq. With this
change the CFS group scheduling follows a 1/(M+N) model from a 1/(1+N)
fairness model where M tasks and N groups exist at the cfs_rq level.
[a.p.zijlstra at chello.nl: rt bits and assorted fixes]
Signed-off-by: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Signed-off-by: Srivatsa Vaddagiri <vatsa at linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ea736ed5d353d7a3aa1cf8ce4cf8d947bc353fb2
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue Mar 25 13:51:45 2008 +0100
sched: fix checks
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 112f53f5d700589de741dca67c77439e96ea94a7
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Wed Mar 19 11:43:36 2008 +0100
sched: old sleeper bonus
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit cd8ba7cd9be0192348c2836cb6645d9b2cd2bfd2
Author: Mike Travis <travis at sgi.com>
Date: Wed Mar 26 14:23:49 2008 -0700
sched: add new set_cpus_allowed_ptr function
Add a new function that accepts a pointer to the "newly allowed cpus"
cpumask argument.
int set_cpus_allowed_ptr(struct task_struct *p, const cpumask_t *new_mask)
The current set_cpus_allowed() function is modified to use the above
but this does not result in an ABI change. And with some compiler
optimization help, it may not introduce any additional overhead.
Additionally, to enforce the read only nature of the new_mask arg, the
"const" property is migrated to sub-functions called by set_cpus_allowed.
This silences compiler warnings.
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e0982e90cd1ecf59818b137386b7f63debded9cc
Author: Mike Travis <travis at sgi.com>
Date: Wed Mar 26 14:23:48 2008 -0700
init: move setup of nr_cpu_ids to as early as possible
Move the setting of nr_cpu_ids from sched_init() to start_kernel()
so that it's available as early as possible.
Note that an arch has the option of setting it even earlier if need be,
but it should not result in a different value than the setup_nr_cpu_ids()
function.
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4bdbaad33d0f4d0e9818a38a825f5b75c0296a28
Author: Mike Travis <travis at sgi.com>
Date: Tue Apr 15 16:35:52 2008 -0700
sched: remove another cpumask_t variable from stack
* Remove another cpumask_t variable from stack that was missed in the
last kernel_sched_c updates.
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9d1fe3236a1d64ab687e16b4cbbaa1383352a2c1
Author: Mike Travis <travis at sgi.com>
Date: Tue Apr 8 11:43:04 2008 -0700
cpumask: add show cpu map functions
* Add cpu_sysdev_class functions to display the following maps
with cpulist_scnprintf().
cpu_online_map
cpu_present_map
cpu_possible_map
* Small change to include/linux/sysdev.h to allow the attribute
name and label to be different (to avoid collision with the
"attr_online" entry for bringing cpus on- and off-line.)
Cc: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 39106dcf85285e78f3b290022122c76f851379b8
Author: Mike Travis <travis at sgi.com>
Date: Tue Apr 8 11:43:03 2008 -0700
cpumask: use new cpus_scnprintf function
* Cleaned up references to cpumask_scnprintf() and added new
cpulist_scnprintf() interfaces where appropriate.
* Fix some small bugs (or code efficiency improvments) for various uses
of cpumask_scnprintf.
* Clean up some checkpatch errors.
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit fb0f330e62d71f7c535251438068199af320cf73
Author: Mike Travis <travis at sgi.com>
Date: Tue Apr 8 11:43:02 2008 -0700
x86: modify show_shared_cpu_map in intel_cacheinfo
* Removed kmalloc (or local array) in show_shared_cpu_map().
* Added show_shared_cpu_list() function.
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9f0e8d0400d925c3acd5f4e01dbeb736e4011882
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:01 2008 -0700
x86: convert cpumask_of_cpu macro to allocated array
* Here is a simple patch to use an allocated array of cpumasks to
represent cpumask_of_cpu() instead of constructing one on the stack.
It's based on the Kconfig option "HAVE_CPUMASK_OF_CPU_MAP" which is
currently only set for x86_64 SMP. Otherwise the the existing
cpumask_of_cpu() is used but has been changed to produce an lvalue
so a pointer to it can be used.
Cc: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 321a8e9dcb714f3c350ba55e41ed447bf3f05fac
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:02 2008 -0700
cpumask: add CPU_MASK_ALL_PTR macro
* Add a static cpumask_t variable "CPU_MASK_ALL_PTR" to use as
a pointer reference to CPU_MASK_ALL. This reduces where possible
the instances where CPU_MASK_ALL allocates and fills a large
array on the stack. Used only if NR_CPUS > BITS_PER_LONG.
* Change init/main.c to use new set_cpus_allowed_ptr().
Depends on:
[sched-devel]: sched: add new set_cpus_allowed_ptr function
Cc: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7c16ec585c558960a508ccf9a08fcb9ed49b3754
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:11 2008 -0700
cpumask: reduce stack usage in SD_x_INIT initializers
* Remove empty cpumask_t (and all non-zero/non-null) variables
in SD_*_INIT macros. Use memset(0) to clear. Also, don't
inline the initializer functions to save on stack space in
build_sched_domains().
* Merge change to include/linux/topology.h that uses the new
node_to_cpumask_ptr function in the nr_cpus_node macro into
this patch.
Depends on:
[mm-patch]: asm-generic-add-node_to_cpumask_ptr-macro.patch
[sched-devel]: sched: add new set_cpus_allowed_ptr function
Cc: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit c5f59f0833df945eef7ff35f3dc6ba61c5f293dd
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:10 2008 -0700
nodemask: use new node_to_cpumask_ptr function
* Use new node_to_cpumask_ptr. This creates a pointer to the
cpumask for a given node. This definition is in mm patch:
asm-generic-add-node_to_cpumask_ptr-macro.patch
* Use new set_cpus_allowed_ptr function.
Depends on:
[mm-patch]: asm-generic-add-node_to_cpumask_ptr-macro.patch
[sched-devel]: sched: add new set_cpus_allowed_ptr function
[x86/latest]: x86: add cpus_scnprintf function
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Greg Banks <gnb at melbourne.sgi.com>
Cc: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b53e921ba1cff8453dc9a87a84052fa12d5b30bd
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:08 2008 -0700
generic: reduce stack pressure in sched_affinity
* Modify sched_affinity functions to pass cpumask_t variables by reference
instead of by value.
* Use new set_cpus_allowed_ptr function.
Depends on:
[sched-devel]: sched: add new set_cpus_allowed_ptr function
Cc: Paul Jackson <pj at sgi.com>
Cc: Cliff Wickman <cpw at sgi.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f9a86fcbbb1e5542eabf45c9144ac4b6330861a4
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:07 2008 -0700
cpuset: modify cpuset_set_cpus_allowed to use cpumask pointer
* Modify cpuset_cpus_allowed to return the currently allowed cpuset
via a pointer argument instead of as the function return value.
* Use new set_cpus_allowed_ptr function.
* Cleanup CPU_MASK_ALL and NODE_MASK_ALL uses.
Depends on:
[sched-devel]: sched: add new set_cpus_allowed_ptr function
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f70316dace2bb99730800d47044acb818c6735f6
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:06 2008 -0700
generic: use new set_cpus_allowed_ptr function
* Use new set_cpus_allowed_ptr() function added by previous patch,
which instead of passing the "newly allowed cpus" cpumask_t arg
by value, pass it by pointer:
-int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
+int set_cpus_allowed_ptr(struct task_struct *p, const cpumask_t *new_mask)
* Modify CPU_MASK_ALL
Depends on:
[sched-devel]: sched: add new set_cpus_allowed_ptr function
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit fc0e474840d1fd96f28fbd76d4f36b80e7ad1cc3
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:05 2008 -0700
x86: use new set_cpus_allowed_ptr function
* Use new set_cpus_allowed_ptr() function added by previous patch,
which instead of passing the "newly allowed cpus" cpumask_t arg
by value, pass it by pointer:
-int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
+int set_cpus_allowed_ptr(struct task_struct *p, const cpumask_t *new_mask)
* Cleanup uses of CPU_MASK_ALL.
* Collapse other NR_CPUS changes to arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Use pointers to cpumask_t arguments whenever possible.
Depends on:
[sched-devel]: sched: add new set_cpus_allowed_ptr function
Cc: Len Brown <len.brown at intel.com>
Cc: Dave Jones <davej at codemonkey.org.uk>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 434d53b00d6bb7be0a1d3dcc0d0d5df6c042e164
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:04 2008 -0700
sched: remove fixed NR_CPUS sized arrays in kernel_sched_c
* Change fixed size arrays to per_cpu variables or dynamically allocated
arrays in sched_init() and sched_init_smp().
(1) static struct sched_entity *init_sched_entity_p[NR_CPUS];
(1) static struct cfs_rq *init_cfs_rq_p[NR_CPUS];
(1) static struct sched_rt_entity *init_sched_rt_entity_p[NR_CPUS];
(1) static struct rt_rq *init_rt_rq_p[NR_CPUS];
static struct sched_group **sched_group_nodes_bycpu[NR_CPUS];
(1) - these arrays are allocated via alloc_bootmem_low()
* Change sched_domain_debug_one() to use cpulist_scnprintf instead of
cpumask_scnprintf. This reduces the output buffer required and improves
readability when large NR_CPU count machines arrive.
* In sched_create_group() we allocate new arrays based on nr_cpu_ids.
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d366f8cbc16882e93538d9a52423c2f50dad7c06
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:12 2008 -0700
cpumask: Cleanup more uses of CPU_MASK and NODE_MASK
* Replace usages of CPU_MASK_NONE, CPU_MASK_ALL, NODE_MASK_NONE,
NODE_MASK_ALL to reduce stack requirements for large NR_CPUS
and MAXNODES counts.
* In some cases, the cpumask variable was initialized but then overwritten
with another value. This is the case for changes like this:
- cpumask_t oldmask = CPU_MASK_ALL;
+ cpumask_t oldmask;
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f46bdf2db25dfaff3b611c9711705645cdb03acc
Author: Mike Travis <travis at sgi.com>
Date: Fri Apr 4 18:11:09 2008 -0700
numa: move large array from stack to _initdata section
* Move large array "struct bootnode nodes" from stack to _initdata
section to reduce amount of stack space required.
Cc: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit aa6b54461cc5c0019b9d792adf3176b444c10763
Author: Mike Travis <travis at sgi.com>
Date: Mon Mar 31 08:41:55 2008 -0700
asm-generic: add node_to_cpumask_ptr macro
Create a simple macro to always return a pointer to the node_to_cpumask(node)
value. This relies on compiler optimization to remove the extra indirection:
#define node_to_cpumask_ptr(v, node) \
cpumask_t _##v = node_to_cpumask(node), *v = &_##v
For those systems with a large cpumask size, then a true pointer
to the array element can be used:
#define node_to_cpumask_ptr(v, node) \
cpumask_t *v = &(node_to_cpumask_map[node])
A node_to_cpumask_ptr_next() macro is provided to access another
node_to_cpumask value.
The other change is to always include asm-generic/topology.h moving the
ifdef CONFIG_NUMA to this same file.
Note: there are no references to either of these new macros in this patch,
only the definition.
Based on 2.6.25-rc5-mm1
# alpha
Cc: Richard Henderson <rth at twiddle.net>
# fujitsu
Cc: David Howells <dhowells at redhat.com>
# ia64
Cc: Tony Luck <tony.luck at intel.com>
# powerpc
Cc: Paul Mackerras <paulus at samba.org>
Cc: Anton Blanchard <anton at samba.org>
# sparc
Cc: David S. Miller <davem at davemloft.net>
Cc: William L. Irwin <wli at holomorphy.com>
# x86
Cc: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d18d00f5dbcd1a95811617e9812cf0560bd465ee
Author: Mike Travis <travis at sgi.com>
Date: Tue Mar 25 15:06:59 2008 -0700
x86: oprofile: remove NR_CPUS arrays in arch/x86/oprofile/nmi_int.c
Change the following arrays sized by NR_CPUS to be PERCPU variables:
static struct op_msrs cpu_msrs[NR_CPUS];
static unsigned long saved_lvtpc[NR_CPUS];
Also some minor complaints from checkpatch.pl fixed.
Based on:
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
All changes were transparent except for:
static void nmi_shutdown(void)
{
+ struct op_msrs *msrs = &__get_cpu_var(cpu_msrs);
nmi_enabled = 0;
on_each_cpu(nmi_cpu_shutdown, NULL, 0, 1);
unregister_die_notifier(&profile_exceptions_nb);
- model->shutdown(cpu_msrs);
+ model->shutdown(msrs);
free_msrs();
}
The existing code passed a reference to cpu 0's instance of struct op_msrs
to model->shutdown, whilst the other functions are passed a reference to
<this cpu's> instance of a struct op_msrs. This seemed to be a bug to me
even though as long as cpu 0 and <this cpu> are of the same type it would
have the same effect...?
Cc: Philippe Elie <phil.el at wanadoo.fr>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 6b6309b4c7f6da467c5d5b7d18fa8cb79730f381
Author: Mike Travis <travis at sgi.com>
Date: Tue Mar 25 15:06:56 2008 -0700
x86: reduce memory and stack usage in intel_cacheinfo
* Change the following static arrays sized by NR_CPUS to
per_cpu data variables:
_cpuid4_info *cpuid4_info[NR_CPUS];
_index_kobject *index_kobject[NR_CPUS];
kobject * cache_kobject[NR_CPUS];
* Remove the local NR_CPUS array with a kmalloc'd region in
show_shared_cpu_map().
Also some minor complaints from checkpatch.pl fixed.
Cc: H. Peter Anvin <hpa at zytor.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 30ca60c15a725f655e5d3f14e0238a066bc5aeb7
Author: Mike Travis <travis at sgi.com>
Date: Tue Mar 25 15:06:55 2008 -0700
cpumask: add cpumask_scnprintf_len function
Add a new function cpumask_scnprintf_len() to return the number of
characters needed to display "len" cpumask bits. The current method
of allocating NR_CPUS bytes is incorrect as what's really needed is
9 characters per 32-bit word of cpumask bits (8 hex digits plus the
seperator [','] or the terminating NULL.) This function provides the
caller the means to allocate the correct string length.
Cc: Paul Jackson <pj at sgi.com>
Signed-off-by: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9f0e738f492522a2f70ad9a2a0287e4e966c633a
Author: Gregory Haskins <ghaskins at novell.com>
Date: Tue Feb 12 13:30:05 2008 -0500
sched: fix cpus_allowed settings
Signed-off-by: Gregory Haskins <ghaskins at novell.com>
Acked-by: Steven Rostedt <srostedt at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 0297b80339d545045490716fa8591b215fdd9458
Author: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Date: Fri Feb 29 10:02:44 2008 +0530
sched: allow cpuacct stats to be reset
Currently the schedstats implementation does not allow the statistics
to be reset. This patch aims to allow that.
echo 0 > cpuacct.usage
resets the usage. Any other value is not allowed and returns -EINVAL.
Signed-off-by: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 32cd756a80aaef657ac09c76e6eff3ba65567790
Author: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Date: Fri Feb 29 10:02:43 2008 +0530
sched: cleanup cpuacct variable names
Change the variable names to the common convention for the cpuacct
subsystem.
Signed-off-by: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Acked-by: Balbir Singh <balbir at linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 48f20a9a9488c432fc86df1ff4b7f4fa895d1183
Author: Olof Johansson <olof at lixom.net>
Date: Tue Mar 4 15:23:25 2008 -0800
tasklets: execute tasklets in the same order they were queued
I noticed this when looking at an openswan issue. Openswan (ab?)uses the
tasklet API to defer processing of packets in some situations, with one
packet per tasklet_action(). I started noticing sequences of
backwards-ordered sequence numbers coming over the wire, since new tasklets
are always queued at the head of the list but processed sequentially.
Convert it to instead append new entries to the tail of the list. As an
extra bonus, the splicing code in takeover_tasklets() no longer has to
iterate over the list.
Signed-off-by: Olof Johansson <olof at lixom.net>
Cc: "David S. Miller" <davem at davemloft.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ac086bc22997a2be24fc40fc8d46522fe7e03d11
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:44:58 2008 +0200
sched: rt-group: smp balancing
Currently the rt group scheduling does a per cpu runtime limit, however
the rt load balancer makes no guarantees about an equal spread of real-
time tasks, just that at any one time, the highest priority tasks run.
Solve this by making the runtime limit a global property by borrowing
excessive runtime from the other cpus once the local limit runs out.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d0b27fa77854b149ad4af08b0fe47fe712a47ade
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:44:57 2008 +0200
sched: rt-group: synchonised bandwidth period
Various SMP balancing algorithms require that the bandwidth period
run in sync.
Possible improvements are moving the rt_bandwidth thing into root_domain
and keeping a span per rt_bandwidth which marks throttled cpus.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 57d3da2911787a101a384532f4519f9640bae883
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Feb 27 14:05:10 2008 +0100
time: add ns_to_ktime()
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 79b3feffb10417f197d2ab48dd4fa3c0c9e7d788
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Mon Feb 18 13:39:37 2008 +0100
sched: fix regression with sched yield
Balbir Singh reported:
> 1:mon> t
> [c0000000e7677da0] c000000000067de0 .sys_sched_yield+0x6c/0xbc
> [c0000000e7677e30] c000000000008748 syscall_exit+0x0/0x40
> --- Exception: c01 (System Call) at 00000400001d09e4
> SP (4000664cb10) is in userspace
> 1:mon> r
> cpu 0x1: Vector: 300 (Data Access) at [c0000000e7677aa0]
> pc: c000000000068e50: .yield_task_fair+0x94/0xc4
> lr: c000000000067de0: .sys_sched_yield+0x6c/0xbc
the check that should have avoided that is:
/*
* Are we the only task in the tree?
*/
if (unlikely(rq->load.weight == curr->se.load.weight))
return;
But I guess that overlooks rt tasks, they also increase the load.
So I guess something like this ought to fix it..
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 19fb518c2a0c5d88ed22bba7083b7e7bc2a9c231
Author: Dmitry Adamushko <dmitry.adamushko at gmail.com>
Date: Sun Feb 17 22:34:07 2008 +0100
latencytop: optimize LT_BACKTRACEDEPTH loops a bit
There is no need to loop any longer when 'same == 0'.
Signed-off-by: Dmitry Adamushko <dmitry.adamushko at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 50df5d6aea6694ca481b8005900401e8c95c2603
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Mar 14 16:09:59 2008 +0100
sched: remove sysctl_sched_batch_wakeup_granularity
it's unused.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 02e2b83bd25bb05ac2e69cb31458b7d1b3c70707
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Mar 19 01:37:10 2008 +0100
sched: reenable sync wakeups
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d25ce4cd499a21aab89ff8755f8c4a2800eae25f
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Mar 17 09:36:53 2008 +0100
sched: cache hot buddy
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 1fc8afa4c820fcde3658238eab5c010476ede521
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Mar 19 01:39:19 2008 +0100
sched: feat affine wakeups
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b85d0667268320072ccdeb07c27c25b300ab3724
Author: Ingo Molnar <mingo at elte.hu>
Date: Sun Mar 16 20:03:22 2008 +0100
sched: introduce SCHED_FEAT_SYNC_WAKEUPS, turn it off
turn off sync wakeups by default. They are not needed anymore - the
buddy logic should be smart enough to keep the system from
overscheduling.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 0bbd3336eee1e712a290e0dfd1a64cbbdd63a508
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Sat Apr 19 19:44:57 2008 +0200
sched: fix wakeup granularity for buddies
The wakeup buddy logic didn't use the same wakeup granularity logic as the
wakeup preemption did, this might cause the ->next buddy to be selected past
the point where we would have preempted had the task been a single running
instance.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 15934a37324f32e0fda633dc7984a671ea81cd75
Author: Guillaume Chazarain <guichaz at yahoo.fr>
Date: Sat Apr 19 19:44:57 2008 +0200
sched: fix rq->clock overflows detection with CONFIG_NO_HZ
When using CONFIG_NO_HZ, rq->tick_timestamp is not updated every TICK_NSEC.
We check that the number of skipped ticks matches the clock jump seen in
__update_rq_clock().
Signed-off-by: Guillaume Chazarain <guichaz at yahoo.fr>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 30914a58af9d21c5f1831adabb5d7a800a378675
Author: Reynes Philippe <tremyfr at yahoo.fr>
Date: Mon Mar 17 16:19:05 2008 -0700
sched: sched.c needs tick.h
kernel/sched.c:506: erreur: implicit declaration of function tick_get_tick_sched
kernel/sched.c:506: erreur: invalid type argument of ->
kernel/sched.c:506: erreur: NOHZ_MODE_INACTIVE undeclared (first use in this function)
kernel/sched.c:506: erreur: (Each undeclared identifier is reported only once
kernel/sched.c:506: erreur: for each function it appears in.)
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 27ec4407790d075c325e1f4da0a19c56953cce23
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu Feb 28 21:00:21 2008 +0100
sched: make cpu_clock() globally synchronous
Alexey Zaytsev reported (and bisected) that the introduction of
cpu_clock() in printk made the timestamps jump back and forth.
Make cpu_clock() more reliable while still keeping it fast when it's
called frequently.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 018d6db4cb5bbdcd65424a16f2dcca692ed32ae4
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Apr 14 08:53:32 2008 +0200
sched: re-do "sched: fix fair sleepers"
re-apply:
| commit e22ecef1d2658ba54ed7d3fdb5d60829fb434c23
| Author: Ingo Molnar <mingo at elte.hu>
| Date: Fri Mar 14 22:16:08 2008 +0100
|
| sched: fix fair sleepers
|
| Fair sleepers need to scale their latency target down by runqueue
| weight. Otherwise busy systems will gain ever larger sleep bonus.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 34d0559178393547505ec9492321255405f4e441
Author: Jack Steiner <steiner at sgi.com>
Date: Wed Apr 16 11:45:15 2008 -0500
x86: UV startup of slave cpus
This patch changes smpboot.c so that it can start slave cpus running
in UV non-unique apicid mode. The SIPI must be sent using a UV-specific
mechanism.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 098cb7f27ed69276e4db560a444b94b982e4bb8f
Author: Glauber Costa <gcosta at redhat.com>
Date: Wed Apr 9 13:18:10 2008 -0300
x86: integrate pci-dma.c
The code in pci-dma_{32,64}.c are now sufficiently
close to each other. We merge them in pci-dma.c.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit bb8ada95a7c11adf3dad4e8d5c55ef1650560592
Author: Glauber Costa <gcosta at redhat.com>
Date: Wed Apr 9 13:18:09 2008 -0300
x86: don't do dma if mask is NULL.
if the device hasn't provided a mask, abort allocation.
Note that we're using a fallback device now, so it does not cover
the case of a NULL device: just drivers passing NULL masks around.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit da60cab4dd922cd933e82bace490f6155a32a90e
Author: Glauber Costa <gcosta at redhat.com>
Date: Wed Apr 9 13:18:08 2008 -0300
x86: return conditional to mmu
Just return our allocation if we don't have an mmu. For i386, where this patch
is being applied, we never have. So our goal is just to have the code to look like
x86_64's.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit aa99b16faadcc9a5b6bd9550fda117a8e9e46d26
Author: Glauber Costa <gcosta at redhat.com>
Date: Wed Apr 9 13:18:07 2008 -0300
x86: remove kludge from x86_64
The claim is that i386 does it. Just it does not.
So remove it.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8f19ca1341a6d89bd96e2e69e6e10f46d3258089
Author: Glauber Costa <gcosta at redhat.com>
Date: Wed Apr 9 13:18:06 2008 -0300
x86: unify gfp masks
Use the same gfp masks for x86_64 and i386.
It involves using HIGHMEM or DMA32 where necessary, for the sake
of code compatibility, (no real effect), and using the NORETRY
mask for i386.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5fa78ca75d8e67063948a01b51594a0904af5710
Author: Glauber Costa <gcosta at redhat.com>
Date: Wed Apr 9 13:18:05 2008 -0300
x86: retry allocation if failed
This patch puts in the code to retry allocation in case it fails. By its
own, it does not make much sense but making the code look like x86_64.
But later patches in this series will make we try to allocate from
zones other than DMA first, which will possibly fail.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8779f2fc3b84ebb6c5181fb13d702e9944c16069
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:21:05 2008 -0300
x86: don't try to allocate from DMA zone at first
If we fail, we'll loop into the allocation again,
and then allocate in the DMA zone.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 45a07e774950ef479f8996c0e2c5550dd6440453
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:21:04 2008 -0300
x86: use a fallback dev for i386
We can use a fallback dev for cases of a NULL device being passed (mostly ISA)
This comes from x86_64 implementation.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit d1a079029036881375110f78df47d352e7c28a77
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:21:02 2008 -0300
x86: use numa allocation function in i386
We can do it here to, in the same way x86_64 does.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 71848d687e2a477cb7c68a854d8fdeaa5dff0ffc
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:21:01 2008 -0300
x86: remove virt_to_bus in pci-dma_64.c
virt_to_bus() is deprecated according to the docs, and moreover,
won't return the right thing in i386 if we're dealing with high memory mappings.
So we make our allocation function return a page, and then use page_address() (for
virtual addr) and page_to_phys() (for physical addr) instead.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2e33e361188617628e47b4bc47e87e84feaf556f
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:59 2008 -0300
x86: adjust dma_free_coherent for i386
We call unmap_single, if available.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit cac67877d268f21da74d879a355247e4e25b5b5f
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:21:00 2008 -0300
x86: move bad_dma_address
It goes to pci-dma.c, and is removed from the arch-specific files.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit d09d815c1b1d437a3ea89ecd92c91179266d1243
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:58 2008 -0300
x86: isolate coherent mapping functions
i386 implements the declare coherent memory API, and x86_64 does not
it is reflected in pieces of dma_alloc_coherent and dma_free_coherent.
Those pieces are isolated in separate functions, that are declared
as empty macros in x86_64. This way we can make the code the same.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8e8edc6401205da3000cc3dfa76f3fd28a21d73c
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:57 2008 -0300
x86: move dma_coherent functions to pci-dma.c
They are placed in an ifdef, since they are i386 specific
the structure definition goes to dma-mapping.h.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:56 2008 -0300
x86: merge iommu initialization parameters
we merge the iommu initialization parameters in pci-dma.c
Nice thing, that both architectures at least recognize the same
parameters.
usedac i386 parameter is marked for deprecation
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8e0c379718ef32967deea55937895bfc9b493dd8
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:55 2008 -0300
x86: merge dma_supported
The code for both arches are very similar, so this patch merge them.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit bca5c09663030bdd18ab1b3ccb6671f663c3345a
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:53 2008 -0300
x86: move pci fixup to pci-dma.c
via_no_dac provides a fixup that is the same for both
architectures. Move it to pci-dma.c.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 116890d556af38d539597655c564a73e6eef3d9e
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:54 2008 -0300
x86: move x86_64-specific to common code.
This patch moves the bootmem functions, that are largely
x86_64-specific into pci-dma.c. The code goes inside an ifdef.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit cb5867a5d8ca20e16ddc3397c36ee9c2e4cba219
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:51 2008 -0300
x86: move initialization functions to pci-dma.c
initcalls that triggers the various possibiities for
dma subsys are moved to pci-dma.c.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit f9c258de3494a5249a61fe110ece2082e5927468
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:52 2008 -0300
x86: unify pci-nommu
merge pci-base_32.c and pci-nommu_64.c into pci-nommu.c
Their code were made the same, so now they can be merged.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 85c246ee16fe00bf7bf9e7ff09a5d17d9a83cf71
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:50 2008 -0300
x86: move definition to pci-dma.c
Move dma_ops structure definition to pci-dma.c, where it
belongs.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit d741bde26dc3444eaeb269051d3f0b623b24de13
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:48 2008 -0300
x86: use dma_length in i386
This is done to get the code closer to x86_64.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5b3e5b7273435f8a7f83d3556a09adfd6f247e36
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:49 2008 -0300
x86: use WARN_ON in mapping functions
In the very same way i386 do, we use WARN_ON functions
in map_simple and map_sg.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 30db2cbf38d68f466fd34488f8312a151225c9ac
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:47 2008 -0300
x86: use sg_phys in x86_64
To make the code usable in i386, where we have high memory mappings,
we drop te virt_to_bus(sg_virt()) construction in favour of sg_phys.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit e4dcdd6b4fa33efee94e89cccd75e871c570c510
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:46 2008 -0300
x86: Add flush_write_buffers in nommu functions
This patch adds flush_write_buffers() in some functions of pci-nommu_64.c
They are added anywhere i386 would also have it. This is not a problem
for x86_64, since flush_rite_buffers() an nop for it.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 9f9ab46d557c32b9cad49c31d094d659ec3b59c0
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:45 2008 -0300
x86: implement mapping_error in pci-nommu_64.c
This patch implements mapping_error for pci-nommu_64.c.
It takes care to keep the same compatible behaviour it already
had. Although this file is not (yet) used for i386, we introduce
the i386 version here. Again, care is taken, even at the expense of
an ifdef, to keep the same behaviour inconditionally.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit d5df63f48a67400a26eba15624aa883897a4f4d1
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:44 2008 -0300
x86: delete empty functions from pci-nommu_64.c
This functions are now called conditionally on their
existence in the struct. So just delete them, instead
of keeping an empty implementation.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 459121c9ec1e6c5d701f6520f4170719ac008951
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Apr 8 13:20:43 2008 -0300
x86: introduce pci-dma.c
This patch introduces pci-dma.c, a common file for pci dma
between i386 and x86_64. As a start, dma_set_mask() is the same
between architectures, and is placed there.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 19e395afb44746ce7422a9eabcf883d5eec2bb80
Author: Mark McLoughlin <markmc at redhat.com>
Date: Thu Mar 27 11:03:15 2008 +0000
x86: move dma_supported and dma_set_mask to pci-dma_32.c, fix
ERROR: "dma_supported" [drivers/ssb/ssb.ko] undefined!
ERROR: "dma_set_mask" [drivers/scsi/qla2xxx/qla2xxx.ko] undefined!
ERROR: "dma_set_mask" [drivers/scsi/aic7xxx/aic7xxx.ko] undefined!
ERROR: "dma_set_mask" [drivers/scsi/aic7xxx/aic79xx.ko] undefined!
ERROR: "dma_supported" [drivers/net/pcnet32.ko] undefined!
ERROR: "dma_supported" [drivers/media/video/saa7134/saa7134.ko] undefined!
ERROR: "dma_set_mask" [drivers/media/video/meye.ko] undefined!
ERROR: "dma_supported" [drivers/media/video/cx88/cx8802.ko] undefined!
ERROR: "dma_supported" [drivers/media/video/cx88/cx8800.ko] undefined!
ERROR: "dma_supported" [drivers/media/video/cx88/cx88-alsa.ko] undefined!
ERROR: "dma_supported" [drivers/media/video/cx23885/cx23885.ko] undefined!
They just need to be exported like on x86_64.
dma_supported() and dma_set_mask() were previously inlined,
but are now moved to pci-dma_32.c.
Since they're used by various drivers, they need to be
exported.
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b7107a3d9da2e122fb7f33dd1482254ff40fdf96
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:39 2008 -0300
x86: delete the arch-specific dma-mapping headers.
all the code that is left is ready to be merged as-is
in dma-mapping.h.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit ae17a63b096b05007bacafd2f92414b881a0b4b4
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:38 2008 -0300
x86: move ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY to dma-mapping.h
define it conditionally to i386.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit c786df08f6df2833e34e78cee5ef62558e3b5346
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:37 2008 -0300
x86: unify dma_mapping_error
We provide a map_error function in pci-base_32.c to make
sure i386 keeps with the same behaviour it used to.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 7c18341665917b493fa40eeb3c7ff6c1a5ac47db
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:36 2008 -0300
x86: provide a bad_dma_address symbol for i386
It's initially 0, since we don't expect any DMA there.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b48ee7135230ac43b6820d59a784ac0bd51ae552
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:35 2008 -0300
x86: align to clflush size
Do it instead of using the conservative approach we're currently
doing. This is the way x86_64 does, and this patch makes this piece
of code the same between them, ready to be integrated.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 802c1f6648aeb3eea670b4ef8b10014169b65699
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:34 2008 -0300
x86: move dma_supported and dma_set_mask to pci-dma_32.c
This is the way x86_64 does, so this make them equal. They have
to be extern now in the header, and the extern definition is moved to
the common dma-mapping.h header.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 3cb6a91711a682adb3aa95da2ed8d47512cc3c41
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:33 2008 -0300
x86: move dma_cache_sync to common header
they are the same in both architectures.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2be621498d461b63ca6124f86e3b9582e1a8e722
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 19 19:19:56 2008 +0200
x86: dma-ops on highmem fix
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4d92fbf231fe23ec07d18820a141c573a7f5017a
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:32 2008 -0300
x86: move dma_map_page and dma_unmap_page to common header
They are similar enough to do this move.
the macro version is ugly, and we use inline functions instead.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8d396ded71a9b378fc3e846095e50565606f2df6
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:31 2008 -0300
x86: move alloc and free coherent to common header
they are the same between architectures. (except for the fact
that x86_64 has duplicate code)
move them to dma-mapping.h
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit e7f3a913f91b7bfef3a93dff27930f24bdfcd2c0
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:30 2008 -0300
x86: move dma_sync_sg_for_device to common header
i386 gets an empty function.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit ed435dee9cb470082e4550edbfcbc7e81132e976
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:29 2008 -0300
x86: move dma_sync_sg_for_cpu to common header
i386 gets an empty function.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 713623326c816b145105769f174ec237815e53f1
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:28 2008 -0300
x86: move dma_sync_single_range_for_device to common header
i386 gets an empty function.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 627610fcb70164991ed0d11110a56c43b15b9312
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:27 2008 -0300
x86: move dma_sync_single_range_for_cpu to common header
i386 gets an empty function.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 9231b269e09ed60910c159cf668f887623b7ac58
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:26 2008 -0300
x86: move dma_sync_single_for_device to common header
i386 gets an empty function.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit c01dd8cf7d19b869af1668c80a34a955c871f607
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:25 2008 -0300
x86: move dma_sync_single_for_cpu to common header
i386 gets an empty function.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 72c784f82c378df1903676acd2efc5eeb5cac579
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:24 2008 -0300
x86: move dma_unmap_sg to common header
i386 gets an empty function.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 16a3ce9bae667178f79a4951fc0ba8b515b5b733
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:23 2008 -0300
x86: move dma_map_sg to common header
the old i386 implementation is moved to pci-base_32.c
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 0cb0ae68323657663e4e8c0c1ce82a5af6621bbb
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:22 2008 -0300
x86: move dma_unmap_single to common header
i386 base does not need it, so it gets an empty function.
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 22456b97148be300e25e9cb97244656775972475
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:21 2008 -0300
x86: implement dma_map_single through dma_ops
That's already the name of the game for x86_64. For i386,
we add a pci-base_32.c, that will hold the default operations.
The function call itself goes through dma-mapping.h , the common
header
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 6f5366354bf86f8d2c1cf241c9bbf44b2d350e30
Author: Glauber Costa <gcosta at redhat.com>
Date: Tue Mar 25 18:36:20 2008 -0300
x86: move dma_ops struct definition to dma-mapping.h
take it off the x86_64 specific header
Signed-off-by: Glauber Costa <gcosta at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 752bea4abbff5e3ffef36802b860e80d0b632990
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Fri Mar 7 15:02:50 2008 -0800
x86: reserve dma32 early for gart
a system with 256 GB of RAM, when NUMA is disabled crashes the
following way:
Your BIOS doesn't leave a aperture memory hole
Please enable the IOMMU option in the BIOS setup
This costs you 64 MB of RAM
Cannot allocate aperture memory hole (ffff8101c0000000,65536K)
Kernel panic - not syncing: Not enough memory for aperture
Pid: 0, comm: swapper Not tainted 2.6.25-rc4-x86-latest.git #33
Call Trace:
[<ffffffff84037c62>] panic+0xb2/0x190
[<ffffffff840381fc>] ? release_console_sem+0x7c/0x250
[<ffffffff847b1628>] ? __alloc_bootmem_nopanic+0x48/0x90
[<ffffffff847b0ac9>] ? free_bootmem+0x29/0x50
[<ffffffff847ac1f7>] gart_iommu_hole_init+0x5e7/0x680
[<ffffffff847b255b>] ? alloc_large_system_hash+0x16b/0x310
[<ffffffff84506a2f>] ? _etext+0x0/0x1
[<ffffffff847a2e8c>] pci_iommu_alloc+0x1c/0x40
[<ffffffff847ac795>] mem_init+0x45/0x1a0
[<ffffffff8479ff35>] start_kernel+0x295/0x380
[<ffffffff8479f1c2>] _sinittext+0x1c2/0x230
the root cause is : memmap PMD is too big,
[ffffe200e0600000-ffffe200e07fffff] PMD ->ffff81383c000000 on node 0
almost near 4G..., and vmemmap_alloc_block will use up the ram under 4G.
solution will be:
1. make memmap allocation get memory above 4G...
2. reserve some dma32 range early before we try to set up memmap for all.
and release that before pci_iommu_alloc, so gart or swiotlb could get some
range under 4g limit for sure.
the patch is using method 2.
because method1 may need more code to handle SPARSEMEM and SPASEMEM_VMEMMAP
will get
Your BIOS doesn't leave a aperture memory hole
Please enable the IOMMU option in the BIOS setup
This costs you 64 MB of RAM
Mapping aperture over 65536 KB of RAM @ 4000000
Memory: 264245736k/268959744k available (8484k kernel code, 4187464k reserved, 4004k data, 724k init)
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 6ec6e0d9f2fd7cb6ca6bc3bfab5ae7b5cdd8c36f
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Tue Mar 25 10:14:35 2008 -0700
srat, x86: add support for nodes spanning other nodes
For example, If the physical address layout on a two node system with 8 GB
memory is something like:
node 0: 0-2GB, 4-6GB
node 1: 2-4GB, 6-8GB
Current kernels fail to boot/detect this NUMA topology.
ACPI SRAT tables can expose such a topology which needs to be supported.
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8705a49c35be088a50b8d5fc5e1aa24d6711fd5b
Author: Roland McGrath <roland at redhat.com>
Date: Mon Apr 14 12:19:30 2008 -0700
x86 vDSO: compile with -g, 64-bit
The 64-bit vDSO's sources are compiled with -g0 for no good reason.
Using -g when enabled lets their separate debug files be used at
runtime via build ID matching, same as we can see 32-bit vDSO's
assembly sources.
Signed-off-by: Roland McGrath <roland at redhat.com>
Acked-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2adee9b30d1382fba97825b9c50e4f50a0117c36
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Wed Apr 16 10:25:35 2008 +0200
x86: fpu xstate split fix
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 1679f2710ac58df580d3716fab1f42ae50a226eb
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Wed Apr 16 10:27:53 2008 +0200
x86: fpu xstate split cleanup
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit aa283f49276e7d840a40fb01eee6de97eaa7e012
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Mon Mar 10 15:28:05 2008 -0700
x86, fpu: lazy allocation of FPU area - v5
Only allocate the FPU area when the application actually uses FPU, i.e., in the
first lazy FPU trap. This could save memory for non-fpu using apps.
for example: on my system after boot, there are around 300 processes, with
only 17 using FPU.
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Cc: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 61c4628b538608c1a85211ed8438136adfeb9a95
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Mon Mar 10 15:28:04 2008 -0700
x86, fpu: split FPU state from task struct - v5
Split the FPU save area from the task struct. This allows easy migration
of FPU context, and it's generally cleaner. It also allows the following
two optimizations:
1) only allocate when the application actually uses FPU, so in the first
lazy FPU trap. This could save memory for non-fpu using apps. Next patch
does this lazy allocation.
2) allocate the right size for the actual cpu rather than 512 bytes always.
Patches enabling xsave/xrstor support (coming shortly) will take advantage
of this.
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit fa5c4639419668cbb18ca3d20c1253559a3b43ae
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Apr 16 02:29:42 2008 +0200
x86: rename find_max_pfn() to propagate_e820_map()
this function doesnt just 'find' the max_pfn - it also has
other side-effects such as registering sparse memory maps.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit d8bb6f4c1670c8324e4135c61ef07486f7f17379
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Tue Apr 1 19:45:18 2008 +0200
x86: tsc prevent time going backwards
We already catch most of the TSC problems by sanity checks, but there
is a subtle bug which has been in the code forever. This can cause
time jumps in the range of hours.
This was reported in:
http://lkml.org/lkml/2007/8/23/96
and
http://lkml.org/lkml/2008/3/31/23
I was able to reproduce the problem with a gettimeofday loop test on a
dual core and a quad core machine which both have sychronized
TSCs. The TSCs seems not to be perfectly in sync though, but the
kernel is not able to detect the slight delta in the sync check. Still
there exists an extremly small window where this delta can be observed
with a real big time jump. So far I was only able to reproduce this
with the vsyscall gettimeofday implementation, but in theory this
might be observable with the syscall based version as well.
CPU 0 updates the clock source variables under xtime/vyscall lock and
CPU1, where the TSC is slighty behind CPU0, is reading the time right
after the seqlock was unlocked.
The clocksource reference data was updated with the TSC from CPU0 and
the value which is read from TSC on CPU1 is less than the reference
data. This results in a huge delta value due to the unsigned
subtraction of the TSC value and the reference value. This algorithm
can not be changed due to the support of wrapping clock sources like
pm timer.
The huge delta is converted to nanoseconds and added to xtime, which
is then observable by the caller. The next gettimeofday call on CPU1
will show the correct time again as now the TSC has advanced above the
reference value.
To prevent this TSC specific wreckage we need to compare the TSC value
against the reference value and return the latter when it is larger
than the actual TSC value.
I pondered to mark the TSC unstable when the readout is smaller than
the reference value, but this would render an otherwise good and fast
clocksource unusable without a real good reason.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f1326973262382150c26bf4dfccd0fce310c4a9c
Author: Erik Bosman <ebn310 at few.vu.nl>
Date: Fri Apr 11 18:57:22 2008 +0200
generic, x86: add tests for prctl PR_GET_TSC and PR_SET_TSC
This patch adds three tests that test whether the PR_GET_TSC and
PR_SET_TSC commands have the desirable effect.
The tests check whether the control register is updated correctly
at context switches and try to discover bugs while enabling/disabling
the timestamp counter.
Signed-off-by: Erik Bosman <ejbosman at cs.vu.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 529e25f646e08901a6dad5768f681efffd77225e
Author: Erik Bosman <ejbosman at cs.vu.nl>
Date: Mon Apr 14 00:24:18 2008 +0200
x86: implement prctl PR_GET_TSC and PR_SET_TSC
This patch implements the PR_GET_TSC and PR_SET_TSC prctl()
commands on the x86 platform (both 32 and 64 bit.) These
commands control the ability to read the timestamp counter
from userspace (the RDTSC instruction.)
While the RDTSC instuction is a useful profiling tool,
it is also the source of some non-determinism in ring-3.
For deterministic replay applications it is useful to be
able to trap and emulate (and record the outcome of) this
instruction.
This patch uses code earlier used to disable the timestamp
counter for the SECCOMP framework. A side-effect of this
patch is that the SECCOMP environment will now also disable
the timestamp counter on x86_64 due to the addition of the
TIF_NOTSC define on this platform.
The code which enables/disables the RDTSC instruction during
context switches is in the __switch_to_xtra function, which
already handles other unusual conditions, so normal
performance should not have to suffer from this change.
Signed-off-by: Erik Bosman <ejbosman at cs.vu.nl>
Acked-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8fb402bccf203ecca8f9e0202b8fd3c937dece6f
Author: Erik Bosman <ebn310 at few.vu.nl>
Date: Fri Apr 11 18:54:17 2008 +0200
generic, x86: add prctl commands PR_GET_TSC and PR_SET_TSC
This patch adds prctl commands that make it possible
to deny the execution of timestamp counters in userspace.
If this is not implemented on a specific architecture,
prctl will return -EINVAL.
ned-off-by: Erik Bosman <ejbosman at cs.vu.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5deb45e39b946901ae028ccd3a1d0b35fa387475
Author: Steven Rostedt <srostedt at redhat.com>
Date: Sat Apr 19 19:19:55 2008 +0200
ftrace: add notrace annotations for NMI routines
This annotates NMI functions with notrace. Some tracers may be able
to live with this, but some cannot. The safest is to turn it off,
it's not particularly interesting anyway.
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4bd01600b214275a80a69b44393d7e81d43c2faa
Author: Pavel Machek <pavel at ucw.cz>
Date: Tue Feb 19 11:02:30 2008 +0100
x86: clean up =0 initializations in arch/x86/kernel/tsc_32.c
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit f5a1b191b37ac2609e2babeec1b21f411da93e4d
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Sat Apr 12 10:28:25 2008 +0200
x86: fix exec mappings comments
- noexec32 is on by default for years already
- add noexec32 to kernel-parameters and fix noexec typo in there
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4a9f54cfd21f313b9858f951783512d3f14e58a4
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Thu Apr 10 15:06:38 2008 -0700
x86: cleanup: change _end to end_before_pgt
cleanup: change the _end in compressed vmlinux_64.lds.
also change _heap to _ebss that is not needed.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 7c53976404e2f906c60b69cc5793add87ee49c6a
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Tue Apr 8 12:54:30 2008 +0200
x86: cleanup boot-heap usage
The kernel decompressor wrapper uses memory located beyond the
end of the image. This might lead to hard to debug problems,
but even if it can be proven to be safe, it is at the very
least unclean. I don't see any advantages either, unless you
count it not being zeroed out as an advantage. This patch
moves the boot-heap area to the bss segment.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4c8337ac425b220594fec45ad6d3ac76d3ce2b90
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Thu Apr 10 15:09:50 2008 -0700
x86: fix arch/x86/mm/ioremap.c warning
Fix printk formats in x86/mm/ioremap.c:
next-20080410/arch/x86/mm/ioremap.c:137: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'resource_size_t'
next-20080410/arch/x86/mm/ioremap.c:188: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'resource_size_t'
next-20080410/arch/x86/mm/ioremap.c:188: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'long unsigned int'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 1a7a34af78923f8807d054a15133a8fcf47e385e
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Thu Apr 10 13:40:57 2008 +0200
x86: e820_64, fix section mismatch warning
fix section mismatch warnings which occurs on my x86_64 box while compiling
linux-next-20080410:
Warning messages:
WARNING: arch/x86/kernel/built-in.o(.text+0x7bc2): Section mismatch in reference from the function bad_addr() to the
variable .init.data:early_res
The function bad_addr() references
the variable __initdata early_res.
This is often because bad_addr lacks a __initdata
annotation or the annotation of early_res is wrong.
WARNING: arch/x86/kernel/built-in.o(.text+0x7c3b): Section mismatch in reference from the function bad_addr_size() to
the variable .init.data:early_res
The function bad_addr_size() references
the variable __initdata early_res.
This is often because bad_addr_size lacks a __initdata
annotation or the annotation of early_res is wrong.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 120d5bf128906c790df810e159d2e1239d08fef1
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Wed Apr 9 22:53:50 2008 +0200
x86: remove vm86.h inclusion from process_32.c
I've made a small investigation about vm86.h inclusion rules and it
looks like everything is more or less ok.
Files that rely on asm/vm86.h symbols are:
- kprobes.c
- process_32.c
- signal_32.c
- traps_32.c
- vm86_32.c
File process_32.c includes vm86.h explicitly. We can remove that
include and it won't break anything.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit cf9b111c170733dde39139e8989b676ec8b81573
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Sat Mar 8 18:15:06 2008 +0800
x86: remove pointless comments
Remove old comments that include the old arch/i386 directory.
Signed-off-by: WANG Cong <xiyou.wangcong at gmail.com>
Acked-by: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit a7d5ac87b220829bb077cdc8e01c4fd4714ae41e
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Mar 4 22:05:27 2008 -0800
x86: pageattr.c fix shadowed variable warning
irqs_disabled() uses flags internally, use _flags to avoid shadowing
code calling into this macro.
Introduced between 2.6.25-rc3 and -rc4
Fixes the sparse warning:
arch/x86/mm/pageattr.c:383:21: warning: symbol 'flags' shadows an earlier one
arch/x86/mm/pageattr.c:369:16: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 8ce116e5993cf64729a4d2b3dc2c0f072852654b
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue Feb 26 08:52:16 2008 +0100
x86: clean up cpu capabilities accesses, p4-clockmod.c
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2b8106a0a3d3c1e5b69f091192bc99019ff4d81d
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Tue Mar 18 12:51:22 2008 -0700
x86_64: do not reserve ramdisk two times
ramdisk is reserved via reserve_early in x86_64_start_kernel,
later early_res_to_bootmem() will convert to reservation in bootmem.
so don't need to reserve that again.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 4a3575fd436aa98957184afd745e4ada8f1542d8
Author: Huang, Ying <ying.huang at intel.com>
Date: Mon Feb 25 15:18:37 2008 +0800
x86: EFI_PAGE_SHIFT fix
Make x86 EFI code works when EFI_PAGE_SHIFT != PAGE_SHIFT. The
memrage_efi_to_native() provided in this patch can be used on other
EFI platform such as IA64 too.
This patch has been tested on Intel x86_64 platform with EFI 64/32
firmware.
Signed-off-by: Huang Ying <ying.huang at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit f8dfd5ed149ae340451f25847b434297c20d4645
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Apr 19 19:19:54 2008 +0200
x86: KGDB build fix
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit cf816ecb533ab96b883dfdc0db174598b5b5c4d2
Merge: adf6d34e460387ee3e8f1e1875d52bff51212c7d 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Apr 19 17:17:34 2008 +0100
Merge branch 'merge-fixes' into devel
commit adf6d34e460387ee3e8f1e1875d52bff51212c7d
Merge: d1964dab60ce7c104dd21590e987a8787db18051 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Apr 19 17:17:29 2008 +0100
Merge branch 'omap2-upstream' into devel
commit d1964dab60ce7c104dd21590e987a8787db18051
Merge: ba9279519b371340e01cadf4c230e9d52a4bf8c4 ad48ce74f70a201c4c1cf3b4e8f6b6203a2e4a8d b685004f8dea2daae0306edcd358ed7de751aee9 c34002c102880bfac5b449b41e5313dcda186db8 fdb72fd84c26438a7dd754a1cc74890aca7f1b77 c48b2e90aecf037f53913fc8d198d01fce0fbf3c 3a8daaa49fb71d90e45d1e86d7f9f9e298bda05c 04c366f06341259c88886a0d359e3597ba4c23f6 875492511a4afce7880c9dd0ca71462c299b40e6 58762e77aec49aa4b43a9ff62e7a3aee17720c41 3e238be2f75f2a6d5d5064eda46ac96268c6411e 140749e2bf8d7c80a50c9fcce1435bb2b4e423c4 05944d74bc28fffbcce159cb915d0acff82f30a1
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Apr 19 17:17:25 2008 +0100
Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc', 'ns9x', 'orion', 'pxa', 'sa1100', 's3c' and 'sparsemem' into devel
commit 58762e77aec49aa4b43a9ff62e7a3aee17720c41
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Sun Apr 6 23:08:15 2008 +0200
[ARM] pxa: Phycore pcm-990-specific code for the PXA270 Quick Capture driver
Platform-specific code for Phytec's phyCORE-PXA270 platform
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 3f3acefb63dc70d767f730045ab7ebaa81938d77
Author: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Date: Fri Apr 11 22:19:45 2008 +0200
[ARM] pxa: V4L2 soc_camera driver for PXA270
This patch adds a driver for the Quick Capture Interface on the PXA270.
It is based on the original driver from Intel, but has been re-worked
multiple times since then, now it also supports the V4L2 API.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 0e623941bec7e80c97b076d346327b31ae17d84a
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Apr 19 16:46:54 2008 +0100
[ARM] pxa: restrict availability of pxa2xx PCMCIA drivers
Not all PXA2xx platforms provide the necessary support files for
PCMCIA to work, let alone build. Stop the build errors by making
PXA2xx PCMCIA support only available on those platforms which have
supplied the support files.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 140749e2bf8d7c80a50c9fcce1435bb2b4e423c4
Author: Ben Dooks <ben-linux at fluff.org>
Date: Sat Apr 19 13:08:43 2008 +0100
[ARM] 5005/1: BAST: Fix kset_name initialiser
Fix the pm sys device .name initialiser which was
missed when updating the last patch submission.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit eb1f7d10d6b6728c87f79f30d1ae844d01d3486a
Author: Davide Rizzo <davide at elpa.it>
Date: Sat Apr 12 15:08:15 2008 +0100
[ARM] 4967/1: Adds functions to set clkout rate for Samsung S3C2410
This patch adds functions to set clkout rate for Samsung S3C2410
This patch supersedes 4884/1, that contained an error
Comments from Ben Dooks:
Note, looks like this needs to be applied before 4882/1
Signed-off-by: Davide Rizzo <davide at elpa.it>
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit b685004f8dea2daae0306edcd358ed7de751aee9
Author: Ryan Mallon <ryan at bluewatersys.com>
Date: Wed Apr 16 02:56:35 2008 +0100
[ARM] 4988/1: Add GPIO lib support to the EP93xx
Adds support for the generic GPIO lib to the EP93xx family. The gpio
handling code has been moved from core.c to a new file called gpio.c.
The GPIO based IRQ code has not been changed.
Signed-off-by: Ryan Mallon <ryan at bluewatersys.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 05944d74bc28fffbcce159cb915d0acff82f30a1
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu Nov 30 20:43:51 2006 +0000
[ARM] Add initial sparsemem support
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 1c104e0e4f6ab396960c058e95e18bdedcac945b
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Apr 19 10:59:24 2008 +0100
[ARM] pxa: initialise PXA devices before platform init code
Initialise PXA devices before platform initialisation, so that
platforms can parent devices to these.
Acked-by: eric miao <ymiao3 at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit c546106cc15d300a5b3eba5a514c9238bb6593e8
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Sat Apr 19 10:42:06 2008 +0100
[ARM] 5002/1: tosa: add two more leds
This adds support for two more leds:
the wlan one (found in SL-6000W and SL-6000L) and
the blutooth one (found in SL-6000W).
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit ba4eb7e60b11eba1ccd89d448e6d87d98df95da8
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Sat Apr 19 10:42:25 2008 +0100
[ARM] 5004/1: Tosa: make several unreferenced structures static.
Now that scoop gpio's are converted to generic_gpio,
tosascoop_device and tosascoop_jc_device don't have
to be exported.
Also make tosa_gpio_* static
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit d8a42fc45517081d1a8cf050a86eb79b0e290774
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Sat Apr 19 10:42:18 2008 +0100
[ARM] 5003/1: Shut up sparse warnings
Shut up sparse warnings by making GPIO_IRQ_MASK unisgned
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit b907ef688ddb6d73fc1c83b6fbcd62f5c2c2a14f
Author: Mark Brown <broonie at sirena.org.uk>
Date: Tue Apr 15 16:12:44 2008 +0100
[ARM] 4977/2: soc - pxa2xx-ac97 - Add missing clk_enable()
Add missing clk_enable()
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Acked-by: eric miao <eric.y.miao at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 768dec4cc397a9c041b0f3cd605d3f6f758883e4
Author: Mark Brown <broonie at sirena.org.uk>
Date: Tue Apr 15 15:50:49 2008 +0100
[ARM] 4976/1: zylonite: Configure GPIO for WM9713 IRQ line
Set up the IRQ line for the WM9713 device on the Zylonite.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Acked-by: eric miao <eric.y.miao at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 507012f0a503287f212ef1139683c8938ecedbcd
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Sat Apr 12 21:26:39 2008 +0100
[ARM] 4974/1: Drop unused leds-tosa.
As now tosa uses leds-gpio, drop leds-tosa driver.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 311c736c19ec5d9cfc9518542aeee844c2bc7a86
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Sat Apr 12 20:17:02 2008 +0100
[ARM] 4973/1: Tosa: use leds-gpio driver.
Now as the scoop pins are covered by the generic gpio API,
we can use leds-gpio driver instead of special leds-tosa.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit d4e7d09f7accd1b0d1c8f149a44deffc8c141a46
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Sat Apr 12 20:16:16 2008 +0100
[ARM] 4972/1: Tosa: convert scoop GPIOs usage to generic gpio code
Convert set/reset_scoop_gpio to generic gpio calls.
This patch depends on the pxaficp_ir hooks patch.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit baf1c5d2a08c828d6333e0a37bcdf5afb3d5d003
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Sat Apr 12 20:08:16 2008 +0100
[ARM] 4971/1: pxaficp_ir: provide startup and shutdown hooks
Let platform do some specific initialisation and cleanup
things during pxaficp_ir probing and removing. E.g. this
can be usefull to request/free gpios used by the platform
to control the transceiver.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit e21e2d467ab4dd050dd02620c74be1e2665d20b9
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sun Apr 13 17:38:55 2008 +0100
[ARM] pxa: lubbock: move mis-placed SPI info
The SPI information got placed in the middle of the SMC91x data.
Lets move it up a few lines so that we keep related things grouped
together.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 0aa975613320fcd8434087b6d61ef6990ec24e7d
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Sat Apr 12 20:02:50 2008 +0100
[ARM] 4970/1: tosa: correct gpio used for wake up.
TOSA_GPIO_ON_KEY can't wakeup the device. But the board
provides TOSA_GPIO_POWERON which is OR of (on_ac) and (on_button).
Use it for wake up.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit b168281c07adf0a13f17368532fe787f1d23fd30
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Sat Apr 12 13:29:22 2008 +0100
[ARM] 4966/1: magician: add MFP pin configuration
Although the GPIO alternate functions should be correctly set
by the bootloader, configure them here to be sure.
To save power, FFUART/BTUART/STUART are left unconfigured (output, low)
until they are needed by pxaficp or the magician GSM chipset driver.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 81447b2ee6a62cef884aa017e70bbe8c02f0d63b
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Sat Apr 12 13:28:02 2008 +0100
[ARM] 4965/1: magician: use htc-pasic3,leds-pasic3,ds1wm,leds-gpio
This patch enables LEDs and the 1-wire bus (connected to
a DS2760 battery monitor) on the magician.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 5dc3339aa5ba29593ea57814049ddca8c12831c8
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Sat Apr 12 13:25:41 2008 +0100
[ARM] 4964/1: htc-pasic3: MFD driver for PASIC3 LED control + DS1WM chip
This driver will provide registers, clocks and GPIOs of
the HTC PASIC3 (AIC3) and PASIC2 (AIC2) chips to the
ds1wm and leds-pasic3 drivers.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 481ea5a16aaabe2570d56b5a4d29fa80adc8008b
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Thu Apr 10 15:43:18 2008 +0100
[ARM] 4958/2: tosa: fix i2c registration.
Add a call to pxa_set_i2c_info() to force i2c registration
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 2cb4734232e62ee95c1f7dafdc032b652eef49d7
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Thu Apr 10 11:00:32 2008 +0100
[ARM] 4960/1: Rewrite tosa pin configuration to use MFP tables.
Clean up all pins configuration to use currently proposed MFP table
schema.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Acked-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 64c1dd3bbf67c958992c098d5d464a014df3fa46
Author: Mike Rapoport <mike at compulab.co.il>
Date: Thu Apr 10 06:34:29 2008 +0100
[ARM] 4959/1: PXA: Fix misprint in CICR1_RGBT_CONV
This patch fixes misprint in definition of CICR1_RGBT_CONV in include/asm-arm/arch-pxa/pxa-regs.h
Signed-off-by: Mike Rapoport <mike at compulab.co.il>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 60802188ece1c5b63deefc05b7b442625e575476
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Apr 9 19:28:53 2008 +0100
[ARM] 4953/1: magician: add backlight power switching GPIOs
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit e07ff8d8091eff8e208fe1e406c15e5de0fffd63
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Apr 9 19:27:10 2008 +0100
[ARM] 4952/1: magician: add LCD detection, LCD power switching, update pxafb settings
All magician devices I've encountered so far have featured the Toppoly
TD028STEB1 display, so the Samsung LTP280QV support is untested.
The power-on sequence is not correct because pxafb doesn't yet support
enabling the LCD controller in the middle of the it.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 350d115d1eaa29e64324847badf27c93159ba8e0
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Apr 9 19:25:56 2008 +0100
[ARM] 4951/1: magician: enable external power supply (pda_power) driver
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit bdb0c16acb51b7bf15d626848f287691ef39dbe8
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Apr 9 19:24:55 2008 +0100
[ARM] 4950/1: magician: enable MMC support
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit aa7975901b949501d47af8225f23bee1116cd441
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Apr 9 19:24:05 2008 +0100
[ARM] 4949/1: magician: enable flash VPP GPIO and build in MTD, physmap-flash and JFFS2
This enables rootfs on StrataFlash if the bootloader supplies the
partition list.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 70e357f8426c54e1500ac4fdb6b1172df16d8b93
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Apr 9 19:22:57 2008 +0100
[ARM] 4948/1: magician: use htc-egpio to drive the GPIO/IRQ expander CPLD
needed for power management (audio, BT, charging, GSM, LCD, SD), GSM, flash and SD operation and audio routing.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit a1635b8fe59de2c5223cda5ca8397b875c901904
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Apr 9 19:20:34 2008 +0100
[ARM] 4947/1: htc-egpio, a driver for GPIO/IRQ expanders with fixed input/output pins
implemented in CPLD chips on several HTC devices.
The original driver was written by Kevin O'Connor, I have adapted it to
use gpiolib and made the bus/register widths configurable.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit e6816f34e4ee237fc1b54e0357e9ea31462ad411
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Apr 9 19:14:15 2008 +0100
[ARM] 4944/2: magician: enable i2c bus
Since recent PXA changes the (non-power-)I2C bus has to be explicitly
enabled from board initialisation code.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 103a1754894eecf488103f7739061e7e767049ad
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Apr 9 19:11:52 2008 +0100
[ARM] 4943/2: magician: fix magician.h GPIO header includes
PXA GPIO definitions were split from pxa-regs.h into pxa2xx-gpio.h.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit df56eacdd5b1018f3f2831ff245a7cb70c602454
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Tue Apr 8 19:36:06 2008 +0100
[ARM] 4942/1: magician: fix the backlight driver name
corgi_bl was renamed to generic_bl.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 4fa575b2376c26a2204f9d848e7555452888b69b
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Tue Apr 8 19:35:18 2008 +0100
[ARM] 4941/1: Add initial defconfig for HTC Magician PDA phones
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit b86a5da8f7f57b9b0fe468d83d3f2af297fa1e14
Author: Mark Brown <broonie at sirena.org.uk>
Date: Wed Apr 9 11:32:21 2008 +0100
[ARM] 4946/1: pxa3xx: Print an error if we refuse to suspend
The PXA3xx will not suspend if there are no wakeup sources configured.
Print a diagnostic message to make it easier for the user to see what's
happening.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Acked-by: eric miao <eric.y.miao at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 835e7f1c9ab03db6aa51973aee71d13ccb09cb19
Author: Mark Brown <broonie at sirena.org.uk>
Date: Mon Apr 7 17:16:34 2008 +0100
[ARM] 4901/3: mainstone: Register primary I2C bus
Mainstone has the primary I2C bus exposed for use on plugin modules.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Acked-by: eric miao <eric.y.miao at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 90b8fc34968d3f6c70e309d97597682f119220b9
Author: Jaya Kumar <jayakumar.arm at gmail.com>
Date: Sat Mar 15 05:11:07 2008 +0100
[ARM] 4867/1: Adds flash, udc, mci support for gumstix F boards
This patch implements support for Gumstix-F flash, udc and mci. Fixes since the last time are:
- Steve Sakoman as maintainer
- cleanup for udc and mci setup
Signed-off-by: Jaya Kumar <jayakumar.lkml at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 4354e188121d92c28647146b70a8c303b46a7dcd
Author: eric miao <eric.miao at marvell.com>
Date: Fri Feb 22 13:48:15 2008 +0800
[ARM] pxa: remove keypad register definitions from pxa-regs.h
Keypad registers are now fully defined within pxa27x-keypad.c, no
need to keep those definitions in pxa-regs.h
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 5fa41510f0f481d5139c732c5c6aac4b4a722828
Author: eric miao <eric.miao at marvell.com>
Date: Wed Jan 23 15:07:22 2008 +0800
[ARM] pxa: add keypad support for littleton
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 468e086f78fb4ff69cefc256d7cd0673e95906d6
Author: eric miao <eric.miao at marvell.com>
Date: Wed Jan 23 14:25:50 2008 +0800
[ARM] pxa: add keypad support for zylonite
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 55c26e4011572a2e1329cbff92e930838010ba88
Author: eric miao <eric.miao at marvell.com>
Date: Wed Jan 23 14:25:27 2008 +0800
[ARM] pxa: add partial keypad support for mainstone
This is partial because mainstone's keypad is really special, some of
the keys like '1', '2', ... are actually connected to two row/column
juntions, thus pressing '1' is equivalent to pressing 'A' & 'H'.
This is really brain damanged since it makes distinguishing between
pressing '1' and multiple keys pressing of 'A' & 'H' difficult.
So these special keys are not supported for the time being.
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 37320980414f5a7654ee08a047194224c6bba46e
Author: eric miao <eric.miao at marvell.com>
Date: Wed Jan 23 13:39:13 2008 +0800
[ARM] pxa: add pxa27x_keypad device and pxa_set_keypad_info()
also update the clk definitions in pxa27x and pxa3xx.
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 450d28749c9bf2cc6d274695fe454bb53456428d
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 11 10:06:38 2008 +0800
[ARM] pxa: use gpio_keys.c to support mainstone's wakeup switch of GPIO1
NOTE: currently don't know if the key code of KEY_SUSPEND is fit for
such usage.
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit c0a596d6a138ea281bed4ff3018c07c45dd245a2
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 11 09:46:28 2008 +0800
[ARM] pxa: allow dynamic enable/disable of GPIO wakeup for pxa{25x,27x}
Changes include:
1. rename MFP_LPM_WAKEUP_ENABLE into MFP_LPM_CAN_WAKEUP to indicate
the board capability of this pin to wakeup the system
2. add gpio_set_wake() and keypad_set_wake() to allow dynamically
enable/disable wakeup from GPIOs and keypad GPIO
* these functions are currently kept in mfp-pxa2xx.c due to their
dependency to the MFP configuration
3. pxa2xx_mfp_config() only gives early warning if MFP_LPM_CAN_WAKEUP
is set on incorrect pins
So that the GPIO's wakeup capability is now decided by the following:
a) processor's capability: (only those GPIOs which have dedicated
bits within PWER/PRER/PFER can wakeup the system), this is
initialized by pxa{25x,27x}_init_mfp()
b) board design decides:
- whether the pin is designed to wakeup the system (some of
the GPIOs are configured as other functions, which is not
intended to be a wakeup source), by OR'ing the pin config
with MFP_LPM_CAN_WAKEUP
- which edge the pin is designed to wakeup the system, this
may depends on external peripherals/connections, which is
totally board specific; this is indicated by MFP_LPM_EDGE_*
c) the corresponding device's (most likely the gpio_keys.c) wakeup
attribute:
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 9b02b2df0099c083ea40ba8c7068e3dcbe381302
Author: eric miao <eric.miao at marvell.com>
Date: Wed Feb 13 08:52:38 2008 +0800
[ARM] pxa: use new pin configuration mechanism for lubbock
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit fef06d274feb9b0e5a2d20c29b2979634514243f
Author: eric miao <eric.miao at marvell.com>
Date: Mon Feb 4 17:15:50 2008 +0800
[ARM] pxa: use new pin configuration mechanism for mainstone
1. the following code to configure PGSRx is no way portable and
intuitive:
- PGSR0 = 0x00008800;
- PGSR1 = 0x00000002;
- PGSR2 = 0x0001FC00;
- PGSR3 = 0x00001F81;
this is removed as low power state has already been encoded in
the pin configuration definitions.
Note: there is no specific reason for some of the GPIOs to drive
high in low power mode as indicated by the above setting, those
bits are ignored, and the result is validated to work.
2. the following code to configure GPIO wakeup is removed as this
is now totally handled by pxa2xx_mfp_config():
- PWER = 0xC0000002;
- PRER = 0x00000002;
- PFER = 0x00000002;
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 3d3934c357103504d0f0a5e9ab808bb57e356f6a
Author: eric miao <eric.miao at marvell.com>
Date: Sun Feb 3 15:49:09 2008 +0800
[ARM] pxa: move ARRAY_AND_SIZE definition to generic.h
for use by other platforms
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 7facc2f9374159795af2a3f8b3e682b4ee230643
Author: eric miao <eric.miao at marvell.com>
Date: Wed Mar 5 17:16:29 2008 +0800
[ARM] pxa: add MFP-alike pin configuration support for pxa{25x, 27x}
Pin configuration on pxa{25x,27x} has now separated from generic GPIO
into dedicated mfp-pxa2xx.c by this patch. The name "mfp" is borrowed
from pxa3xx and is used here to alert the difference between the two
concepts: pin configuration and generic GPIOs. A GPIO can be called
a "GPIO" _only_ when the corresponding pin is configured so.
A pin configuration on pxa{25x,27x} is composed of:
- alternate function selection (or pin mux as commonly called)
- low power state or sleep state
- wakeup enabling from low power mode
The following MFP_xxx bit definitions in mfp.h are re-used:
- MFP_PIN(x)
- MFP_AFx
- MFP_LPM_DRIVE_{LOW, HIGH}
- MFP_LPM_EDGE_*
Selecting alternate function on pxa{25x, 27x} involves configuration
of GPIO direction register GPDRx, so a new bit and MFP_DIR_{IN, OUT}
are introduced. And pin configurations are defined by the following
two macros:
- MFP_CFG_IN : for input alternate functions
- MFP_CFG_OUT : for output alternate functions
Every configuration should provide a low power state if it configured
as output using MFP_CFG_OUT(). As a general guideline, the low power
state should be decided to minimize the overall power dissipation. As
an example, it is better to drive the pin as high level in low power
mode if the GPIO is configured as an active low chip select.
Pins configured as GPIO are defined by MFP_CFG_IN(). This is to avoid
side effects when it is firstly configured as output. The actual
direction of the GPIO is configured by gpio_direction_{input, output}
Wakeup enabling on pxa{25x, 27x} is actually GPIO based wakeup, thus
the device based enable_irq_wake() mechanism is not applicable here.
E.g. invoking enable_irq_wake() with a GPIO IRQ as in the following
code to enable OTG wakeup is by no means portable and intuitive, and
it is valid _only_ when GPIO35 is configured as USB_P2_1:
enable_irq_wake( gpio_to_irq(35) );
To make things worse, not every GPIO is able to wakeup the system.
Only a small number of them can, on either rising or falling edge,
or when level is high (for keypad GPIOs).
Thus, another new bit is introduced to indicate that the GPIO will
wakeup the system:
- MFP_LPM_WAKEUP_ENABLE
The following macros can be used in platform code, and be OR'ed to
the GPIO configuration to enable its wakeup:
- WAKEUP_ON_EDGE_{RISE, FALL, BOTH}
- WAKEUP_ON_LEVEL_HIGH
The WAKEUP_ON_LEVEL_HIGH is used for keypad GPIOs _only_, there is
no edge settings for those GPIOs.
These WAKEUP_ON_* flags OR'ed on wrong GPIOs will be ignored in case
that platform code author is careless enough.
The tradeoff here is that the wakeup source is fully determined by
the platform configuration, instead of enable_irq_wake().
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit a683b14df8f4320d0ef6cac93a6d9806173bf339
Author: eric miao <eric.miao at marvell.com>
Date: Mon Mar 3 09:44:25 2008 +0800
[ARM] pxa: separate GPIOs and their mode definitions to pxa2xx-gpio.h
two reasons:
1. GPIO namings and their mode definitions are conceptually not part
of the PXA register definitions
2. this is actually a temporary move in the transition of PXA2xx to
use MFP-alike APIs (as what PXA3xx is now doing), so that legacy
code will still work and new code can be added in step by step
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 4be35e236c4a0e346442d98de3e470cf87c4e947
Author: eric miao <eric.miao at marvell.com>
Date: Mon Feb 4 10:07:09 2008 +0800
[ARM] pxa: move mfp sysdev registeration out for suspend/resume order
MFP configurations after resume should be done before the GPIO registers
are restored. Move the mfp sysdev registeration to the same place where
GPIO and IRQ sysdev(s) are registered to better control the order.
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 06b2666e89c85640c7eddd67e7bee292a9afeceb
Author: eric miao <eric.miao at marvell.com>
Date: Mon Mar 3 08:59:13 2008 +0800
[ARM] pxa: rename mfp.c to mfp-pxa3xx.c to indicate it's pxa3xx specific
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 689c04a3904d68343a9258e2de12412e3bb89d09
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 4 17:18:38 2008 +0800
[ARM] pxa: make pxa_gpio_irq_type() processor generic
The main issue here is that pxa3xx does not have GAFRx registers,
access directly to these registers should be avoided for pxa3xx:
1. introduce __gpio_is_occupied() to indicate the GAFRx and GPDRx
registers are already configured on pxa{25x,27x} while returns
0 always on pxa3xx
2. pxa_gpio_mode(gpio | GPIO_IN) is replaced directly with assign-
ment of GPDRx, the side effect of this change is that the pin
_must_ be configured before use, pxa_gpio_irq_type() will not
change the pin to GPIO, as this restriction is sane, esp. with
the new MFP framework
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 663707c1a99b23a79f9e21117b7c1bdbfe80a899
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 4 16:13:58 2008 +0800
[ARM] pxa: move GPIO sysdev outside of generic.c into gpio.c
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit b9e25aced33eeb7279ccbaef198f28370cfb4e93
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 4 14:19:58 2008 +0800
[ARM] pxa: merge assignment of set_wake into pxa_init_{irq,gpio}()
To further clean up the GPIO and IRQ structure:
1. pxa_init_irq_gpio() and pxa_init_gpio() combines into a single
function pxa_init_gpio()
2. assignment of set_wake merged into pxa_init_{irq,gpio}() as
an argument
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit f6fb7af4768bc1ddc2349f6eaefedd746c8e4913
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 4 13:53:05 2008 +0800
[ARM] pxa: integrate low IRQ chip (ICIP) and high IRQ chip (ICIP2) into one
This makes the code better organized and simplified a bit. The change
will lose a bit of performance when performing IRQ ack/mask/unmask,but
that's not too much after checking the result binary.
This patch also removes the ugly #ifdef CONFIG_PXA27x .. #endif by
carefully not to access those pxa{27x,3xx} specific registers, this
is done by keeping an internal IRQ number variable. The pxa-regs.h
is also modified so registers for IRQ > PXA_IRQ(31) are made public
even if CONFIG_PXA{27x,3xx} isn't defined (for pxa25x's sake)
The incorrect assumption in the original code that internal irq starts
from 0 is also corrected by comparing with PXA_IRQ(0).
"struct sys_device" for the IRQ are reduced into one single device on
pxa{27x,3xx}.
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit e3630db1fa7677b350fd5a1ac5498cc48448ae28
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 4 11:42:26 2008 +0800
[ARM] pxa: move GPIO IRQ specific code out of irq.c into gpio.c
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 0e037bbb4a639fff01cebf552db19237ec688678
Author: eric miao <eric.miao at marvell.com>
Date: Mon Mar 3 13:20:20 2008 +0800
[ARM] pxa: introduce GPIO_CHIP() macro to clean up the definitions
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit dfa1067996390dfd4b1ce449676500fab4980ce2
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 4 11:18:48 2008 +0800
[ARM] pxa: cleanup the coding style of pxa_gpio_set_type()
by
1. wrapping long lines and making comments tidy
2. using IRQ_TYPE_* instead of migration macros __IRQT_*
3. introduce a pr_debug() for the commented printk(KERN_DEBUG ...)
stuff
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit a7bf4dbabac2a1ccd56527a56c82af720e7a00d1
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 4 11:12:14 2008 +0800
[ARM] pxa: make GPIO IRQ code less dependent on the internal IRQs
by:
1. introduce dedicated pxa_{mask,unmask}_low_gpio()
2. remove set_irq_chip(IRQ_GPIO_2_x, ...) which has already been
initialized in pxa_init_irq()
3. introduce dedicated pxa_init_gpio_set_wake()
Signed-off-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 7a26d3a33fd9adcbfd4fa2ca2d7e8a8272817935
Author: eric miao <eric.miao at marvell.com>
Date: Tue Mar 4 10:57:18 2008 +0800
[ARM] pxa: generalize the muxed gpio IRQ handling code with loop and ffs()
1. As David Brownell suggests, using ffs() is going to make the loop
a bit faster (by avoiding unnecessary shift and iteration)
2. Russell suggested find_{first,next}_bit() being used with the
gedr[] array
Signed-off-by: eric miao <eric.miao at marvell.com>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit d72b1370b0b45f1fabda5ae4d603773d8a2c226a
Author: Robert Jarzmik <rjarzmik at free.fr>
Date: Sun Mar 16 11:55:32 2008 +0100
[ARM] 4868/1: Enhance pxa270 GPIO definitions
Enhanced GPIO alternate functions descriptions,
taken from Intel PXA270 Developers Manual.
Signed-off-by: Robert Jarzmik <rjarzmik at free.fr>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 942de47bfee24143ecbf75b981b32143bd414529
Author: Mark Brown <broonie at sirena.org.uk>
Date: Tue Mar 4 11:14:24 2008 +0100
[ARM] 4834/3: Convert ASoC pxa2xx-ac97 driver to use the clock API
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Acked-by: Takashi Iwai <tiwai at suse.de>
Acked-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 93873fbfd86c08ac3e4f1b37e667cf858a8b2fab
Author: Mark Brown <broonie at sirena.org.uk>
Date: Tue Mar 4 11:14:25 2008 +0100
[ARM] 4833/3: Convert non-SoC PXA2xx AC97 driver to clock API
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Acked-by: Takashi Iwai <tiwai at suse.de>
Acked-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 60bfe7fa3dc13fe90d273371b65ae3ec89583c52
Author: Mark Brown <broonie at sirena.org.uk>
Date: Tue Mar 4 11:14:23 2008 +0100
[ARM] 4832/2: Support AC97CLK on PXA3xx via the clock API
The AC97 clock rate on PXA3xx is generated with a configurable divider
from sys_pll.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Acked-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 27b98a671ff4cda89ba279452115000da59a9067
Author: Mark Brown <broonie at sirena.org.uk>
Date: Tue Mar 4 11:14:22 2008 +0100
[ARM] 4831/2: Add PXA2xx AC97 clocks to clock API
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Acked-by: eric miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit dcc88a170ce9f90e4b819c67feebb16e8a123f79
Author: Mark Brown <broonie at sirena.org.uk>
Date: Wed Feb 13 16:39:21 2008 +0100
[ARM] 4830/1: Add support for the CLK_POUT pin on PXA3xx CPUs
Expose control of the PXA3xx 13MHz CLK_POUT pin via the clock API
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit c48b2e90aecf037f53913fc8d198d01fce0fbf3c
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Fri Apr 18 13:29:47 2008 -0700
[ARM] remove redundant display of free swap space in show_mem()
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 28fab1a2fd5b1aa92f9ad1adc9e3b8914f89bc74
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sun Apr 13 17:47:35 2008 +0100
[ARM] Fix kernel mode preemption
Luc Van Oostenryck reported:
The code removed by this patch tested the irq_cpustat_t members
__local_irq_count and __local_bh_count but these fields have
been removed some time ago:
http://git.kernel.org/?p=linux/kernel/git/tglx/history.git;a=commitdiff;h=3ab146c93e039dec99fec8d441a8dd046fe510cc
Fix this oversight.
Acked-by: Bill Gatliff <bgat at billgatliff.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 84081bd2205efd1e6c7203bc7099b4350839ee39
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date: Fri Mar 28 21:11:47 2008 +0100
[ARM] 4881/1: print unrecognised processor ID as part of failure message
If we fail to boot due to an unsupported processor ID, print the
processor ID as part of the failure message.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Acked-by: Nicolas Pitre <nico at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 0f9801463b0aa9ac7253a250ec6bc37e6f77d31d
Author: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Date: Thu Mar 6 16:22:33 2008 +0100
[ARM] 4854/1: fix the load address of uImage for CONFIG_ZBOOT_ROM=y
U-Boot puts an image at the load address specified in the uImage
header before jumping to the entry point.
In the CONFIG_ZBOOT_ROM case ZBOOT_ROM_TEXT is the right load
address.
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit cbfc0f04069a426f3c8b4b35021117f6833df9ca
Author: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Date: Thu Mar 6 16:22:00 2008 +0100
[ARM] 4852/1: Add timerfd_create, timerfd_settime and timerfd_gettime syscall entries
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 184dd48102425467fbbb209765894b04f668a9de
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Mar 8 15:58:03 2008 +0000
[ARM] Update mach-types
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Apr 19 10:14:31 2008 +0100
[ARM] Remove leds-tosa.c
See f99ee0b99214cf5329e711859e3f5fd02c820a24
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit ad775f5a8faa5845377f093ca11caf577404add9
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:38:01 2008 -0800
[PATCH] r/o bind mounts: debugging for missed calls
There have been a few oopses caused by 'struct file's with NULL f_vfsmnts.
There was also a set of potentially missed mnt_want_write()s from
dentry_open() calls.
This patch provides a very simple debugging framework to catch these kinds of
bugs. It will WARN_ON() them, but should stop us from having any oopses or
mnt_writer count imbalances.
I'm quite convinced that this is a good thing because it found bugs in the
stuff I was working on as soon as I wrote it.
[hch: made it conditional on a debug option.
But it's still a little bit too ugly]
[hch: merged forced remount r/o fix from Dave and akpm's fix for the fix]
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 2e4b7fcd926006531935a4c79a5e9349fe51125b
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:38:00 2008 -0800
[PATCH] r/o bind mounts: honor mount writer counts at remount
Originally from: Herbert Poetzl <herbert at 13thfloor.at>
This is the core of the read-only bind mount patch set.
Note that this does _not_ add a "ro" option directly to the bind mount
operation. If you require such a mount, you must first do the bind, then
follow it up with a 'mount -o remount,ro' operation:
If you wish to have a r/o bind mount of /foo on bar:
mount --bind /foo /bar
mount -o remount,ro /bar
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 3d733633a633065729c9e4e254b2e5442c00ef7e
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:59 2008 -0800
[PATCH] r/o bind mounts: track numbers of writers to mounts
This is the real meat of the entire series. It actually
implements the tracking of the number of writers to a mount.
However, it causes scalability problems because there can be
hundreds of cpus doing open()/close() on files on the same mnt at
the same time. Even an atomic_t in the mnt has massive scalaing
problems because the cacheline gets so terribly contended.
This uses a statically-allocated percpu variable. All want/drop
operations are local to a cpu as long that cpu operates on the same
mount, and there are no writer count imbalances. Writer count
imbalances happen when a write is taken on one cpu, and released
on another, like when an open/close pair is performed on two
Upon a remount,ro request, all of the data from the percpu
variables is collected (expensive, but very rare) and we determine
if there are any outstanding writers to the mount.
I've written a little benchmark to sit in a loop for a couple of
seconds in several cpus in parallel doing open/write/close loops.
http://sr71.net/~dave/linux/openbench.c
The code in here is a a worst-possible case for this patch. It
does opens on a _pair_ of files in two different mounts in parallel.
This should cause my code to lose its "operate on the same mount"
optimization completely. This worst-case scenario causes a 3%
degredation in the benchmark.
I could probably get rid of even this 3%, but it would be more
complex than what I have here, and I think this is getting into
acceptable territory. In practice, I expect writing more than 3
bytes to a file, as well as disk I/O to mask any effects that this
has.
(To get rid of that 3%, we could have an #defined number of mounts
in the percpu variable. So, instead of a CPU getting operate only
on percpu data when it accesses only one mount, it could stay on
percpu data when it only accesses N or fewer mounts.)
[AV] merged fix for __clear_mnt_mount() stepping on freed vfsmount
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 2c463e95480829a2fe8f386589516e13b1289db6
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:56 2008 -0800
[PATCH] r/o bind mounts: check mnt instead of superblock directly
If we depend on the inodes for writeability, we will not catch the r/o mounts
when implemented.
This patches uses __mnt_want_write(). It does not guarantee that the mount
will stay writeable after the check. But, this is OK for one of the checks
because it is just for a printk().
The other two are probably unnecessary and duplicate existing checks in the
VFS. This won't make them better checks than before, but it will make them
detect r/o mounts.
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit ec82687f29127a954dd0da95dc1e0a4ce92b560c
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:53 2008 -0800
[PATCH] r/o bind mounts: elevate count for xfs timestamp updates
Elevate the write count during the xfs m/ctime updates.
XFS has to do it's own timestamp updates due to an unfortunate VFS
design limitation, so it will have to track writers by itself aswell.
[hch: split out from the touch_atime patch as it's not related to it at all]
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 2f676cbc0d60ae806216c7a61c6971bd72dedde8
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:55 2008 -0800
[PATCH] r/o bind mounts: make access() use new r/o helper
It is OK to let access() go without using a mnt_want/drop_write() pair because
it doesn't actually do writes to the filesystem, and it is inherently racy
anyway. This is a rare case when it is OK to use __mnt_is_readonly()
directly.
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 9ac9b8474c39c3ae2c2b37d8e1f08db8a9146124
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:52 2008 -0800
[PATCH] r/o bind mounts: write counts for truncate()
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 2af482a7edfb8810539cacc2fdd8242611ca43bb
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:50 2008 -0800
[PATCH] r/o bind mounts: elevate write count for chmod/chown callers
chown/chmod,etc... don't call permission in the same way that the normal
"open for write" calls do. They still write to the filesystem, so bump the
write count during these operations.
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 4a3fd211ccfc08a88edc824300e25a87785c6a5f
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:48 2008 -0800
[PATCH] r/o bind mounts: elevate write count for open()s
This is the first really tricky patch in the series. It elevates the writer
count on a mount each time a non-special file is opened for write.
We used to do this in may_open(), but Miklos pointed out that __dentry_open()
is used as well to create filps. This will cover even those cases, while a
call in may_open() would not have.
There is also an elevated count around the vfs_create() call in open_namei().
See the comments for more details, but we need this to fix a 'create, remount,
fail r/w open()' race.
Some filesystems forego the use of normal vfs calls to create
struct files. Make sure that these users elevate the mnt
writer count because they will get __fput(), and we need
to make sure they're balanced.
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 42a74f206b914db13ee1f5ae932dcd91a77c8579
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:46 2008 -0800
[PATCH] r/o bind mounts: elevate write count for ioctls()
Some ioctl()s can cause writes to the filesystem. Take these, and make them
use mnt_want/drop_write() instead.
[AV: updated]
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 20ddee2c75339cc095f6191c3115f81da8955e96
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:43 2008 -0800
[PATCH] r/o bind mounts: write count for file_update_time()
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 74f9fdfa1f229284ee1ea58fa47f2cdeeb12f6fe
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:42 2008 -0800
[PATCH] r/o bind mounts: elevate write count for do_utimes()
Now includes fix for oops seen by akpm.
"never let a libc developer write your kernel code" - hch
"nor, apparently, a kernel developer" - akpm
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Cc: Valdis Kletnieks <Valdis.Kletnieks at vt.edu>
Cc: Balbir Singh <balbir at in.ibm.com>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit cdb70f3f74b31576cc4d707a3d3b00d159cab8bb
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:41 2008 -0800
[PATCH] r/o bind mounts: write counts for touch_atime()
Remove handling of NULL mnt while we are at it - that can't happen these days.
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit a761a1c03a739f04afd6c8d37fd16405bbe754da
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:39 2008 -0800
[PATCH] r/o bind mounts: elevate write count for ncp_ioctl()
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 18f335aff86913de3c76f88d32c8135c1da62ce6
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:38 2008 -0800
[PATCH] r/o bind mounts: elevate write count for xattr_permission() callers
This basically audits the callers of xattr_permission(), which calls
permission() and can perform writes to the filesystem.
[AV: add missing parts - removexattr() and nfsd posix acls, plug for a leak
spotted by Miklos]
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 9079b1eb1753f217c3de9f1b7dd7fd549cc3f0cf
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:49 2008 -0800
[PATCH] r/o bind mounts: get write access for vfs_rename() callers
This also uses the little helper in the NFS code to make an if() a little bit
less ugly. We introduced the helper at the beginning of the series.
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 75c3f29de7451677c59580b0a959f694f36aac28
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:45 2008 -0800
[PATCH] r/o bind mounts: write counts for link/symlink
[AV: add missing nfsd pieces]
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 463c3197263bd26ac59a00d2484990e17e35c50e
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:57 2008 -0800
[PATCH] r/o bind mounts: get callers of vfs_mknod/create/mkdir()
This takes care of all of the direct callers of vfs_mknod().
Since a few of these cases also handle normal file creation
as well, this also covers some calls to vfs_create().
So that we don't have to make three mnt_want/drop_write()
calls inside of the switch statement, we move some of its
logic outside of the switch and into a helper function
suggested by Christoph.
This also encapsulates a fix for mknod(S_IFREG) that Miklos
found.
[AV: merged mkdir handling, added missing nfsd pieces]
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 0622753b800e4cc6cb9319b36b27658c72dd7cdc
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:34 2008 -0800
[PATCH] r/o bind mounts: elevate write count for rmdir and unlink.
Elevate the write count during the vfs_rmdir() and vfs_unlink().
[AV: merged rmdir and unlink parts, added missing pieces in nfsd]
Acked-by: Serge Hallyn <serue at us.ibm.com>
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 49e0d02cf018d4edf24bfc8531a816a26367e4ce
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:32 2008 -0800
[PATCH] r/o bind mounts: drop write during emergency remount
The emergency remount code forcibly removes FMODE_WRITE from
filps. The r/o bind mount code notices that this was done
without a proper mnt_drop_write() and properly gives a
warning.
This patch does a mnt_drop_write() to keep everything
balanced.
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit aceaf78da92a53f5e1b105649a1b8c0afdb2135c
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:31 2008 -0800
[PATCH] r/o bind mounts: create helper to drop file write access
If someone decides to demote a file from r/w to just
r/o, they can use this same code as __fput().
NFS does just that, and will use this in the next
patch.
AV: drop write access in __fput() only after we evict from file list.
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Cc: Erez Zadok <ezk at cs.sunysb.edu>
Cc: Trond Myklebust <trond.myklebust at fys.uio.no>
Cc: "J Bruce Fields" <bfields at fieldses.org>
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 8366025eb80dfa0d8d94b286d53027081c280ef1
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:30 2008 -0800
[PATCH] r/o bind mounts: stub functions
This patch adds two function mnt_want_write() and mnt_drop_write(). These are
used like a lock pair around and fs operations that might cause a write to the
filesystem.
Before these can become useful, we must first cover each place in the VFS
where writes are performed with a want/drop pair. When that is complete, we
can actually introduce code that will safely check the counts before allowing
r/w<->r/o transitions to occur.
Acked-by: Serge Hallyn <serue at us.ibm.com>
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit a70e65df8812c52252fa07a2eb92a46451a4427f
Author: Christoph Hellwig <hch at lst.de>
Date: Fri Feb 15 14:37:28 2008 -0800
[PATCH] merge open_namei() and do_filp_open()
open_namei() will, in the future, need to take mount write counts
over its creation and truncation (via may_open()) operations. It
needs to keep these write counts until any potential filp that is
created gets __fput()'d.
This gets complicated in the error handling and becomes very murky
as to how far open_namei() actually got, and whether or not that
mount write count was taken. That makes it a bad interface.
All that the current do_filp_open() really does is allocate the
nameidata on the stack, then call open_namei().
So, this merges those two functions and moves filp_open() over
to namei.c so it can be close to its buddy: do_filp_open(). It
also gets a kerneldoc comment in the process.
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit d57999e1527f0b0c818846dcba5a23015beb4823
Author: Dave Hansen <haveblue at us.ibm.com>
Date: Fri Feb 15 14:37:27 2008 -0800
[PATCH] do namei_flags calculation inside open_namei()
My end goal here is to make sure all users of may_open()
return filps. This will ensure that we properly release
mount write counts which were taken for the filp in
may_open().
This patch moves the sys_open flags to namei flags
calculation into fs/namei.c. We'll shortly be moving
the nameidata_to_filp() calls into namei.c, and this
gets the sys_open flags to a place where we can get
at them when we need them.
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Dave Hansen <haveblue at us.ibm.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 6188e10d38b8d7244ee7776d5f1f88c837b4b93f
Author: Matthew Wilcox <matthew at wil.cx>
Date: Fri Apr 18 22:21:05 2008 -0400
Convert asm/semaphore.h users to linux/semaphore.h
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit d7b1acd3b524b39f418e463e836b48ac041954d6
Author: Matthew Wilcox <matthew at wil.cx>
Date: Tue Feb 26 10:49:01 2008 -0500
security: Remove unnecessary inclusions of asm/semaphore.h
None of these files use any of the functionality promised by
asm/semaphore.h.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit f42b38009e1dbd4509a865e5ea0e91a1722c979d
Author: Matthew Wilcox <matthew at wil.cx>
Date: Tue Feb 26 10:48:12 2008 -0500
lib: Remove unnecessary inclusions of asm/semaphore.h
reed_solomon doesn't use any of the functionality promised by
asm/semaphore.h.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit a6550207538619bc9b90bac2e1d5e54902a432ad
Author: Matthew Wilcox <matthew at wil.cx>
Date: Tue Feb 26 10:47:18 2008 -0500
kernel: Remove unnecessary inclusions of asm/semaphore.h
None of these files use any of the functionality promised by
asm/semaphore.h.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit 5a6483feb0c5193519625d0ea8c4254364d423cc
Author: Matthew Wilcox <matthew at wil.cx>
Date: Tue Feb 26 10:00:17 2008 -0500
include: Remove unnecessary inclusions of asm/semaphore.h
None of these files use any of the functionality promised by
asm/semaphore.h. It's possible that they (or some user of them) rely
on it dragging in some unrelated header file, but I can't build all
these files, so we'll have to fix any build failures as they come up.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit cb688371e27880d86c42323826846d1cd7caad8f
Author: Matthew Wilcox <matthew at wil.cx>
Date: Tue Feb 26 09:59:26 2008 -0500
fs: Remove unnecessary inclusions of asm/semaphore.h
None of these files use any of the functionality promised by
asm/semaphore.h.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit d3135846f6c1858dbad6ccb780a42e6c98953e6d
Author: Matthew Wilcox <matthew at wil.cx>
Date: Fri Apr 18 22:16:32 2008 -0400
drivers: Remove unnecessary inclusions of asm/semaphore.h
None of these files use any of the functionality promised by
asm/semaphore.h. It's possible that they rely on it dragging in some
unrelated header file, but I can't build all these files, so we'll have
fix any build failures as they come up.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit 5f090dcb4d4fff373ce7165bce4ba5e87534d50a
Author: Matthew Wilcox <matthew at wil.cx>
Date: Fri Apr 18 22:15:50 2008 -0400
net: Remove unnecessary inclusions of asm/semaphore.h
None of these files use any of the functionality promised by
asm/semaphore.h. It's possible that they rely on it dragging in some
unrelated header file, but I can't build all these files, so we'll have
fix any build failures as they come up.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit 950e4da32426859ee4b37b2c95026d4f1efa5d05
Author: Matthew Wilcox <matthew at wil.cx>
Date: Tue Feb 26 09:55:29 2008 -0500
arch: Remove unnecessary inclusions of asm/semaphore.h
None of these files use any of the functionality promised by
asm/semaphore.h. It's possible that they rely on it dragging in some
unrelated header file, but I can't build all these files, so we'll have
fix any build failures as they come up.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
commit 3925e6fc1f774048404fdd910b0345b06c699eb4
Merge: 334d094504c2fe1c44211ecb49146ae6bca8c321 7cea51be4e91edad05bd834f3235b45c57783f0d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 18:18:30 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
security: fix up documentation for security_module_enable
Security: Introduce security= boot parameter
Audit: Final renamings and cleanup
SELinux: use new audit hooks, remove redundant exports
Audit: internally use the new LSM audit hooks
LSM/Audit: Introduce generic Audit LSM hooks
SELinux: remove redundant exports
Netlink: Use generic LSM hook
Audit: use new LSM hooks instead of SELinux exports
SELinux: setup new inode/ipc getsecid hooks
LSM: Introduce inode_getsecid and ipc_getsecid hooks
commit 334d094504c2fe1c44211ecb49146ae6bca8c321
Merge: d1a4be630fb068f251d64b62919f143c49ca8057 d1643d24c61b725bef399cc1cf2944b4c9c23177
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 18:02:35 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
[NET]: Fix and allocate less memory for ->priv'less netdevices
[IPV6]: Fix dangling references on error in fib6_add().
[NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
[PKT_SCHED]: Fix datalen check in tcf_simp_init().
[INET]: Uninline the __inet_inherit_port call.
[INET]: Drop the inet_inherit_port() call.
SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
[netdrvr] forcedeth: internal simplifications; changelog removal
phylib: factor out get_phy_id from within get_phy_device
PHY: add BCM5464 support to broadcom PHY driver
cxgb3: Fix __must_check warning with dev_dbg.
tc35815: Statistics cleanup
natsemi: fix MMIO for PPC 44x platforms
[TIPC]: Cleanup of TIPC reference table code
[TIPC]: Optimized initialization of TIPC reference table
[TIPC]: Remove inlining of reference table locking routines
e1000: convert uint16_t style integers to u16
ixgb: convert uint16_t style integers to u16
sb1000.c: make const arrays static
sb1000.c: stop inlining largish static functions
...
commit 7cea51be4e91edad05bd834f3235b45c57783f0d
Author: James Morris <jmorris at namei.org>
Date: Fri Mar 7 12:23:49 2008 +1100
security: fix up documentation for security_module_enable
security_module_enable() can only be called during kernel init.
Signed-off-by: James Morris <jmorris at namei.org>
commit 076c54c5bcaed2081c0cba94a6f77c4d470236ad
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Thu Mar 6 18:09:10 2008 +0200
Security: Introduce security= boot parameter
Add the security= boot parameter. This is done to avoid LSM
registration clashes in case of more than one bult-in module.
User can choose a security module to enable at boot. If no
security= boot parameter is specified, only the first LSM
asking for registration will be loaded. An invalid security
module name will be treated as if no module has been chosen.
LSM modules must check now if they are allowed to register
by calling security_module_enable(ops) first. Modify SELinux
and SMACK to do so.
Do not let SMACK register smackfs if it was not chosen on
boot. Smackfs assumes that smack hooks are registered and
the initial task security setup (swapper->security) is done.
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
commit 04305e4aff8b0533dc05f9f6f1a34d0796bd985f
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Apr 19 09:59:43 2008 +1000
Audit: Final renamings and cleanup
Rename the se_str and se_rule audit fields elements to
lsm_str and lsm_rule to avoid confusion.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
commit 9d57a7f9e23dc30783d245280fc9907cf2c87837
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Mar 1 22:03:14 2008 +0200
SELinux: use new audit hooks, remove redundant exports
Setup the new Audit LSM hooks for SELinux.
Remove the now redundant exported SELinux Audit interface.
Audit: Export 'audit_krule' and 'audit_field' to the public
since their internals are needed by the implementation of the
new LSM hook 'audit_rule_known'.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
commit d7a96f3a1ae279a2129653d6cb18d722f2f00f91
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Mar 1 22:01:11 2008 +0200
Audit: internally use the new LSM audit hooks
Convert Audit to use the new LSM Audit hooks instead of
the exported SELinux interface.
Basically, use:
security_audit_rule_init
secuirty_audit_rule_free
security_audit_rule_known
security_audit_rule_match
instad of (respectively) :
selinux_audit_rule_init
selinux_audit_rule_free
audit_rule_has_selinux
selinux_audit_rule_match
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
commit 03d37d25e0f91b28c4b6d002be6221f1af4b19d8
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Mar 1 22:00:05 2008 +0200
LSM/Audit: Introduce generic Audit LSM hooks
Introduce a generic Audit interface for security modules
by adding the following new LSM hooks:
audit_rule_init(field, op, rulestr, lsmrule)
audit_rule_known(krule)
audit_rule_match(secid, field, op, rule, actx)
audit_rule_free(rule)
Those hooks are only available if CONFIG_AUDIT is enabled.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
Reviewed-by: Paul Moore <paul.moore at hp.com>
commit 6b89a74be0fbbc6cc639d5cf7dcf8e6ee0f120a7
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Mar 1 21:58:32 2008 +0200
SELinux: remove redundant exports
Remove the following exported SELinux interfaces:
selinux_get_inode_sid(inode, sid)
selinux_get_ipc_sid(ipcp, sid)
selinux_get_task_sid(tsk, sid)
selinux_sid_to_string(sid, ctx, len)
They can be substitued with the following generic equivalents
respectively:
new LSM hook, inode_getsecid(inode, secid)
new LSM hook, ipc_getsecid*(ipcp, secid)
LSM hook, task_getsecid(tsk, secid)
LSM hook, sid_to_secctx(sid, ctx, len)
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
Reviewed-by: Paul Moore <paul.moore at hp.com>
commit 0ce784ca729dce8c9076a6339a15530ca13212f2
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Mar 1 21:56:22 2008 +0200
Netlink: Use generic LSM hook
Don't use SELinux exported selinux_get_task_sid symbol.
Use the generic LSM equivalent instead.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
Acked-by: David S. Miller <davem at davemloft.net>
Reviewed-by: Paul Moore <paul.moore at hp.com>
commit 2a862b32f3da5a2120043921ad301322ad526084
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Mar 1 21:54:38 2008 +0200
Audit: use new LSM hooks instead of SELinux exports
Stop using the following exported SELinux interfaces:
selinux_get_inode_sid(inode, sid)
selinux_get_ipc_sid(ipcp, sid)
selinux_get_task_sid(tsk, sid)
selinux_sid_to_string(sid, ctx, len)
kfree(ctx)
and use following generic LSM equivalents respectively:
security_inode_getsecid(inode, secid)
security_ipc_getsecid*(ipcp, secid)
security_task_getsecid(tsk, secid)
security_sid_to_secctx(sid, ctx, len)
security_release_secctx(ctx, len)
Call security_release_secctx only if security_secid_to_secctx
succeeded.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
Reviewed-by: Paul Moore <paul.moore at hp.com>
commit 713a04aeaba35bb95d442cdeb52055498519be25
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Mar 1 21:52:30 2008 +0200
SELinux: setup new inode/ipc getsecid hooks
Setup the new inode_getsecid and ipc_getsecid() LSM hooks
for SELinux.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
Reviewed-by: Paul Moore <paul.moore at hp.com>
commit 8a076191f373abaeb4aa5f6755d22e49db98940f
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date: Sat Mar 1 21:51:09 2008 +0200
LSM: Introduce inode_getsecid and ipc_getsecid hooks
Introduce inode_getsecid(inode, secid) and ipc_getsecid(ipcp, secid)
LSM hooks. These hooks will be used instead of similar exported
SELinux interfaces.
Let {inode,ipc,task}_getsecid hooks set the secid to 0 by default
if CONFIG_SECURITY is not defined or if the hook is set to
NULL (dummy). This is done to notify the caller that no valid
secid exists.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
Acked-by: James Morris <jmorris at namei.org>
Reviewed-by: Paul Moore <paul.moore at hp.com>
commit 076d8423a98659a92837b07aa494cb74bfefe77c
Author: Steve French <sfrench at us.ibm.com>
Date: Fri Apr 18 23:26:26 2008 +0000
[CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash
When a share was in DFS and the server was Unix/Linux, we were sending paths of the form
\\server\share/dir/file
rather than
//server/share/dir/file
There was some discussion between me and jra over whether we should use
/server/share/dir/file
as MS sometimes says - but the documentation for this claims it should be
doubleslash for this type of UNC-like path format and that works, so leaving
it as doubleslash but converting the \ to / in the the //server/share portion.
This gets Samba to now correctly return STATUS_PATH_NOT_COVERED when it is
supposed to (Windows already did since the direction of the slash was not an issue
for them). Still need another minor change to fully enable DFS (need to finish
some chages to SMBGetDFSRefer
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit d1643d24c61b725bef399cc1cf2944b4c9c23177
Author: Alexey Dobriyan <adobriyan at sw.ru>
Date: Fri Apr 18 15:43:32 2008 -0700
[NET]: Fix and allocate less memory for ->priv'less netdevices
This patch effectively reverts commit d0498d9ae1a5cebac363e38907266d5cd2eedf89
aka "[NET]: Do not allocate unneeded memory for dev->priv alignment."
It was found to be buggy because of final unconditional += NETDEV_ALIGN_CONST
removal.
For example, for sizeof(struct net_device) being 2048 bytes, "alloc_size"
was also 2048 bytes, but allocator with debugging options turned on started
giving out !32-byte aligned memory resulting in redzones overwrites.
Patch does small optimization in ->priv'less case: bumping size to next
32-byte boundary was always done to ensure ->priv will also be aligned.
But, no ->priv, no need to do that.
Signed-off-by: Alexey Dobriyan <adobriyan at sw.ru>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ba9279519b371340e01cadf4c230e9d52a4bf8c4
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:17 2008 +0100
Allow the L2X0 outer cache support to be configurable
By default, this option was selected by the platform Kconfig. This
patch adds "depends on" to L2X0 so that it can be enabled/disabled
manually.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit bc02c58bd13cfaf5a9930d7f2ca4f7d5ed4fa807
Author: Bahadir Balban <bahadir.balban at arm.com>
Date: Fri Apr 18 22:43:16 2008 +0100
RealView: Add the configuration and build changes for PB1176
This patch enables the building of Linux for the PB1176 platform.
Signed-off-by: Bahadir Balban <bahadir.balban at arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 14a6acc23fa49446529bd99742264192939819bc
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:16 2008 +0100
RealView: Add uncompressing support for PB1176
This patch adds the UART0 base address detection in uncompress.h.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit a0316b244e75d80df3790b69b0a2cb0bbf4c1562
Author: Bahadir Balban <bahadir.balban at arm.com>
Date: Fri Apr 18 22:43:15 2008 +0100
RealView: Base support for the PB1176 platform
This patch adds the base files for the PB1176 platform support.
Signed-off-by: Bahadir Balban <bahadir.balban at arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 387847ee0fb258a50032db81e216be4ec1350586
Author: Bahadir Balban <bahadir.balban at arm.com>
Date: Fri Apr 18 22:43:14 2008 +0100
RealView: Add compactflash support for the PB11MPCore platform
This patch adds the resource and device definitions for the compact
flash.
Signed-off-by: Bahadir Balban <bahadir.balban at arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 78fdcb4287b5781d8175115430ca50e30899bf09
Author: Bahadir Balban <bahadir.balban at arm.com>
Date: Fri Apr 18 22:43:14 2008 +0100
RealView: Enable the configuration options for PB11MPCore
This patch adds the PB11MPCore support to the corresponding Kconfig
and Makefile to enable building.
Signed-off-by: Bahadir Balban <bahadir.balban at arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 34401ec4668c01156c6c4540930a63840f567a61
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:13 2008 +0100
RealView: Add uncompressing support to PB11MPCore
This patch adds the UART address detection in uncompress.h for the
PB11MPCore platform.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit e67172f5793293370a3ded597742b8d12bd42b82
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:13 2008 +0100
RealView: Add the SMP initialisation support for PB11MPCore
This patch adds the initialisation calls for the SMP support on the
PB11MPCore platform.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit a9b67db504b0c75d21bda801de1a03dd52e91c98
Author: Bahadir Balban <bahadir.balban at arm.com>
Date: Fri Apr 18 22:43:13 2008 +0100
RealView: Base support for the PB11MPCore platform
This patch adds the base files for the PB11MPCore platform support.
Signed-off-by: Bahadir Balban <bahadir.balban at arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 51faf9b5c048f9e465322f8256e838586f4c11a7
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:12 2008 +0100
RealView: Change the IO_ADDRESS macro
This patch changes the IO_ADDRESS macro for the RealView platforms to
accomodate a wider range of physical addresses on PB11MPCore.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 41267e208e3ad5d960284a908c58d4c27cc5857b
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:12 2008 +0100
RealView: Allow ARMv7 support for RealView/EB
This patch changes the CPU_V7 configuration dependency to allow
MACH_REALVIEW_EB.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 393538e6d2ea1afe42c4ae9382cc78ed51a479f9
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:11 2008 +0100
RealView: Move more device address definitions to board-eb.h
The upcoming PB11MPCore and PB1176 have different memory maps and some
of the definitions in platform.h are no longer common. This patch
moves them to the board-eb.h file and updates their usage in
realview_eb.c.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 9a386f0651d06002a0468ce4d0e15aaf7c316a3c
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:11 2008 +0100
RealView: Move the UART definitions to EB specific files
Since the PB1176 has different UART base addresses, this patch moves
the definitions form platorm.h to board-eb.h. It also modifies
uncompress.h to detect the platform type at run-time.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 80192735e4b01a2e4d437699f2e9b5b93dfab13c
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:11 2008 +0100
RealView: Move the timer definitions into the EB specific files
This patch moves the timer definitions from platform.h into board-eb.h
as they are different on PB11MPCore and PB1176. It also adds
timerX_va_base variables in core.c which are set by the
realview_eb_timer_init function before invoking realview_timer_init.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit a44ddfd5bf5354281eebd0f0ae0d6dcf8818fc5c
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:10 2008 +0100
RealView: Move the flash definitions out of platform.h
This patch moves the patch definitions into board-eb.h and
realview_eb.c (from core.c) as they are different on the PB11MPCore
and PB1176 platforms.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 073b6ff3b94c4737c91c45ed0f0c4d40cf1cb1c8
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:09 2008 +0100
RealView: Move the EB GIC definitions to the board file
This is in preparation for the RealView PB11MPCore and PB1176 patches
which have different base addresses for the GIC.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit be4f3c8691492934c8ee03dbecb3a3a865ac6cd6
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:09 2008 +0100
Add RealView/EB support for the LAN9118 Ethernet chip
RealView/EB revD platform comes with the SMSC LAN9118 Ethernet
chip. This patch allows either the smc91x or the smc911x drivers to be
used with the RealView/EB platform.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit b7b0ba942f7b18de678cd081902aad8a0b6581c6
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:08 2008 +0100
RealView: Move the SCU initialisation out of __v6_setup
This patch moves the SCU initialisation from __v6_setup to the
smp_prepare_cpus() function as it relies on platform-specific
settings. Changes to get_core_count() are mainly for allowing cleaner
code with the upcoming PB11MPCore patches.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit cb170a45d69b573a08247acfbbff3b9d6e6e2f8f
Author: Paul Brook <paul at codesourcery.com>
Date: Fri Apr 18 22:43:08 2008 +0100
Linux Thumb-2 support for user-space applications
This patch implements Thumb-2 application support in Linux. Original
implementation by Paul Brook with fixes for VFP and Neon by Catalin
Marinas.
Signed-off-by: Paul Brook <paul at codesourcery.com>
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit 48d7927bdf071d05cf5d15b816cf06b0937cb84f
Author: Paul Brook <paul at codesourcery.com>
Date: Fri Apr 18 22:43:07 2008 +0100
Add a prefetch abort handler
This patch adds a prefetch abort handler similar to the data abort one
and renames the latter for consistency. Initial implementation by Paul
Brook with some renaming by Catalin Marinas.
Signed-off-by: Paul Brook <paul at codesourcery.com>
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit d7f864be8323e5394040e2877594645b0e7da85d
Author: Catalin Marinas <catalin.marinas at arm.com>
Date: Fri Apr 18 22:43:06 2008 +0100
ARMv7: Add support for the ThumbEE state saving/restoring
This patch adds the detection and handling of the ThumbEE extension on
ARMv7 CPUs.
Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
commit d1a4be630fb068f251d64b62919f143c49ca8057
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Apr 18 21:32:22 2008 +0200
x86 PAT: fix mmap() of holes
do not return a -EINVAL when mmap()-ing PCI holes.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Acked-by: Suresh Siddha <suresh.b.siddha at intel.com>
Acked-by: H. Peter Anvin <hpa at zytor.com>
Acked-by: Thomas Gleixner <tglx at linutronix.de>
Acked-by: Arjan van de Ven <arjan at linux.intel.com>
commit 2cca775baecbfede2fec20c99add709232311fe7
Merge: eddeb0e2d863e3941d8768e70cb50c6120e61fa0 94795b61e84994a3b058f92d041d1fb3d869c7d5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 11:25:31 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (137 commits)
[SCSI] iscsi: bidi support for iscsi_tcp
[SCSI] iscsi: bidi support at the generic libiscsi level
[SCSI] iscsi: extended cdb support
[SCSI] zfcp: Fix error handling for blocked unit for send FCP command
[SCSI] zfcp: Remove zfcp_erp_wait from slave destory handler to fix deadlock
[SCSI] zfcp: fix 31 bit compile warnings
[SCSI] bsg: no need to set BSG_F_BLOCK bit in bsg_complete_all_commands
[SCSI] bsg: remove minor in struct bsg_device
[SCSI] bsg: use better helper list functions
[SCSI] bsg: replace kobject_get with blk_get_queue
[SCSI] bsg: takes a ref to struct device in fops->open
[SCSI] qla1280: remove version check
[SCSI] libsas: fix endianness bug in sas_ata
[SCSI] zfcp: fix compiler warning caused by poking inside new semaphore (linux-next)
[SCSI] aacraid: Do not describe check_reset parameter with its value
[SCSI] aacraid: Fix down_interruptible() to check the return value
[SCSI] sun3_scsi_vme: add MODULE_LICENSE
[SCSI] st: rename flush_write_buffer()
[SCSI] tgt: use KMEM_CACHE macro
[SCSI] initio: fix big endian problems for auto request sense
...
commit eddeb0e2d863e3941d8768e70cb50c6120e61fa0
Merge: 855d854a33fca71cf68bad258bd5e66e5b265d10 db8be076cad4b843aa743ef462c75022cddd9c63
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 11:24:29 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (43 commits)
firewire: cleanups
firewire: fix synchronization of gap counts
firewire: wait until PHY configuration packet was transmitted (fix bus reset loop)
firewire: remove unused struct member
firewire: use bitwise and to get reg in handle_registers
firewire: replace more hex values with defined csr constants
firewire: reread config ROM when device reset the bus
firewire: replace static ROM cache by allocated cache
firewire: fw-ohci: work around generation bug in TI controllers (fix AV/C and more)
firewire: fw-ohci: extend logging of bus generations and node ID
firewire: fw-ohci: conditionally log busReset interrupts
firewire: fw-ohci: don't append to AT context when it's not active
firewire: fw-ohci: log regAccessFail events
firewire: fw-ohci: make sure HCControl register LPS bit is set
firewire: fw-ohci: missing PPC PMac feature calls in failure path
firewire: fw-ohci: untangle a mixed unsigned/signed expression
firewire: debug interrupt events
firewire: fw-ohci: catch self_id_count == 0
firewire: fw-ohci: add self ID error check
firewire: fw-ohci: refactor probe, remove, suspend, resume
...
commit 855d854a33fca71cf68bad258bd5e66e5b265d10
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Fri Apr 18 13:18:48 2008 -0500
libata: fix boot panic with SATAPI devices on non-SFF HBAs
The kernel now panics reliably on boot if you have a SATAPI device
connected.
The problem was introduced by the libata merge trying to pull out all
the SFF code into a separate module. Unfortunately, if you're a satapi
device you usually need to call atapi_request_sense, which has a bare
invocation of a SFF callback which is NULL on non-SFF HBAs. Fix this by
making the call conditional.
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e70aa3fac1ac50c7a75ac676a1489dd1ea3b4be5
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun Apr 13 21:15:52 2008 +0300
mmc: sdio_ops.c should #include "sdio_ops.h"
Every file should include the headers containing the externs for its
global functions.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 98b843be56079ad26fe4b9e421fd11b0598b85f3
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun Apr 13 21:15:50 2008 +0300
mmc: proper prototypes for mmc_attach_*()
This patch adds proper prototypes for mmc_attach_*() in
drivers/mmc/core/core.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 261172fd1b23769bc7632047e2cb826c9b8b1a50
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun Apr 13 21:15:47 2008 +0300
mmc: make __mmc_release_bus() static
This patch makes the needlessly global __mmc_release_bus() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 0b82684c3c19aff092bb303959a31dbe5c965922
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Sun Apr 13 16:03:38 2008 +0200
sdhci: improve no card, no reset quirk
The quirk was meant to just inhibit some resets, but ended up blocking
all of them. Fortunately, this was just what was needed. Change the
comment to reflect reality.
Also, this issue has just been observed on Samsung laptops, so reduce
the number of chips the quirk affects.
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 9d7c6eee523c78b6ea4b56bd3927860d850616e5
Author: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Date: Wed Mar 26 16:10:02 2008 -0400
MMC: OMAP: Do not busy wait for end of command for ever
The limit was a fixed 100k limit in the busy loop, which is not
accurate. It would better to have time limit for the worst case
which occurs when sending 80 cycles at 400 kHz and takes about
200 microseconds, so limit the max time spend in the busy loop
for some 250 microseconds.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 0f602ec79ac4fd2a42075c5a170086ded439f36d
Author: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Date: Wed Mar 26 16:09:58 2008 -0400
MMC: OMAP: Start new commands from work queue instead of irq
Use work queues for starting new commands instead of starting them
directly from irq handler. The command scheduling needs to be delayed
a bit for some cards which should not be done from an interrupt.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 0807a9b5739a73ba0d0fcd9f36a51794757be881
Author: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Date: Wed Mar 26 16:09:52 2008 -0400
MMC: OMAP: Lazy clock shutdown
MMCA spec says the mmc clock should be kept running for at least
8 cycles after the last RW request. Ensure this with lazy clock
disable after a request, or with an explicit delay before
switching a slot.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 0fb4723d405111a13bb8f04e902eadf14402c7ba
Author: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Date: Wed Mar 26 16:09:48 2008 -0400
MMC: OMAP: Move failing command abortion to workqueue
Abort failed command from workqueue rather than from an interrupt,
allowing longer delays in abortion.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 7584d276d47a55afaeb614ed16cf306cbe2d6117
Author: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Date: Wed Mar 26 16:09:42 2008 -0400
MMC: OMAP: Use tasklet instead of workqueue for cover switch notification
The cover waitqueue is occasionally scheduled twice from timer
and the interrupt and oops follows. It would have been possible
to fix this problem with spinlocks but using tasklet was a dropin
solution with no need for locking.
This path also adds some cleanups.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU at nokia.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 8348f0029d85828671e3a1d11db41fe53afbdc0d
Author: Kyungmin Park <kyungmin.park at samsung.com>
Date: Wed Mar 26 16:09:38 2008 -0400
MMC: OMAP: Check the get_cover_state function pointer if not set
If the get_cover_state is not set, it occurs the oops.
Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 01e77e13fc5a1e6c00ebb4f688293fa3116315ee
Author: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Date: Wed Mar 26 16:09:34 2008 -0400
MMC: OMAP: Using setup_timer instead of init_timer
Using setup_timer() instead of init_timer() on omap.c file.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit eb1860bccd01a75b20fd7298af89b9cbda2202ba
Author: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Date: Wed Mar 26 16:09:29 2008 -0400
MMC: OMAP: Abort stuck commands
When a card is removed while it is being accessed, a command can get stuck so
that no timeout or end of command interrupt ever occurs. The command getting
stuck is almost always CDM12, but also the other commands can get stuck. Catch
a stuck command with a timer and try sending the initialization stream until
the controller starts running again and responds with the end of command
status.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 2a50b8889b707b9c7bcd09c0ae4cbcef7dca4e29
Author: Juha Yrjola <juha.yrjola at solidboot.com>
Date: Wed Mar 26 16:09:26 2008 -0400
MMC: OMAP: General cleanup for MMC multislot support
General code cleanup, modifications at some dev_* functions and
other hacks at mmc_omap_irq() for MMC multislot support.
Signed-off-by: Juha Yrjola <juha.yrjola at solidboot.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 65b5b6e51bdeab1934a147aec41ecea82d3cc31d
Author: Juha Yrjola <juha.yrjola at solidboot.com>
Date: Wed Mar 26 16:09:22 2008 -0400
MMC: OMAP: Power functions modified to MMC multislot support
Modifications at power functions to MMC multislot support. This patch
also move board-specific code out of MMC OMAP driver.
Signed-off-by: Juha Yrjola <juha.yrjola at solidboot.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit b8f9f0e90a6c3fb999d00301f45bb2213dbe8c00
Author: Juha Yrjola <juha.yrjola at solidboot.com>
Date: Wed Mar 26 16:09:16 2008 -0400
MMC: OMAP: Fix timeout calculation for MMC multislot support
Fix the data timeout calculation for MMC multislot support.
Signed-off-by: Juha Yrjola <juha.yrjola at solidboot.com>
Signed-off-by: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit a914ded23565d8688e2b7e435916630def5bdd19
Author: Juha Yrjola <juha.yrjola at solidboot.com>
Date: Wed Mar 26 16:09:12 2008 -0400
MMC: OMAP: New release dma and abort xfer functions
New functions to support MMC multislot:
mmc_omap_release_dma() and mmc_omap_abort_xfer().
Signed-off-by: Juha Yrjola <juha.yrjola at solidboot.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 5a0f3f1f71e0bc4a843673e8e7cf09a32bb07c32
Author: Juha Yrjola <juha.yrjola at solidboot.com>
Date: Wed Mar 26 16:09:08 2008 -0400
MMC: OMAP: Add back cover switch support
This patch adds back MMC cover switch support in a way that
supports multiple slots.
Signed-off-by: Juha Yrjola <juha.yrjola at solidboot.com>
Signed-off-by: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit abfbe5f7854a083ca324282bf7e39f10bc438313
Author: Juha Yrjola <juha.yrjola at solidboot.com>
Date: Wed Mar 26 16:08:57 2008 -0400
MMC: OMAP: Introduce new multislot structure and change driver to use it
Introduce new MMC multislot structure and change driver to use it.
Note that MMC clocking is now enabled in mmc_omap_select_slot()
and disabled in mmc_omap_release_slot().
Signed-off-by: Juha Yrjola <juha.yrjola at solidboot.com>
Signed-off-by: Jarkko Lavinen <jarkko.lavinen at nokia.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 4bc9e35556bf4444014ba65b80abb2fb9f70899a
Author: Tony Lindgren <tony at atomide.com>
Date: Wed Mar 26 16:08:53 2008 -0400
MMC: OMAP: Remove cover switch handling to allow adding multislot support
This patch removes the MMC cover switch handling temporarily
to make following multislot patches cleaner.
MMC cover switch handling will be added back in later patches
after adding basic multislot support.
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit d365abe27db12df25660fe254e09876cea8a9ad8
Author: Francisco Alecrim <francisco.alecrim at indt.org.br>
Date: Wed Mar 26 16:08:48 2008 -0400
MMC: OMAP: Fix the BYTEBLOCK capability removal
According with commit 255d01af9a990fd5166f04ed0cc0b30b7b67e81e
from Linux-OMAP tree, the BYTEBLOCK capability was removed by Pierre Ossman.
MMC_CAP_BYTEBLOCK is not defined causing the compile error:
drivers/mmc/host/omap.c: In function `mmc_omap_probe':
drivers/mmc/host/omap.c:1077: error: `MMC_CAP_BYTEBLOCK' undeclared (first use in this function)
drivers/mmc/host/omap.c:1077: error: (Each undeclared identifier is reported only once
drivers/mmc/host/omap.c:1077: error: for each function it appears in.)
Signed-off-by: Francisco Alecrim <francisco.alecrim at indt.org.br>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit ec2f362a9126237e79a21d5c3cd225f5a07f8e89
Author: Tony Lindgren <tony at atomide.com>
Date: Wed Mar 26 16:08:45 2008 -0400
MMC: OMAP: Remove extra divisor increase
As noted by Kyungmin Park, the divisor calculation has
an unnecessary increase.
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 5ec21b1ccf554593d25fba0f411c03e1d6fd88c5
Author: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Date: Wed Mar 26 16:08:41 2008 -0400
MMC: OMAP: Remove some opcodes from host driver
This patch removes some opcodes from host driver so there's no need on putting
'#include <linux/mmc/mmc.h>', that should not be needed in host drivers.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar at indt.org.br>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 6fee65cfde519ae811c3cde47c622271168ca449
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Fri Mar 28 14:34:47 2008 -0700
mmc: use shorter, equivalent set_current_state()
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 2f730fec83be76f1b3b8f0066b3447f55c50d7a0
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Mon Mar 17 10:29:38 2008 +0100
sdhci: allow led to be controlled freely
Hook up the controller LED to the LED subsystem, allowing more flexible
control than simply indicating an ongoing request.
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit b69c9058907642f8e1b32076906755c6623ea060
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Sat Mar 8 23:44:25 2008 +0100
sdhci: remove custom controller name
Remove the use of the sdhci specific device name and use the mmc controller
name instead.
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit ff3112f5adcc9dc33c107c826f82017db8f889f5
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Sat Mar 8 23:43:19 2008 +0100
mmc: set controller name early
Reorganise code so that mmc_hostname() works directly after allocation.
That way host drivers can use that name for resource allocations and
messages during probing.
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit e675349e2bdbfb661fa0d8ff2441b4cf48fb7e48
Merge: ef38ff9d372d4fe69e415370939a0f1fb5783af1 2309e9e040fe29469fb85a384636c455b62fe525
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 10:15:22 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (64 commits)
ocfs2/net: Add debug interface to o2net
ocfs2: Only build ocfs2/dlm with the o2cb stack module
ocfs2/cluster: Get rid of arguments to the timeout routines
ocfs2: Put tree in MAINTAINERS
ocfs2: Use BUG_ON
ocfs2: Convert ocfs2 over to unlocked_ioctl
ocfs2: Improve rename locking
fs/ocfs2/aops.c: test for IS_ERR rather than 0
ocfs2: Add inode stealing for ocfs2_reserve_new_inode
ocfs2: Add ac_alloc_slot in ocfs2_alloc_context
ocfs2: Add a new parameter for ocfs2_reserve_suballoc_bits
ocfs2: Enable cross extent block merge.
ocfs2: Add support for cross extent block
ocfs2: Move /sys/o2cb to /sys/fs/o2cb
sysfs: Allow removal of symlinks in the sysfs root
ocfs2: Reconnect after idle time out.
ocfs2/dlm: Cleanup lockres print
ocfs2/dlm: Fix lockname in lockres print function
ocfs2/dlm: Move dlm_print_one_mle() from dlmmaster.c to dlmdebug.c
ocfs2/dlm: Dumps the purgelist into a debugfs file
...
commit ef38ff9d372d4fe69e415370939a0f1fb5783af1
Merge: fda31d7d4b5a9c663ac3ed1ba244018a88deecaf 62be1f71677c53d5e51223807a06ac9052f49b0f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 10:02:46 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (49 commits)
[GFS2] fix assertion in log_refund()
[GFS2] fix GFP_KERNEL misuses
[GFS2] test for IS_ERR rather than 0
[GFS2] Invalidate cache at correct point
[GFS2] fs/gfs2/recovery.c: suppress warnings
[GFS2] Faster gfs2_bitfit algorithm
[GFS2] Streamline quota lock/check for no-quota case
[GFS2] Remove drop of module ref where not needed
[GFS2] gfs2_adjust_quota has broken unstuffing code
[GFS2] possible null pointer dereference fixup
[GFS2] Need to ensure that sector_t is 64bits for GFS2
[GFS2] re-support special inode
[GFS2] remove gfs2_dev_iops
[GFS2] fix file_system_type leak on gfs2meta mount
[GFS2] Allow bmap to allocate extents
[GFS2] Fix a page lock / glock deadlock
[GFS2] proper extern for gfs2/locking/dlm/mount.c:gdlm_ops
[GFS2] gfs2/ops_file.c should #include "ops_inode.h"
[GFS2] be*_add_cpu conversion
[GFS2] Fix bug where we called drop_bh incorrectly
...
commit fda31d7d4b5a9c663ac3ed1ba244018a88deecaf
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Apr 18 09:54:38 2008 -0700
x86: kgdb build fix
TF_MASK is no longer defined, use X86_EFLAGS_TF.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 94795b61e84994a3b058f92d041d1fb3d869c7d5
Author: Boaz Harrosh <bharrosh at panasas.com>
Date: Fri Apr 18 10:11:53 2008 -0500
[SCSI] iscsi: bidi support for iscsi_tcp
access the right scsi_in() and/or scsi_out() side of things.
also for resid
Signed-off-by: Boaz Harrosh <bharrosh at panasas.com>
Reviewed-by: Pete Wyckoff <pw at osc.edu>
Signed-off-by: Mike Christie <michaelc at cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit c07d444407de63b2f414a8be9428f88cadba503f
Author: Boaz Harrosh <bharrosh at panasas.com>
Date: Fri Apr 18 10:11:52 2008 -0500
[SCSI] iscsi: bidi support at the generic libiscsi level
- prepare the additional bidi_read rlength header.
- access the right scsi_in() and/or scsi_out() side of things.
also for resid.
- Handle BIDI underflow overflow from target
Signed-off-by: Boaz Harrosh <bharrosh at panasas.com>
Reviewed-by: Pete Wyckoff <pw at osc.edu>
Signed-off-by: Mike Christie <michaelc at cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 38d1c069db8c87eb6cb10ca1ede9d9b673531ddd
Author: Boaz Harrosh <bharrosh at panasas.com>
Date: Fri Apr 18 10:11:51 2008 -0500
[SCSI] iscsi: extended cdb support
Support for extended CDBs in iscsi.
All we need is to check if command spills over 16 bytes then allocate
an iscsi-extended-header for the leftovers.
Signed-off-by: Boaz Harrosh <bharrosh at panasas.com>
Reviewed-by: Pete Wyckoff <pw at osc.edu>
Signed-off-by: Mike Christie <michaelc at cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 57b7658aed76f1763416878ead9be4ffa288b7a3
Author: Christof Schmitt <christof.schmitt at de.ibm.com>
Date: Fri Apr 18 12:51:57 2008 +0200
[SCSI] zfcp: Fix error handling for blocked unit for send FCP command
In the case the unit is blocked, zfcp_unit_get has not been called
yet, so the error handling path should not call zfcp_unit_put.
Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
Signed-off-by: Martin Peschke <mp3 at de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 6071d7ec36054e78f02f7d5a66c3784aeb65ce92
Author: Christof Schmitt <christof.schmitt at de.ibm.com>
Date: Fri Apr 18 12:51:56 2008 +0200
[SCSI] zfcp: Remove zfcp_erp_wait from slave destory handler to fix deadlock
The testcase
# chchp -v 0 0.da && sleep 59 && chchp -v 1 0.da
results in this deadlock situation:
STACK TRACE FOR TASK: 0x7e9a2048 (zfcperp0.0.c613)
0 schedule+816 [0x356b3c]
1 schedule_timeout+172 [0x357340]
2 wait_for_common+192 [0x3565fc]
3 flush_cpu_workqueue+116 [0x52af0]
4 flush_workqueue+116 [0x533b8]
5 fc_remote_port_add+64 [0x1c83ec]
6 zfcp_erp_thread+4534 [0x26585a]
7 kernel_thread_starter+6 [0x195d2]
STACK TRACE FOR TASK: 0x7f8ec048 (fc_wq_0)
0 schedule+816 [0x356b3c]
1 zfcp_erp_wait+104 [0x264568]
2 zfcp_scsi_slave_destroy+64 [0x261b24]
3 __scsi_remove_device+154 [0x1c24ba]
4 scsi_remove_device+62 [0x1c2512]
5 __scsi_remove_target+198 [0x1c25ea]
6 __remove_child+58 [0x1c26d6]
7 device_for_each_child+66 [0x1ab566]
8 scsi_remove_target+98 [0x1c268a]
9 run_workqueue+200 [0x5272c]
10 worker_thread+146 [0x52882]
11 kthread+140 [0x58360]
12 kernel_thread_starter+6 [0x195d2]
Remove the zfcp_erp_wait call that is not required here to prevent the
deadlock situation.
Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
Signed-off-by: Martin Peschke <mp3 at de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 1f6f7129ebac007629b28764bfa5147817682692
Author: Martin Peschke <mp3 at de.ibm.com>
Date: Fri Apr 18 12:51:55 2008 +0200
[SCSI] zfcp: fix 31 bit compile warnings
drivers/s390/scsi/zfcp_aux.c: In function ‘zfcp_fsf_incoming_els_rscn’:
drivers/s390/scsi/zfcp_aux.c:1379: warning: cast from pointer to integer of
different size
drivers/s390/scsi/zfcp_aux.c: In function ‘zfcp_fsf_incoming_els_plogi’:
drivers/s390/scsi/zfcp_aux.c:1432: warning: cast from pointer to integer of
different size
drivers/s390/scsi/zfcp_aux.c: In function ‘zfcp_fsf_incoming_els_logo’:
drivers/s390/scsi/zfcp_aux.c:1457: warning: cast from pointer to integer of
different size
..
Just passing pointers rids us of these warnings and improves readability.
Signed-off-by: Martin Peschke <mp3 at de.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt at de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 440fc172ae333c52c458401fe059afcc6e91eebf
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Apr 9 17:58:22 2008 +0900
sh: Fix up L2 cache probe.
SH7723 is the first hard silicon to implement the L2, and unsurprisingly,
does the precise inverse of what the specification alleges. XOR the
URAM/L2 size bits to get back in line with the existing parsing logic.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit e5a4c65bef19366112ba002bc06d87450f02ad74
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Apr 9 17:57:05 2008 +0900
sh: Fix up SH-4A part probe.
The SH-4A series probe we were relying on doesn't work any more on the
newer parts, bump this up to use CVR.CHIP instead so we have consistent
behaviour across all of the parts, which is what this should have been
testing in the first place.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 178dd0cd28168287a0be6444a7eef8918b6c544e
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Apr 9 17:56:18 2008 +0900
sh: Add support for SH7723 CPU subtype.
This adds basic support for the SH7723 MobileR2 CPU.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 47aa8f493f94c6f60ebc5aa70eec90cc83f499f3
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Apr 9 17:53:11 2008 +0900
sh: Fix up SH7763 build.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 67908abf02fb83dee1730adf70d9e31367119190
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Tue Mar 25 17:30:45 2008 +0900
sh: Add migor_ts support to MigoR
Add support for the migor_ts touch panel to the MigoR board.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 577958671eadf5ab1deed66f99cdbe67b502ea66
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Tue Mar 25 17:24:31 2008 +0900
sh: Add rs5c732b RTC support to MigoR
Add support for the rs5c372b RTC chip to MigoR.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 0c6111ecccb33b1a7d79b6daf64c0cc4391ff3fa
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Tue Mar 25 17:20:24 2008 +0900
sh: Add I2C support to MigoR
Enable the sh7722 I2C controller on the MigoR board.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit ef1b2327d27901596d896820722bb2cefa2d1f64
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Tue Mar 25 17:14:03 2008 +0900
sh: Add I2C platform data to sh7722
Add platform data for the SuperH Mobile I2C block to sh7722.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 3c803a9a676c30e87b49f9cfcfd29713bc438552
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Fri Mar 21 18:44:04 2008 +0900
sh: MigoR NAND flash support using gen_flash
Add NAND flash support to the MigoR board by giving board specific data
to the gen_nand platform driver.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit b8808786e85a71afb1a169b5f059666c666f08d8
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Fri Mar 21 18:43:55 2008 +0900
sh: MigoR NOR flash support using physmap-flash
Add NOR flash support to the MigoR board by giving board specific data
to the physmap-flash platform driver.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 8ed6dfdd0900dfd6ddc7ba3c766a80f7b88911c9
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Mar 25 16:49:53 2008 +0900
sh: Fix up mach-types formatting from merge damage.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit c2933965de89a60688d51c810d535c1f2cce8448
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Mar 25 16:49:30 2008 +0900
sh: r7780rp: Hook up the I2C and SMBus platform devices.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit b026a23c07d1bf21188c57e90118782c58db6061
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Fri Mar 21 18:43:46 2008 +0900
sh: Use phyical addresses for MigoR smc91x resources
Use physical addresses and change resource name of MigoR ethernet chip.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit a0d29798e568116aa6c32aef7bab2d9e620c88ad
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Fri Mar 21 18:43:28 2008 +0900
sh: Use physical addresses for sh7722 USBF resources
Use physical addresses and change resource name to follow data sheet.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 9db913c3a62a66517def9cb973bbaa45a2739018
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Fri Mar 21 18:43:19 2008 +0900
sh: Add MigoR header file
This patch adds a MigoR specific header file. We may want to use a cpu
specific header file instead, but this will do for now.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 6dea7814e1c6a27701a63b271fc580791e066537
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Fri Mar 21 20:14:46 2008 +0900
Fix sh_keysc double free
Avoid double free situation from happening by removing input_free_device()
after input_unregister_device(). Suggested by Dmitry Torokhov.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 9460c0ce9b29825d279081d5078815a32c268ada
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Mar 21 18:08:58 2008 +0900
sh: Fix up __access_ok() check for nommu.
Presently this only checks to see if an address is an RAM, but this
doesn't work with XIP, so just always return 1. Follows m68knommu.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 5c0cbd74bb56aeb7f3de883ab79c5f501622ccb1
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Mar 21 18:07:04 2008 +0900
sh: Allow optimized clear/copy page routines to be used on SH-2.
Presently these are restricted to SH-3 and SH-4, so we reorder the
ifdefs a bit to let other parts use these also.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 2163b4cb01cd79cd1291696fc4636740026d61cb
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Mar 21 18:05:47 2008 +0900
sh: Hook up the rest of the SH7770 serial ports.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 6e862995a07629858bfa16e0991a258de35007f3
Author: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Date: Fri Mar 21 15:54:13 2008 +0900
sh: Add support for Solution Engine SH7721 board
Add support for Solution Engine SH7721 board(MS7721RP01).
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit d391c6217d3214bd8278e1e3517ef57abbc4b317
Author: Masayuki Hosokawa <hosokawa at ace-jp.com>
Date: Fri Mar 21 13:38:00 2008 +0900
sh: Hook up remaining IRQ sources for R7780MP FPGA.
Signed-off-by: Masayuki Hosokawa <hosokawa at ace-jp.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 2ad699080bbe3a88d17a1ff11e5575b76850174f
Author: Paul Mundt <lethal at linux-sh.org>
Date: Thu Mar 13 12:52:44 2008 +0900
sh: Initial support for the MX-G CPU.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit b9e393c2babb8b6956de52fc580b7c23f3629232
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Mar 7 17:19:58 2008 +0900
sh: Create an sh debugfs root.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit b420b1a7a17ea88531d0e12b2f2679a0c8365803
Author: Angelo Castello <angelo.castello at st.com>
Date: Thu Mar 6 12:50:53 2008 +0900
rtc: rtc-sh: Add support for periodic IRQs.
This adds support for periodic IRQs to the rtc-sh driver.
RTC_IRQP_READ/RTC_IRQP_SET are added, with a number of other fixes and
reordering across the rest of the code.
Signed-off-by: Angelo Castello <angelo.castello at st.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro at st.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 90fce7f4fb98c4256976aaa89b4453a544d74fd4
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Tue Mar 4 15:23:46 2008 -0800
sh: SuperH KEYSC keypad data for Solution Engine 7722
Add KEYSC platform data for the Solution Engine 7722 board.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Cc: Dmitry Torokhov <dtor at mail.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 92cfeb610d1da059b395501142915fadaa1625bf
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Tue Mar 4 15:23:45 2008 -0800
sh: SuperH KEYSC keypad data for MigoR
Add KEYSC platform data for the sh7722 MigoR board.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Cc: Dmitry Torokhov <dtor at mail.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 795e6bf33561ff03e253a6a756d5eb663b4a56bd
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Tue Mar 4 15:23:45 2008 -0800
sh: SuperH KEYSC platform driver
Add a platform driver for the SuperH KEYSC block. The driver expects to get
mode, timing information and keypad layout from the board code as platform
data. The board code is resonsible for pin configuration.
Both sh7343 and sh7722 should be supported, but only the sh7722 processor has
been tested so far. SH_KEYSC_MODE_3 is yet to be tested.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Cc: Dmitry Torokhov <dtor at mail.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 99773aab0377ee5bcaf37b7cd2577c3465422dab
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Mon Mar 31 10:03:42 2008 +0900
[SCSI] bsg: no need to set BSG_F_BLOCK bit in bsg_complete_all_commands
Before bsg_complete_all_commands is called, BSG_F_BLOCK bit is always
set.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 842ea771c38a3f0f78bdb1b4d47881e6a210fc15
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Mon Mar 31 10:03:41 2008 +0900
[SCSI] bsg: remove minor in struct bsg_device
minor in struct bsg_device is used as identifier to find the
corresponding struct bsg_device_class. However, request_queuse can be
used as identifier for that and the minor in struct bsg_device is
unnecessary.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 43ac9e62c4a0a47fe3de1f1eb9ca7b8c91dce234
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Mon Mar 31 10:03:40 2008 +0900
[SCSI] bsg: use better helper list functions
This replace hlist_for_each and list_entry with hlist_for_each_entry
and list_first_entry respectively.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit c3ff1b90d8924dd1c55c3b56a79bfc563ace4a42
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Mon Mar 31 10:03:39 2008 +0900
[SCSI] bsg: replace kobject_get with blk_get_queue
Both takes a ref to a queue. But blk_get_queue checks QUEUE_FLAG_DEAD
and is more appropriate interface here.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit d45ac4fa8f277e1ec5acfb67ce5d6406555760cf
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Mon Mar 31 10:03:38 2008 +0900
[SCSI] bsg: takes a ref to struct device in fops->open
bsg_register_queue() takes a ref to struct device that a caller
passes. For example, bsg takes a ref to the sdev_gendev for scsi
devices. However, bsg doesn't inrease the refcount in fops->open. So
while an application opens a bsg device, the scsi device that the bsg
device holds can go away (bsg also takes a ref to a queue, but it
doesn't prevent the device from going away).
With this patch, bsg increases the refcount of struct device in
fops->open and decreases it in fops->release.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 4786b4ee22de6304e841b12ee22b849230d7fba3
Merge: 253ba4e79edc695b2925bd2ef34de06ff4d4070c 71b264f85ff50c14fe945ffff06ae0d5e9a9124e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 09:44:55 2008 -0700
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: (27 commits)
[IA64] kdump: Add crash_save_vmcoreinfo for INIT
[IA64] Fix NUMA configuration issue
[IA64] Itanium Spec updates
[IA64] Untangle sync_icache_dcache() page size determination
[IA64] arch/ia64/kernel/: use time_* macros
[IA64] remove redundant display of free swap space in show_mem()
[IA64] make IOMMU respect the segment boundary limits
[IA64] kprobes: kprobe-booster for ia64
[IA64] fix getpid and set_tid_address fast system calls for pid namespaces
[IA64] Replace explicit jiffies tests with time_* macros.
[IA64] use goto to jump out do/while_each_thread
[IA64] Fix unlock ordering in smp_callin
[IA64] pgd_offset() constfication.
[IA64] kdump: crash.c coding style fix
[IA64] kdump: add kdump_on_fatal_mca
[IA64] Minimize per_cpu reservations.
[IA64] Correct pernodesize calculation.
[IA64] Kernel parameter for max number of concurrent global TLB purges
[IA64] Multiple outstanding ptc.g instruction support
[IA64] Implement smp_call_function_mask for ia64
...
commit 2302aca8508ee727a0c5edde3a7518a4ee03da1b
Author: Steve French <sfrench at us.ibm.com>
Date: Fri Apr 18 16:40:32 2008 +0000
[CIFS] Reserve new proxy cap for WAFS
New WAFS filer uses ioctls which are shown to be available
on a share by querying this info level
Acked-by: Sam Liddicott <sam at liddicott.com>
Signed-off-by: Stevef French <sfrench at us.ibm.com>
commit 2309e9e040fe29469fb85a384636c455b62fe525
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Apr 14 10:46:19 2008 -0700
ocfs2/net: Add debug interface to o2net
This patch exposes o2net information via debugfs. The information includes
the list of sockets (sock_containers) as well as the list of outstanding
messages (send_tracking). Useful for o2dlm debugging.
(This patch is derived from an earlier one written by Zach Brown that
exposed the same information via /proc.)
[Mark: checkpatch fixes]
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Reviewed-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 93b06edb5127315473d87e075b2b1d1acf74659c
Author: Mark Fasheh <mfasheh at suse.com>
Date: Fri Apr 4 12:45:55 2008 -0700
ocfs2: Only build ocfs2/dlm with the o2cb stack module
fs/ocfs2/dlm/ocfs2_dlm.ko and fs/ocfs2/dlm/ocfs2_dlmfs.ko get built if
CONFIG_FS_OCFS2 is specified. This isn't quite how it should happen any more
- the "o2cb" dlm modules should only be built if CONFIG_FS_OCFS2_O2CB is
set, so update the dlm Makefile accordingly.
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
Acked-by: Joel Becker <joel.becker at oracle.com>
commit 409753bf6da4a2db038027471abaf324e063db2f
Author: Jeff Mahoney <jeffm at suse.com>
Date: Fri Mar 28 16:44:13 2008 -0700
ocfs2/cluster: Get rid of arguments to the timeout routines
We keep seeing bug reports related to NULL pointer derefs in
o2net_set_nn_state(). When I originally wrote up the configurable timeout
patch, I had tried to plan for multiple clusters. This was silly.
The timeout routines all use o2nm_single_cluster so there's no point in
passing an argument at all. This patch removes the arguments and kills those
bugs dead.
Signed-off-by: Jeff Mahoney <jeffm at suse.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit dda47bce91b8624ef0806f7f8157ffc91e153c9d
Author: Joel Becker <joel.becker at oracle.com>
Date: Sat Mar 22 22:08:07 2008 -0700
ocfs2: Put tree in MAINTAINERS
The ocfs2 MAINTAINERS entry should have the git tree URL.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit b1f3550fa1471b691ad6c2f35b5b22e93eaa5855
Author: Julia Lawall <julia at diku.dk>
Date: Tue Mar 4 15:21:05 2008 -0800
ocfs2: Use BUG_ON
if (...) BUG(); should be replaced with BUG_ON(...) when the test has no
side-effects to allow a definition of BUG_ON that drops the code completely.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ disable unlikely @ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (unlikely(E)) { BUG(); }
+ BUG_ON(E);
)
@@ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (E) { BUG(); }
+ BUG_ON(E);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit c9ec14884d69a303eef4faae42bd3c4e25b19941
Author: Andi Kleen <ak at suse.de>
Date: Sun Jan 27 03:17:17 2008 +0100
ocfs2: Convert ocfs2 over to unlocked_ioctl
As far as I can see there is nothing in ocfs2_ioctl that requires the BKL,
so use unlocked_ioctl
Signed-off-by: Andi Kleen <ak at suse.de>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 5dabd69515765156605b09261abf969236a77803
Author: Jan Kara <jack at suse.cz>
Date: Thu Feb 21 18:00:00 2008 +0100
ocfs2: Improve rename locking
ocfs2_rename() was being too aggressive with the rename lock - we only need
it for certain forms of directory rename.
Signed-off-by: Jan Kara <jack at suse.cz>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 58dadcdbc2584db050969f9781727fc5a3f618db
Author: Julia Lawall <julia at diku.dk>
Date: Fri Mar 28 14:43:10 2008 -0700
fs/ocfs2/aops.c: test for IS_ERR rather than 0
The function ocfs2_start_trans always returns either a valid pointer or a
value made with ERR_PTR, so its result should be tested with IS_ERR, not
with a test for 0.
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 4d0ddb2ce25db2254d468233d942276ecf40bff8
Author: Tao Ma <tao.ma at oracle.com>
Date: Wed Mar 5 16:11:46 2008 +0800
ocfs2: Add inode stealing for ocfs2_reserve_new_inode
Inode allocation is modified to look in other nodes allocators during
extreme out of space situations. We retry our own slot when space is freed
back to the global bitmap, or whenever we've allocated more than 1024 inodes
from another slot.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit a4a4891164d4f6f383cc17e7c90828a7ca6a1146
Author: Tao Ma <tao.ma at oracle.com>
Date: Mon Mar 3 17:12:30 2008 +0800
ocfs2: Add ac_alloc_slot in ocfs2_alloc_context
In inode stealing, we no longer restrict the allocation to
happen in the local node. So it is neccessary for us to add
a new member in ocfs2_alloc_context to indicate which slot
we are using for allocation. We also modify the process of
local alloc so that this member can be used there also.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit ffda89a3bf3b968bdc268584c6bc1da5c173cf12
Author: Tao Ma <tao.ma at oracle.com>
Date: Mon Mar 3 17:12:09 2008 +0800
ocfs2: Add a new parameter for ocfs2_reserve_suballoc_bits
In some cases(Inode stealing from other nodes), we may not want
ocfs2_reserve_suballoc_bits to allocate new groups from the
global_bitmap since it may already be full. So add a new parameter
for this.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit ad5a4d7093a76fa245e277e6f0f0e168a08aeff7
Author: Tao Ma <tao.ma at oracle.com>
Date: Wed Jan 30 14:21:32 2008 +0800
ocfs2: Enable cross extent block merge.
In ocfs2_figure_merge_contig_type, we judge whether there exists
a cross extent block merge and enable it by setting CONTIG_LEFT
and CONTIG_RIGHT accordingly.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 677b975282e48d1818df4181336307377d56b04e
Author: Tao Ma <tao.ma at oracle.com>
Date: Wed Jan 30 14:21:05 2008 +0800
ocfs2: Add support for cross extent block
In ocfs2_merge_rec_left, when we find the merge extent is "CONTIG_RIGHT"
with the first extent record of the next extent block, we will merge it to
the next extent block and change all the related extent blocks accordingly.
In ocfs2_merge_rec_right, when we find the merge extent is "CONTIG_LEFT"
with the last extent record of the previous extent block, we will merge
it to the prevoius extent block and change all the related extent blocks
accordingly.
As for CONTIG_LEFTRIGHT, we will handle CONTIG_RIGHT first so that when
the index is zero, the merge process will be more efficient and easier.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 52f7c21b613f80cb425d115c9e5b4ed958a133c0
Author: Mark Fasheh <mfasheh at suse.com>
Date: Tue Jan 29 17:08:26 2008 -0800
ocfs2: Move /sys/o2cb to /sys/fs/o2cb
/sys/fs is where we really want file system specific sysfs objects.
Ocfs2-tools has been updated to look in /sys/fs/o2cb. We can maintain
backwards compatibility with old ocfs2-tools by using a sysfs symlink. After
some time (2 years), the symlink can be safely removed. This patch also adds
documentation to make it easier for people to figure out what /sys/fs/o2cb
is used for.
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit a839c5afcdc345aecb35b0d3bcd0e09b571329c3
Author: Mark Fasheh <mfasheh at suse.com>
Date: Tue Jan 29 14:35:18 2008 -0800
sysfs: Allow removal of symlinks in the sysfs root
Allow callers of sysfs_remove_link() to pass a NULL kobj, in which case
sysfs_root will be used as the parent directory. This allows us to tear down
top level symlinks created via sysfs_create_link(), which already has
similar handling of a NULL parent object.
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 5cc3bf2786f63cceb191c3c02ddd83c6f38a7d64
Author: Tao Ma <tao.ma at oracle.com>
Date: Wed Mar 5 15:50:12 2008 +0800
ocfs2: Reconnect after idle time out.
Currently, o2net connects to a node on hb_up and disconnects on
hb_down and net timeout.
It disconnects on net timeout is ok, but it should attempt to
reconnect back. This is because sometimes nodes get overloaded
enough that the network connection breaks but the disk hb does not.
And if we get into that situation, we either fence (unnecessarily)
or wait for its disk hb to die (and sometimes hang in the process).
So in this updated scheme, when the network disconnects, we keep
attempting to reconnect till we succeed or we get a disk hb down
event.
If the other node is really dead, then we will eventually get a
node down event. If not, we should be able to connect again and
continue.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 8f50eb978935431ccbf89b0344efd4ce6a924875
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Fri Mar 14 11:18:24 2008 -0700
ocfs2/dlm: Cleanup lockres print
A previous patch added KERN_NOTICE to printks printing the lockres that
cluttered the output. This patch removes the log level. For people concerned
with syslog clutter, please note we now use this facility to print lockres
only during an error.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit c834cdb15702dd0147875b352cc7d4df93d7d900
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:29 2008 -0700
ocfs2/dlm: Fix lockname in lockres print function
__dlm_print_one_lock_resource was printing lockname incorrectly.
Also, we now use printk directly instead of mlog as the latter prints
the line context which is not useful for this print.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit e5a0334cbd65e27f8dfd9985aa805874fe59e879
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:28 2008 -0700
ocfs2/dlm: Move dlm_print_one_mle() from dlmmaster.c to dlmdebug.c
This patch helps in consolidating debugging related functions in dlmdebug.c.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 7209300a9b987e017cae2ef9d7ef55b0fdd71869
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:27 2008 -0700
ocfs2/dlm: Dumps the purgelist into a debugfs file
This patch dumps all the lockres' on the purgelist it can fit in one page
into a debugfs file. Useful for debugging.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit d0129aceaecc2b1f5171b8e8036eb469b6e0fe81
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:26 2008 -0700
ocfs2/dlm: Dumps the mles into a debugfs file
This patch dumps all mles it can fit in one page into a debugfs file.
Useful for debugging.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 751155a953e1fe558d3d3c3db7087712ffc15c3e
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:25 2008 -0700
ocfs2/dlm: Move struct dlm_master_list_entry to dlmcommon.h
This patch moves some mle related definitions from dlmmaster.c
to dlmcommon.h. Future patches need these definitions to dump mle
debugging information.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.beckeroracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 4e3d24ed1a1285fe3289653aacc965642706bacb
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:24 2008 -0700
ocfs2/dlm: Dumps the lockres' into a debugfs file
This patch dumps all the lockres' alongwith all the locks into
a debugfs file. Useful for debugging.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 007dce53a29ccffc000ab5373d188f73881390fd
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:23 2008 -0700
ocfs2/dlm: Dump the dlm state in a debugfs file
This patch dumps the dlm state (dlm_ctxt) into a debugfs file.
Useful for debugging.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 6325b4a22b8f5e40ea9353288b3d6a32181f9718
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:22 2008 -0700
ocfs2/dlm: Create debugfs dirs
This patch creates the debugfs directories that will hold the
files to be used to dump the dlm state.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 29576f8bb54045be944ba809d4fca1ad77c94165
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:21 2008 -0700
ocfs2/dlm: Link all lockres' to a tracking list
This patch links all the lockres' to a tracking list in dlm_ctxt.
We will use this in an upcoming patch that will walk the entire
list and to dump the lockres states to a debugfs file.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 724bdca9b8449d9ee5f779dc27ee3d906a04508c
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:20 2008 -0700
ocfs2/dlm: Create slabcaches for lock and lockres
This patch makes the o2dlm allocate memory for lockres, lockname and lock
structures from slabcaches rather than kmalloc. This allows us to not only
make these allocs more efficient but also allows us to track the memory being
consumed by these structures.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 12eb0035d6f0466038ef2c6e5f6f9296b9b74d91
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Mar 10 15:16:19 2008 -0700
ocfs2/dlm: Rename slabcache dlm_mle_cache to o2dlm_mle
This patch renames dlm_mle_slabcache to prevent namespace clashes with fs/dlm.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 53f67e33865927049b20839ce15ce0fb5b7ebe2d
Author: Joel Becker <joel.becker at oracle.com>
Date: Mon Mar 31 16:22:55 2008 -0700
ocfs2: Document /sys/fs/ocfs2
Add ABI documentation for these files:
/sys/fs/ocfs2/max_locking_protocol
/sys/fs/ocfs2/loaded_cluster_plugins
/sys/fs/ocfs2/active_cluster_plugin
/sys/fs/ocfs2/cluster_stack
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 9341d22942d63d6a1e4cc90f246980dbb7e1ca94
Author: Joel Becker <joel.becker at oracle.com>
Date: Tue Mar 4 17:58:56 2008 -0800
ocfs2: Allow selection of cluster plug-ins.
ocfs2 now supports plug-ins for the classic O2CB stack as well as
userspace cluster stacks in conjunction with fs/dlm. This allows zero,
one, or both of the plug-ins to be selected in Kconfig. For local mounts
(non-clustered), neither plug-in is needed. Both plugins can be loaded
at one time, the runtime will select the one needed for the cluster
systme in use.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit b92eccdd28e1e3870a5b2aa625282c9ae8e35cec
Author: Joel Becker <joel.becker at oracle.com>
Date: Wed Nov 28 14:53:30 2007 -0800
ocfs2: Add kbuild for ocfs2_stack_user.ko
Add ocfs2_stack_user.ko to the Makefile so that it builds.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 8f318311faf57481452895448e6ffaec7c38a146
Author: Joel Becker <joel.becker at oracle.com>
Date: Tue Mar 4 16:09:39 2008 -0800
ocfs2: Change mlog_bug_on to BUG_ON in ocfs2_lockid.h
The masklog code is in the o2cb stack, but ocfs2_lockid.h now needs to
be included by the user stack. The BUG() in ocfs2_lock_type_string()
does not need masklog support, so change it to a regular BUG_ON().
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit cf4d8d75d8aba537a19b313a9364fd08ddbd5622
Author: David Teigland <teigland at redhat.com>
Date: Wed Feb 20 14:29:27 2008 -0800
ocfs2: add fsdlm to stackglue
Add code to use fs/dlm.
[ Modified to be part of the stack_user module -- Joel ]
Signed-off-by: David Teigland <teigland at redhat.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit d4b95eef4dc4a59bcd42bdf783638a2eaa57b4c8
Author: Joel Becker <joel.becker at oracle.com>
Date: Wed Feb 20 15:39:44 2008 -0800
ocfs2: Add the 'set version' message to the ocfs2_control device.
The "SETV" message sets the filesystem locking protocol version as
negotiated by the client. The client negotiates based on the maximum
version advertised in /sys/fs/ocfs2/max_locking_protocol.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 3cfd4ab6b6b4bee2035b62e1c293801c3d257502
Author: Joel Becker <joel.becker at oracle.com>
Date: Wed Feb 20 14:44:34 2008 -0800
ocfs2: Add the local node id to the handshake.
This is the second part of the ocfs2_control handshake. After
negotiating the ocfs2_control protocol, the daemon tells the filesystem
what the local node id is via the SETN message.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit de870ef02295c9f5601dbf2efdc1be6df44b187b
Author: Joel Becker <joel.becker at oracle.com>
Date: Mon Feb 18 17:07:09 2008 -0800
ocfs2: Introduce the DOWN message to ocfs2_control
When the control daemon sees a node go down, it sends a DOWN message
through the ocfs2_control device.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 462c7e6a257e547eebe1648396cf7c45e684091b
Author: Joel Becker <joel.becker at oracle.com>
Date: Mon Feb 18 19:40:12 2008 -0800
ocfs2: Start the ocfs2_control handshake.
When a control daemon opens the ocfs2_control device, it must perform a
handshake to tell the filesystem it is something capable of monitoring
cluster status. Only after the handshake is complete will the filesystem
allow mounts.
This is the first part of the handshake. The daemon reads all supported
ocfs2_control protocols, then writes in the protocol it will use.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 6427a727557d9c964b7b162ae11bb156e2c501d5
Author: Joel Becker <joel.becker at oracle.com>
Date: Mon Feb 18 19:23:28 2008 -0800
ocfs2: Add the ocfs2_control misc device.
The ocfs2_control misc device is how a userspace control daemon (controld)
talks to the filesystem. Introduce the bare-bones filesystem ops.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 8adf0536c9fb578a8542dcf81104d3438a5287e4
Author: Joel Becker <joel.becker at oracle.com>
Date: Wed Nov 28 14:38:40 2007 -0800
ocfs2: Add the user stack module.
Add a skeleton for the stack_user module. It's just the barebones module
code.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 9c6c877c04ce17d76a35d2173d3a3840d6b796a2
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 15:17:30 2008 -0800
ocfs2: Add the 'cluster_stack' sysfs file.
Userspace can now query and specify the cluster stack in use via the
/sys/fs/ocfs2/cluster_stack file. By default, it is 'o2cb', which is
the classic stack. Thus, old tools that do not know how to modify this
file will work just fine. The stack cannot be modified if there is a
live filesystem.
ocfs2_cluster_connect() now takes the expected cluster stack as an
argument. This way, the filesystem and the stack glue ensure they are
speaking to the same backend.
If the stack is 'o2cb', the o2cb stack plugin is used. For any other
value, the fsdlm stack plugin is selected.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit b61817e1166c5e19c08baf05196477cc345e1b1a
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 15:08:23 2008 -0800
ocfs2: Add the USERSPACE_STACK incompat bit.
The filesystem gains the USERSPACE_STACK incomat bit and the
s_cluster_info field on the superblock. When a userspace stack is in
use, the name of the stack is stored on-disk for mount-time
verification.
The "cluster_stack" option is added to mount(2) processing. The mount
process needs to pass the matching stack name. If the passed name and
the on-disk name do not match, the mount is failed.
When using the classic o2cb stack, the incompat bit is *not* set and no
mount option is used other than the usual heartbeat=local. Thus, the
filesystem is compatible with older tools.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 74ae4e104dfc57017783fc07d5f2f9129062207f
Author: Joel Becker <joel.becker at oracle.com>
Date: Thu Jan 31 23:56:17 2008 -0800
ocfs2: Create stack glue sysfs files.
Introduce a set of sysfs files that describe the current stack glue
state. The files live under /sys/fs/ocfs2. The locking_protocol file
displays the version of ocfs2's locking code. The
loaded_cluster_plugins file displays all of the currently loaded stack
plugins. When filesystems are mounted, the active_cluster_plugin file
will display the plugin in use.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 286eaa95c5c5915a6b72cc3f0a2534161fd7928b
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 15:03:57 2008 -0800
ocfs2: Break out stackglue into modules.
We define the ocfs2_stack_plugin structure to represent a stack driver.
The o2cb stack code is split into stack_o2cb.c. This becomes the
ocfs2_stack_o2cb.ko module.
The stackglue generic functions are similarly split into the
ocfs2_stackglue.ko module. This module now provides an interface to
register drivers. The ocfs2_stack_o2cb driver registers itself. As
part of this interface, ocfs2_stackglue can load drivers on demand.
This is accomplished in ocfs2_cluster_connect().
ocfs2_cluster_disconnect() is now notified when a _hangup() is pending.
If a hangup is pending, it will not release the driver module and will
let _hangup() do that.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
commit e3dad42bf993a0f24eb6e46152356c9b119c15e8
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 15:02:36 2008 -0800
ocfs2: Create ocfs2_stack_operations and split out the o2cb stack.
Define the ocfs2_stack_operations structure. Build o2cb_stack_ops from
all of the o2cb-specific stack functions. Change the generic stack glue
functions to call the stack_ops instead of the o2cb functions directly.
The o2cb functions are moved to stack_o2cb.c. The headers are cleaned up
to where only needed headers are included.
In this code, stackglue.c and stack_o2cb.c refer to some shared
extern variables. When they become modules, that will change.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 553aa7e408eac402c00b67ddfa7aec13fe1f3a33
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 14:51:03 2008 -0800
ocfs2: Split o2cb code from generic stack functions.
Split off the o2cb-specific funtionality from the generic stack glue
calls. This is a precurser to wrapping the o2cb functionality in an
operations vector.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 63e0c48ae6986a5bbb8e8dd9210c0e6ca79f2e50
Author: Joel Becker <joel.becker at oracle.com>
Date: Wed Jan 30 16:58:36 2008 -0800
ocfs2: Clean up stackglue initialization
The stack glue initialization function needs a better name so that it can be
used cleanly when stackglue becomes a module.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit cf0acdcd640e9466059e69951c557e90b4bee45a
Author: Joel Becker <joel.becker at oracle.com>
Date: Tue Jan 29 16:59:55 2008 -0800
ocfs2: Abstract out a debugging function for underlying dlms.
dlmglue.c was still referencing a raw o2dlm lksb in one instance. Let's
create a generic ocfs2_dlm_dump_lksb() function. This allows underlying
DLMs to print whatever they want about their lock.
We then move the o2dlm dump into stackglue.c where it belongs.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 1693a5c0117f8ccd010a666f97aaf0f14fb0a0e4
Author: David Teigland <teigland at redhat.com>
Date: Wed Jan 30 16:52:53 2008 -0800
ocfs2: handle async EAGAIN from NOQUEUE request
When using fsdlm, -EAGAIN is returned in the async callback for NOQUEUE
requests. Fix up dlmglue to expect this.
Signed-off-by: David Teigland <teigland at redhat.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit de551246e7bc5558371c3427889a8db1b8cc60f4
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 14:45:08 2008 -0800
ocfs2: Remove CANCELGRANT from the view of dlmglue.
o2dlm has the non-standard behavior of providing a cancel callback
(unlock_ast) even when the cancel has failed (the locking operation
succeeded without canceling). This is called CANCELGRANT after the
status code sent to the callback. fs/dlm does not provide this
callback, so dlmglue must be changed to live without it.
o2dlm_unlock_ast_wrapper() in stackglue now ignores CANCELGRANT calls.
Because dlmglue no longer sees CANCELGRANT, ocfs2_unlock_ast() no longer
needs to check for it. ocfs2_locking_ast() must catch that a cancel was
tried and clear the cancel state.
Making these changes opens up a locking race. dlmglue uses the the
OCFS2_LOCK_BUSY flag to ensure only one thread is calling the dlm at any
one time. But dlmglue must unlock the lockres before calling into the
dlm. In the small window of time between unlocking the lockres and
calling the dlm, the downconvert thread can try to cancel the lock. The
downconvert thread is checking the OCFS2_LOCK_BUSY flag - it doesn't
know that ocfs2_dlm_lock() has not yet been called.
Because ocfs2_dlm_lock() has not yet been called, the cancel operation
will just be a no-op. There's nothing to cancel. With CANCELGRANT,
dlmglue uses the CANCELGRANT callback to clear up the cancel state.
When it comes around again, it will retry the cancel. Eventually, the
first thread will have called into ocfs2_dlm_lock(), and either the
lock or the cancel will succeed. The downconvert thread can then do its
downconvert.
Without CANCELGRANT, there is nothing to clean up the cancellation
state. The downconvert thread does not know to retry its operations.
More importantly, the original lock may be blocking on the other node
that is trying to cancel us. With neither able to make progress, the
ast is never called and the cancellation state is never cleaned up that
way. dlmglue is deadlocked.
The OCFS2_LOCK_PENDING flag is introduced to remedy this window. It is
set at the same time OCFS2_LOCK_BUSY is. Thus, the downconvert thread
can check whether the lock is cancelable. If not, it just loops around
to try again. Once ocfs2_dlm_lock() is called, the thread then clears
OCFS2_LOCK_PENDING and wakes the downconvert thread. Now, if the
downconvert thread finds the lock BUSY, it can safely try to cancel it.
Whether the cancel works or not, the state will be properly set and the
lock processing can continue.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 0abd6d1803b01c741430af270026d1d95a103d9c
Author: Mark Fasheh <mfasheh at suse.com>
Date: Tue Jan 29 16:59:56 2008 -0800
ocfs2: Fill node number during cluster stack init
It doesn't make sense to query for a node number before connecting to the
cluster stack. This should be safe to do because node_num is only just
printed,
and we're actually only moving the setting of node num a small amount
further in the mount process.
[ Disconnect when node query fails -- Joel ]
Reviewed-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 6953b4c008628b945bfe0cee97f6e78a98773859
Author: Joel Becker <joel.becker at oracle.com>
Date: Tue Jan 29 16:59:56 2008 -0800
ocfs2: Move o2hb functionality into the stack glue.
The last bit of classic stack used directly in ocfs2 code is o2hb.
Specifically, the check for heartbeat during mount and the call to
ocfs2_hb_ctl during unmount.
We create an extra API, ocfs2_cluster_hangup(), to encapsulate the call
to ocfs2_hb_ctl. Other stacks will just leave hangup() empty.
The check for heartbeat is moved into ocfs2_cluster_connect(). It will
be matched by a similar check for other stacks.
With this change, only stackglue.c includes cluster/ headers.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 19fdb624dc8ccb663f6e48b3a3a3fa4e4e567fc1
Author: Joel Becker <joel.becker at oracle.com>
Date: Wed Jan 30 15:38:24 2008 -0800
ocfs2: Abstract out node number queries.
ocfs2 asks the cluster stack for the local node's node number for two
reasons; to fill the slot map and to print it. While the slot map isn't
necessary for userspace cluster stacks, the printing is very nice for
debugging. Thus we add ocfs2_cluster_this_node() as a generic API to get
this value. It is anticipated that the slot map will not be used under a
userspace cluster stack, so validity checks of the node num only need to
exist in the slot map code. Otherwise, it just gets used and printed as an
opaque value.
[ Fixed up some "int" versus "unsigned int" issues and made osb->node_num
truly opaque. --Mark ]
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 4670c46ded9a18268d1265417ff4ac72145a7917
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 14:39:35 2008 -0800
ocfs2: Introduce the new ocfs2_cluster_connect/disconnect() API.
This step introduces a cluster stack agnostic API for initializing and
exiting. fs/ocfs2/dlmglue.c no longer uses o2cb/o2dlm knowledge to
connect to the stack. It is all handled in stackglue.c.
heartbeat.c no longer needs to know how it gets called.
ocfs2_do_node_down() is now a clean recovery trigger.
The big gotcha is the ordering of initializations and de-initializations done
underneath ocfs2_cluster_connect(). ocfs2_dlm_init() used to do all
o2dlm initialization in one block. Thus, the o2dlm functionality of
ocfs2_cluster_connect() is very straightforward. ocfs2_dlm_shutdown(),
however, did a few things between de-registration of the eviction
callback and actually shutting down the domain. Now de-registration and
shutdown of the domain are wrapped within the single
ocfs2_cluster_disconnect() call. I've checked the code paths to make
sure we can safely tear down things in ocfs2_dlm_shutdown() before
calling ocfs2_cluster_disconnect(). The filesystem has already set
itself to ignore the callback.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 8f2c9c1b16bf6ed0903b29c49d56fa0109a390e4
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 12:16:57 2008 -0800
ocfs2: Create the lock status block union.
Wrap the lock status block (lksb) in a union. Later we will add a union
element for the fs/dlm lksb. Create accessors for the status and lvb
fields.
Other than a debugging function, dlmglue.c does not directly reference
the o2dlm locking path anymore.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 7431cd7e8dd0e46e9b12bd6a1ac1286f4b420371
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 12:15:37 2008 -0800
ocfs2: Use -errno instead of dlm_status for ocfs2_dlm_lock/unlock() API.
Change the ocfs2_dlm_lock/unlock() functions to return -errno values.
This is the first step towards elminiating dlm_status in
fs/ocfs2/dlmglue.c. The change also passes -errno values to
->unlock_ast().
[ Fix a return code in dlmglue.c and change the error translation table into
an array of ints. --Mark ]
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit bd3e76105d4478ab89951a52d1a35250d24a9f16
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 12:14:57 2008 -0800
ocfs2: Use global DLM_ constants in generic code.
The ocfs2 generic code should use the values in <linux/dlmconstants.h>.
stackglue.c will convert them to o2dlm values.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 24ef1815e5e13e50196eb1ab8ddc0d783443bdf8
Author: Joel Becker <joel.becker at oracle.com>
Date: Tue Jan 29 17:37:32 2008 -0800
ocfs2: Separate out dlm lock functions.
This is the first in a series of patches to isolate ocfs2 from the
underlying cluster stack. Here we wrap the dlm locking functions with
ocfs2-specific calls. Because ocfs2 always uses the same dlm lock status
callbacks, we can eliminate the callbacks from the filesystem visible
functions.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 386a2ef8576e966076c293f6496b9e3d7e3d9035
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 12:06:54 2008 -0800
ocfs2: New slot map format
The old slot map had a few limitations:
- It was limited to one block, so the maximum slot count was 255.
- Each slot was signed 16bits, limiting node numbers to INT16_MAX.
- An empty slot was marked by the magic 0xFFFF (-1).
The new slot map format provides 32bit node numbers (UINT32_MAX), a
separate space to mark a slot in use, and extra room to grow. The slot
map is now bounded by i_size, not a block.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit fb86b1f07120b66769a39c445da5c4300069dd44
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 11:59:05 2008 -0800
ocfs2: Define the contents of the slot_map file.
The slot map file is merely an array of __le16. Wrap it in a structure for
cleaner reference.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit fc881fa0d59596c02f8707b5572567c369d4789a
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 12:04:48 2008 -0800
ocfs2: De-magic the in-memory slot map.
The in-memory slot map uses the same magic as the on-disk one. There is
a special value to mark a slot as invalid. It relies on the size of
certain types and so on.
Write a new in-memory map that keeps validity as a separate field. Outside
of the I/O functions, OCFS2_INVALID_SLOT now means what it is supposed to.
It also is no longer tied to the type size.
This also means that only the I/O functions refer to 16bit quantities.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 1c8d9a6a330f46b3a6ddd204a2580131d5f0d6b7
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 11:59:07 2008 -0800
ocfs2: slot_map I/O based on max_slots.
The slot map code assumed a slot_map file has one block allocated.
This changes the code to I/O as many blocks as will cover max_slots.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 553abd046af609191a91af7289d87d477adc659f
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 12:03:57 2008 -0800
ocfs2: Change the recovery map to an array of node numbers.
The old recovery map was a bitmap of node numbers. This was sufficient
for the maximum node number of 254. Going forward, we want node numbers
to be UINT32. Thus, we need a new recovery map.
Note that we can't keep track of slots here. We must write down the
node number to recovery *before* we get the locks needed to convert a
node number into a slot number.
The recovery map is now an array of unsigned ints, max_slots in size.
It moves to journal.c with the rest of recovery.
Because it needs to be initialized, we move all of recovery initialization
into a new function, ocfs2_recovery_init(). This actually cleans up
ocfs2_initialize_super() a little as well. Following on, recovery cleaup
becomes part of ocfs2_recovery_exit().
A number of node map functions are rendered obsolete and are removed.
Finally, waiting on recovery is wrapped in a function rather than naked
checks on the recovery_event. This is a cleanup from Mark.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit d85b20e4b300edfd290f21fc2d790ba16d2f225b
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri Feb 1 12:01:05 2008 -0800
ocfs2: Make ocfs2_slot_info private.
Just use osb_lock around the ocfs2_slot_info data. This allows us to
take the ocfs2_slot_info structure private in slot_info.c. All access
is now via accessors.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 8e8a4603b5422c9145880e73b23bc4c2c4de0098
Author: Mark Fasheh <mfasheh at suse.com>
Date: Fri Feb 1 11:59:09 2008 -0800
ocfs2: Move slot map access into slot_map.c
journal.c and dlmglue.c would refresh the slot map by hand. Instead, have
the update and clear functions do the work inside slot_map.c. The eventual
result is to make ocfs2_slot_info defined privately in slot_map.c
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit db8be076cad4b843aa743ef462c75022cddd9c63
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Mar 31 02:22:11 2008 +0300
firewire: cleanups
This patch contains the following cleanups:
- #if 0 the following unused structs:
- fw-transaction.c:fw_low_memory_region
- fw-transaction.c:fw_private_region
- fw-transaction.c:fw_csr_region
- fw-transaction.c:fw_unit_space_region
- remove the following unused EXPORT_SYMBOL's:
- fw-card.c:fw_core_add_descriptor
- fw-card.c:fw_core_remove_descriptor
- fw-iso.c:fw_iso_context_create
- fw-iso.c:fw_iso_context_destroy
- fw-iso.c:fw_iso_context_start
- fw-iso.c:fw_iso_context_queue
- fw-iso.c:fw_iso_context_stop
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 25b1c3d8889f982ebc6c7b996cfc7fa5f1dce533
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Mon Mar 24 20:57:12 2008 +0100
firewire: fix synchronization of gap counts
Fix: The fact that nodes had different gap counts would be overlooked
if the bus manager code would pick gap count 63 because of beta
repeaters or because of very large hop counts. In this case, the bus
manager code would miss that it actually has to send the PHY config
packet with gap count 63.
Related trivial changes: Use bool for an int used as bool, touch up
some comments.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 2a0a2590498be7b92e3e76409c9b8ee722e23c8f
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Mar 20 23:48:23 2008 +0100
firewire: wait until PHY configuration packet was transmitted (fix bus reset loop)
We now exit fw_send_phy_config /after/ the PHY config packet has been
transmitted, instead of before. A subsequent fw_core_initiate_bus_reset
will therefore not overlap with the transmission. This is meant to make
the send PHY config packet + reset bus routine more deterministic.
Fixes bus reset loop and eventual panic with
- VIA VT6307 + IOGEAR hub + Unibrain Fire-i camera
http://bugzilla.kernel.org/show_bug.cgi?id=10128
- JMicron card
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit e09770db0fa33baf8df21fbc18aa24a080330c3f
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Tue Mar 11 02:23:29 2008 +0100
firewire: remove unused struct member
request_generation is internal to fw-ohci and unneeded in fw_card.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 15f0d833f63da2fa49aed81480a37d5e896b5b9b
Author: Jarod Wilson <jwilson at redhat.com>
Date: Sat Mar 8 13:18:58 2008 -0500
firewire: use bitwise and to get reg in handle_registers
for code efficiency.
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit cca6097713c62eac43aef27b31e7f1553dde4f94
Author: Jarod Wilson <jwilson at redhat.com>
Date: Sat Mar 8 12:52:03 2008 -0500
firewire: replace more hex values with defined csr constants
Trivial change to replace more meaningless (to the untrained eye) hex
values with defined CSR constants.
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit c9755e14a01987ada4063e8b4c50c2b6738d879e
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Mon Mar 24 20:54:28 2008 +0100
firewire: reread config ROM when device reset the bus
When a device changes its configuration ROM, it announces this with a
bus reset. firewire-core has to check which node initiated a bus reset
and whether any unit directories went away or were added on this node.
Tested with an IOI FWB-IDE01AB which has its link-on bit set if bus
power is available but does not respond to ROM read requests if self
power is off. This implements
- recognition of the units if self power is switched on after fw-core
gave up the initial attempt to read the config ROM,
- shutdown of the units when self power is switched off.
Also tested with a second PC running Linux/ieee1394. When the eth1394
driver is inserted and removed on that node, fw-core now notices the
addition and removal of the IPv4 unit on the ieee1394 node.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 1dadff71d6356ebb804c3f4f1d3049247e16111c
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sun Mar 2 19:35:42 2008 +0100
firewire: replace static ROM cache by allocated cache
read_bus_info_block() is repeatedly called by workqueue jobs.
These will step on each others toes eventually if there are multiple
workqueue threads, and we end up with corrupt config ROM images.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit d34316a4bdcd4fef050da584401c7f4ed22482f2
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Apr 12 22:31:25 2008 +0200
firewire: fw-ohci: work around generation bug in TI controllers (fix AV/C and more)
Unlike the ohci1394 driver, fw-ohci uses the selfIDGeneration field of
bus reset packets to determine the generation of incoming requests as
per OHCI 1.1 clause 8.4.2.3. This is more precise --- provided that the
controller inserts the correct generation. Texas Instruments chips
often don't.
This prevented the transmission of response packets, which for example
broke AV/C transactions as used when communicating with miniDV cameras
and any other AV/C devices.
There is apparently no way to detect and adjust incorrect generations.
Therefore we ignore the generation of bus reset packets from TI chips
and use the generation of the self ID buffer instead. Alas this is
received at a slightly wrong time. In rare cases, this could cause us
to not respond to legitimate requests or to respond to expired requests.
(The latter is less likely because the bus reset packet AR event is
typically handled before the self ID complete event.)
Bug reported by Mladen Kuntner, who was extraordinarily patient while
dealing with the driver maintainers. Fix confirmed to be required and
effective for TSB82AA2 and a TSB43AB22 or TSB43AB22A.
https://bugzilla.redhat.com/show_bug.cgi?id=243081
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit 08ddb2f4c270b5dff063f7dbcd7e9248a52e7c65
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Fri Apr 11 00:51:15 2008 +0200
firewire: fw-ohci: extend logging of bus generations and node ID
Extend the logging of "AR evt_bus_reset, link internal" to "AR
evt_bus_reset, generation ${selfIDGeneration}". That way we can check
whether this generation matches the one seen in self ID complete event
logging. See OHCI 1.1 clause 8.4.2.3.
Also extend logging of "firewire_ohci: * selfIDs, generation *" by
"local node ID ffc*" in self ID logging to make the local node in AT/AR
event logs more obvious.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit a007bb857e0b26f5d8b73c2ff90782d9c0972620
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Mon Apr 7 22:33:35 2008 +0200
firewire: fw-ohci: conditionally log busReset interrupts
Add a debug option to watch bus reset interrupt events. Half of this
patch is taken from Jarod Wilson's first version of the JMicron fix.
BusReset interrupts are only generated if the respective module
parameter flag was set before the controller is being initialized.
Else we keep this event masked to reduce IRQ load in normal operation
and to avoid potential problems with buggy chips.
Note, this is unlike the other IRQ events whose logging can be enabled
any time after chip initialization. This and the influence on what
interrupts the chip generates is why I added an extra flag for it.
Also, reorder the debug parameter flags according to their perceived
usefulness.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit 76f73ca1b291a8d014ff0d2d802c817404dd9887
Author: Jarod Wilson <jwilson at redhat.com>
Date: Mon Apr 7 22:32:33 2008 +0200
firewire: fw-ohci: don't append to AT context when it's not active
I finally tracked down the issues with this JMicron PCI-e card in my
possession to a failure to comply with section 7.2.3.2 of the OHCI 1.1
specification (thanks to Kristian for the pointer to illustrate that it
is indeed a flaw in this card, not the driver). The controller should
simply flush the packets we've appended to its AT queue if a bus reset
occurs before they've been transmitted and we'll try again, but
something goes wrong and the controller winds up hung.
However, we can avoid the problem by simply checking if the
IntEvent.busReset register had been set before we try appending to the
AT context. When busReset is set, the AT context is completely halted
until busReset is cleared, so there's no point in appending AT packets
until the register is cleared. So at_context_queue_packet() now checks
for busReset being set, and bails with an RCODE_GENERATION packet ack,
which results in us trying to append the packet again after recognizing
the fact there has been a bus reset, and clearing busReset.
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 75f7832e3b032c6e4a83c14b58341abd9f2d81ef
Author: Jarod Wilson <jwilson at redhat.com>
Date: Thu Apr 3 17:18:23 2008 -0400
firewire: fw-ohci: log regAccessFail events
While trying to debug this piece of crap JMicron PCI-e controller in my
possession, one thought was that perhaps I was encountering register access
failures. I'm not, but logging them would be good, so we can see if they
are a real problem we should be taking into account anywhere in the code.
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> (added list contact)
commit 022147242ff6e4b7ab770f00716063f48c088391
Author: Jarod Wilson <jwilson at redhat.com>
Date: Fri Mar 28 10:02:50 2008 -0400
firewire: fw-ohci: make sure HCControl register LPS bit is set
I've now witnessed multiple occasions where one of my controllers (a very
poorly working JMicron PCIe card) fails to get its registers properly set
up in ohci_enable(), apparently due to an occasionally very slow to
initiate SClk. The easy fix for this problem is to add a tiny while loop
to try again a time or three after initially enabling LPS before we
move on (or give up).
Of course, the card still isn't fully functional yet, but this gets it at
least one tiny step closer...
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 130d5496e2c9104dcabdaa5c19cd941770e20edc
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Mon Mar 24 20:55:28 2008 +0100
firewire: fw-ohci: missing PPC PMac feature calls in failure path
Balance ohci_pmac_on and ohci_pmac_off if pci_driver.probe fails.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 43286568adb3ccd4b2f1d0cb7393c355f03e4f39
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Tue Mar 11 21:22:26 2008 +0100
firewire: fw-ohci: untangle a mixed unsigned/signed expression
and make another expression more readable.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit ad3c0fe8b8d1656a56ce2ef05ed5ccba790b4566
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Mar 20 22:04:36 2008 +0100
firewire: debug interrupt events
This adds debug printks for asynchronous transmission and reception and
for self ID reception. They can be enabled at module load time, and at
runtime via /sys/module/firewire_ohci/parameters/debug.
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
Also added: Logging of interrupt event codes and of cancelled AT
packets.
The code now depends on a Kconfig variable. This makes it easier to
build firewire-ohci without the feature or to make it an option in the
future. The variable is currently hidden and always on.
This feature inflates firewire-ohci.ko by 7 kB = 27% on x86-64 and by
4 kB = 23% on i686.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 016bf3dfcf7c7fbad8f02e72b6e01d6773426f9d
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Wed Mar 19 22:05:02 2008 +0100
firewire: fw-ohci: catch self_id_count == 0
fw_core_handle_bus_reset() incorrectly relied on the assumption that
self_id_count > 0.
We check early in fw-ohci and discard the self ID complete event if
self_id_count == 0 because a valid event always has at least one self ID
packet in it (the one of the local node). Hence treat self_id_count ==
0 like any other kind of invalid self ID buffer.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit c8a9a498e16b2a6c0e4e367b1a01f80fdfd7b6e2
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Wed Mar 19 21:40:32 2008 +0100
firewire: fw-ohci: add self ID error check
Discard self ID buffer contents if
- the selfIDError flag is set,
- any of the self ID packets has bit errors.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit 2ed0f181f0d18d2f565bfbd259fe33d53769f72b
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Mar 1 12:35:29 2008 +0100
firewire: fw-ohci: refactor probe, remove, suspend, resume
Clean up shared code and variable names.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit eb5ca72effaa7f691f7df5187c5c5d1268311326
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Mar 1 12:34:50 2008 +0100
firewire: fw-ohci: switch on bus power after resume on PPC PMac
The platform feature calls in the suspend method switched off cable
power, but the calls in the resume method did not switch it back on.
Add the necessary feature call to .resume. Also add the corresponding
call to .suspend to make .suspend's behavior explicitly the same on all
PMacs.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 080de8c2c57e3199eee837fe8b6d35a43679f8c1
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Feb 28 20:54:43 2008 +0100
firewire: fw-ohci: add option for remote debugging
This way firewire-ohci can be used for remote debugging like ohci1394.
Version with amendment from Fri, 11 Apr 2008 00:08:08 +0200.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Acked-by: Bernhard Kaindl <bk at suse.de>
commit 17cff9ff871bb5081cade4f99a9e9382b9f1c01c
Author: Jarod Wilson <jwilson at redhat.com>
Date: Fri Mar 7 01:43:31 2008 -0500
firewire: fw-sbp2: set dual-phase cycle_limit
Try to write dual-phase retry protocol limits to BUSY_TIMEOUT register.
- The dual-phase retry protocol is optional to implement, and if not
supported, writes to the dual-phase portion of the register will be
ignored. We try to write the original 1394-1995 default here.
- In the case of devices that are also SBP-3-compliant, all writes are
ignored, as the register is read-only, but contains single-phase retry of
15, which is what we're trying to set for all SBP-2 device anyway, so this
write attempt is safe and yields more consistent behavior for all devices.
See section 8.3.2.3.5 of the 1394-1995 spec, section 6.2 of the SBP-2 spec,
and section 6.4 of the SBP-3 spec for further details.
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit a5fd9ec7a29202f388fc011a11cfb0101d9f9a34
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Feb 28 20:53:45 2008 +0100
firewire: fw-sbp2: reduce log noise
The block/unblock logic is now sufficiently tested.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 6f73100cbbb9728c098bd05e9363d206b9eeab47
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Feb 28 20:52:43 2008 +0100
firewire: fw-sbp2: remove unnecessary memset
orb came from kzalloc.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 0d7dcbf2a3b6042351948ecf1f171eb3f1d72cd3
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Feb 28 20:52:02 2008 +0100
firewire: fw-sbp2: simplify some macros
How hard can it be to switch on one bit? :-)
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 71ee9f01f2bc2b717dacc69c85f257e1efff12ee
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Feb 28 20:51:11 2008 +0100
firewire: fw-sbp2: remove usages of fw_memcpy_to_be32
Write directly in big endian instead of byte-swapping after the fact.
This saves a few conversions, lets gcc use constant endianess
conversions where possible, and enables deeper endianess annotation.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 8ac3a47cab32e5e5a40de4bc210b5b0063bf6e84
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sun Jan 27 22:31:27 2008 +0100
firewire: fw-sbp2: relax SCSI DMA alignment
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 1dc3bea78b6cd71c2017aa5da076684c049d8b98
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sun Feb 24 19:01:21 2008 +0100
firewire: refactor fw_unit reference counting
Add wrappers for getting and putting a unit.
Remove some line breaks.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit 7c1fca336661aaeb70b9094c4b8eaae389027509
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sun Feb 24 19:00:51 2008 +0100
firewire: fw-sbp2: fix reference counting
The reference count of the unit dropped too low in an error path in
sbp2_probe. Fixed by moving the _get further up.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit bd7dee6311156b7cdf884344feb34628909398ad
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sun Feb 24 18:59:55 2008 +0100
firewire: remove superfluous reference counting
The card->kref became obsolete since patch "firewire: fix crash in
automatic module unloading" added another counter of card users.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit a6ca4f7081095e3cdeb1a45d66fbe4856eca10d3
Author: Philippe De Muyter <phdm at macqel.be>
Date: Fri Apr 11 16:27:59 2008 +0200
ieee1394: limit early node speed to host interface speed
The following patch limits the node speed to the host interface speed,
before using it.
Signed-off-by: Philippe De Muyter <phdm at macqel.be>
It should actually suffice to do this only for the local node's
speedcap[]. But there is another bug in the speed calculation:
The local node's speed is not correctly propagated to the speeds
which are to be used to access remote nodes.
http://thread.gmane.org/gmane.linux.kernel.firewire.devel/11772/focus=12024
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit ee2d91e2b3e422f3f61cd7c6a58bd98a5ec72bd1
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Thu Mar 27 10:48:37 2008 -0400
ieee1394: Remove superfluous calls to kobject_set_name().
Unless you're adding a kobject to the sysfs hierarchy, there is no
point setting its kobject name.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 9508c208aa6e0a7501d8250d4a9d35344056d573
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Mon Mar 24 20:53:34 2008 +0100
ieee1394: ohci1394: missing PPC PMac feature calls in failure path
The failure path of ohci1394_pci_probe() reuses ohci1394_pci_remove().
Doing so it missed to call ohci1394_pmac_off() in a few unlikely early
error cases.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit c4e2e02bc96f0a1605f858df3d6d5ea70fc459fc
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Mon Mar 24 20:52:42 2008 +0100
ieee1394: ohci1394: refactor some printk format strings
to reduce the size of ohci1394.ko.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit d09c68038306442e3566366b6988a6dd83481251
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Mon Mar 24 20:49:01 2008 +0100
ieee1394: ohci1394: unroll a macro with return
We don't want to hide something like return in a preprocessor macro.
Unroll the macro and use a goto, which also reduces the size of
ohci1394.ko.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit e351c4d069254b1267b66a3b101ece7547178485
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Sun Mar 23 10:15:28 2008 -0400
ieee1394: Use shorter list_splice_init() for brevity.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit b1ce1fd778997b3313599a2561bcbd42a34bfb56
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Mar 5 18:24:54 2008 -0800
ieee1394: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit b25d166616ea30adedee70d99c40ba82d126d7cb
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Mar 1 12:36:42 2008 +0100
ieee1394: ohci1394: refactor probe, remove, suspend, resume
Clean up shared code and variable names.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 38275ac36d60882db750d6301ef507881b4c8420
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Mar 1 12:36:06 2008 +0100
ieee1394: ohci1394: switch on bus power after resume on PPC PMac
The platform feature calls in the suspend method switched off cable
power, but the calls in the resume method did not switch it back on.
Add the necessary feature call to .resume. Also add the corresponding
call to .suspend to make .suspend's behavior explicitly the same on all
PMacs.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit d2ace29fa44589da51fedc06a67b3f05301f3bfd
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Mon Feb 18 21:11:07 2008 +0100
ieee1394: prevent device binding of raw1394, video1394, dv1394
These drivers don't need to match any unit_directory type device.
They just need the id_table for module autoloading per module alias.
Not binding any of these drivers allows special-purpose drivers with
similar or same IDs to bind to devices. This currently only benefits
out-of-tree drivers; on the other hand it is in no way detrimental to
in-tree drivers.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 63995d46506a774f5ddd6b51c017d42c3fbfaedb
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Wed Feb 13 00:06:07 2008 +0100
ieee1394: be*_add_cpu conversion
replace all:
big_endian_variable = cpu_to_beX(beX_to_cpu(big_endian_variable) +
expression_in_cpu_byteorder);
with:
beX_add_cpu(&big_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit a4b47d62c5018e81e2b8ee9843d8a8268e886d25
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sun Jan 27 22:32:22 2008 +0100
ieee1394: sbp2: relax SCSI DMA alignment
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 253ba4e79edc695b2925bd2ef34de06ff4d4070c
Merge: 188da98800893691e47eea9335a234378e32aceb 65e67f5165c8a156b34ee7adf65d5ed3b16a910d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:39:39 2008 -0700
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: (87 commits)
[XFS] Fix merge failure
[XFS] The forward declarations for the xfs_ioctl() helpers and the
[XFS] Update XFS documentation for noikeep/ikeep.
[XFS] Update XFS Documentation for ikeep and ihashsize
[XFS] Remove unused HAVE_SPLICE macro.
[XFS] Remove CONFIG_XFS_SECURITY.
[XFS] xfs_bmap_compute_maxlevels should be based on di_forkoff
[XFS] Always use di_forkoff when checking for attr space.
[XFS] Ensure the inode is joined in xfs_itruncate_finish
[XFS] Remove periodic logging of in-core superblock counters.
[XFS] fix logic error in xfs_alloc_ag_vextent_near()
[XFS] Don't error out on good I/Os.
[XFS] Catch log unmount failures.
[XFS] Sanitise xfs_log_force error checking.
[XFS] Check for errors when changing buffer pointers.
[XFS] Don't allow silent errors in xfs_inactive().
[XFS] Catch errors from xfs_imap().
[XFS] xfs_bulkstat_one_dinode() never returns an error.
[XFS] xfs_iflush_fork() never returns an error.
[XFS] Catch unwritten extent conversion errors.
...
commit 188da98800893691e47eea9335a234378e32aceb
Merge: 07fe944e87d79f8d7e1b090913fe9f2ace78f41d 273b8385e5817a4765f82257004c5ec661a6a5b2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:39:24 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (58 commits)
ide: remove ide_init_default_irq() macro
ide: move default IDE ports setup to ide_generic host driver
ide: remove obsoleted "idex=noprobe" kernel parameter (take 2)
ide: remove needless hwif->irq check from ide_hwif_configure()
ide: init hwif->{io_ports,irq} explicitly in legacy VLB host drivers
ide: limit legacy VLB host drivers to alpha, x86 and mips
cmd640: init hwif->{io_ports,irq} explicitly
cmd640: cleanup setup_device_ptrs()
ide: add ide-4drives host driver (take 3)
ide: remove ppc ifdef from init_ide_data()
ide: remove ide_default_io_ctl() macro
ide: remove CONFIG_IDE_ARCH_OBSOLETE_INIT
ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS (take 2)
ppc/pmac: remove no longer needed IDE quirk
ppc: don't include <linux/ide.h>
ppc: remove ppc_ide_md
ppc/pplus: remove ppc_ide_md.ide_init_hwif hook
ppc/sandpoint: remove ppc_ide_md hooks
ppc/lopec: remove ppc_ide_md hooks
ppc/mpc8xx: remove ppc_ide_md hooks
...
commit 07fe944e87d79f8d7e1b090913fe9f2ace78f41d
Merge: 8019aa946af5218bc4446c21e43cc19c9401ac68 636bdeaa1243327501edfd2a597ed7443eb4239a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:38:55 2008 -0700
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
dmaengine: ack to flags: make use of the unused bits in the 'ack' field
iop-adma: remove the workaround for missed interrupts on iop3xx
async_tx: kill ->device_dependency_added
async_tx: fix multiple dependency submission
fsldma: Split the MPC83xx event from MPC85xx and refine irq codes.
fsldma: Remove CONFIG_FSL_DMA_SELFTEST, keep fsl_dma_self_test() running always.
commit 8019aa946af5218bc4446c21e43cc19c9401ac68
Merge: 73e3e6481f56b3b5b618671a8d32b19a35f84316 48feb3c419508487becfb9ea3afcc54c3eac6d80
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:38:06 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (79 commits)
ata-acpi: don't call _GTF for disabled drive
sata_mv add temporary 3 second init delay for SiliconImage PMs
sata_mv remove redundant edma init code
sata_mv add basic port multiplier support
sata_mv fix SOC flags, enable NCQ on SOC
sata_mv disable hotplug for now
sata_mv cosmetics
sata_mv hardreset rework
[libata] improve Kconfig help text for new PMP, SFF options
libata: make EH fail gracefully if no reset method is available
libata: Be a bit more slack about early devices
libata: cable logic
libata: move link onlineness check out of softreset methods
libata: kill dead code paths in reset path
pata_scc: fix build breakage
libata: make PMP support optional
libata: implement PMP helpers
libata: separate PMP support code from core code
libata: make SFF support optional
libata: don't use ap->ioaddr in non-SFF drivers
...
commit 73e3e6481f56b3b5b618671a8d32b19a35f84316
Merge: 4adeaaf51ebcc3f629f5512b96aebb5089388bca 6993fc5bbc5d63ccd55985b39c34417e430e75e9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:37:41 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
clocksource: make clocksource watchdog cycle through online CPUs
Documentation: move timer related documentation to a single place
clockevents: optimise tick_nohz_stop_sched_tick() a bit
locking: remove unused double_spin_lock()
hrtimers: simplify lockdep handling
timers: simplify lockdep handling
posix-timers: fix shadowed variables
timer_list: add annotations to workqueue.c
hrtimer: use nanosleep specific restart_block fields
hrtimer: add nanosleep specific restart_block member
commit 4adeaaf51ebcc3f629f5512b96aebb5089388bca
Merge: 9732b6112343df2872518ec6701c8ef729310a05 15732a1cb5f9078d460a254449eb59391e531ffc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:37:19 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
jfs: replace __inline with inline
jfs: le*_add_cpu conversion
commit 9732b6112343df2872518ec6701c8ef729310a05
Merge: 9e9abecfc0ff3a9ad2ead954b37bbfcb863c775e 1a9a3e76dde191f82f7a8a66059dcbb4a9f63ff3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:37:01 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb:
kgdb: always use icache flush for sw breakpoints
kgdb: fix SMP NMI kgdb_handle_exception exit race
kgdb: documentation fixes
kgdb: allow static kgdbts boot configuration
kgdb: add documentation
kgdb: Kconfig fix
kgdb: add kgdb internal test suite
kgdb: fix several kgdb regressions
kgdb: kgdboc pl011 I/O module
kgdb: fix optional arch functions and probe_kernel_*
kgdb: add x86 HW breakpoints
kgdb: print breakpoint removed on exception
kgdb: clocksource watchdog
kgdb: fix NMI hangs
kgdb: fix kgdboc dynamic module configuration
kgdb: document parameters
x86: kgdb support
consoles: polling support, kgdboc
kgdb: core
uaccess: add probe_kernel_write()
commit 9e9abecfc0ff3a9ad2ead954b37bbfcb863c775e
Merge: d7bb545d86825e635cab33a1dd81ca0ad7b92887 77ad386e596c6b0930cc2e09e3cce485e3ee7f72
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:25:51 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (613 commits)
x86: standalone trampoline code
x86: move suspend wakeup code to C
x86: coding style fixes to arch/x86/kernel/acpi/sleep.c
x86: setup_trampoline() - fix section mismatch warning
x86: section mismatch fixes, #1
x86: fix paranoia about using BIOS quickboot mechanism.
x86: print out buggy mptable
x86: use cpu_online()
x86: use cpumask_of_cpu()
x86: remove unnecessary tmp local variable
x86: remove unnecessary memset()
x86: use ioapic_read_entry() and ioapic_write_entry()
x86: avoid redundant loop in io_apic_level_ack_pending()
x86: remove superfluous initialisation in boot code.
x86: merge mpparse_{32,64}.c
x86: unify mp_register_gsi
x86: unify mp_config_acpi_legacy_irqs
x86: unify mp_register_ioapic
x86: unify uniq_io_apic_id
x86: unify smp_scan_config
...
commit d7bb545d86825e635cab33a1dd81ca0ad7b92887
Merge: 75e98b34155264d943aa53edce465e87f3ccbadf 2342e51ba2b52a7f5b78227e6faa4603ed3632a0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:25:29 2008 -0700
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Remove DEBUG_SEMAPHORE from Kconfig
Improve semaphore documentation
Simplify semaphore implementation
Add down_timeout and change ACPI to use it
Introduce down_killable()
Generic semaphore implementation
Add semaphore.h to kernel_lock.c
Fix quota.h includes
commit 75e98b34155264d943aa53edce465e87f3ccbadf
Merge: 30bc94566e396b432b72e2f3518e19225dc2672d 0a22ab92f51478796d5f3997f4f5922409c98b10
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:20:06 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (104 commits)
IB/iser: Don't change itt endianness
IB/mlx4: Update module version and release date
IPoIB: Handle case when P_Key is deleted and re-added at same index
IB/iser: Release connection resources on RDMA_CM_EVENT_DEVICE_REMOVAL event
IB/mlx4: Fix incorrect comment
IB/mlx4: Fix race when detaching a QP from a multicast group
IB/ehca: Support all ibv_devinfo values in query_device() and query_port()
RDMA/nes: Free IRQ before killing tasklet
IB/mthca: Update module version and release date
IB/mlx4: Update QP state if query QP succeeds
IB/mthca: Update QP state if query QP succeeds
RDMA/amso1100: Add check for NULL reply_msg in c2_intr()
IB/mlx4: Add support for resizing CQs
IB/mlx4: Add support for modifying CQ moderation parameters
IPoIB: Support modifying IPoIB CQ event moderation
IB/core: Add support for modify CQ
IPoIB: Add basic ethtool support
mlx4_core: Increase max number of QPs to 128K
RDMA/amso1100: Add support for "send with invalidate" work requests
IB/core: Add support for "send with invalidate" work requests
...
commit 30bc94566e396b432b72e2f3518e19225dc2672d
Merge: 4cba84b5d61af81f1f329f4d05170427a9819c39 5f46ce14bd432cf52bf91079270af164ca48f821
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:19:40 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
security: enhance DEFAULT_MMAP_MIN_ADDR description
SELinux: add netport.[ch]
SELinux: Add network port SID cache
SELinux: turn mount options strings into defines
selinux/ss/services.c should #include <linux/selinux.h>
selinux: introduce permissive types
selinux: remove ptrace_sid
SELinux: requesting no permissions in avc_has_perm_noaudit is a BUG()
security: code cleanup
security: replace remaining __FUNCTION__ occurrences
SELinux: create new open permission
selinux: selinux/netlabel.c should #include "netlabel.h"
SELinux: unify printk messages
SELinux: remove unused backpointers from security objects
SELinux: Correct the NetLabel locking for the sk_security_struct
commit 4cba84b5d61af81f1f329f4d05170427a9819c39
Merge: 7d939fbdfee49e5c06bd27214d25f726fb87a25a ca68305bf3c76c4a7cd1c77d5423219f39164df8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:19:15 2008 -0700
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (36 commits)
[S390] Remove code duplication from monreader / dcssblk.
[S390] kernel: show last breaking-event-address on oops
[S390] lowcore: Change type of lowcores softirq_pending to __u32.
[S390] zcrypt: Comments and kernel-doc cleanup
[S390] uaccess: Always access the correct address space.
[S390] Fix a lot of sparse warnings.
[S390] Convert s390 to GENERIC_CLOCKEVENTS.
[S390] genirq/clockevents: move irq affinity prototypes/inlines to interrupt.h
[S390] Convert monitor calls to function calls.
[S390] qdio (new feature): enhancing info-retrieval from QDIO-adapters
[S390] replace remaining __FUNCTION__ occurrences
[S390] remove redundant display of free swap space in show_mem()
[S390] qdio: remove outdated developerworks link.
[S390] Add debug_register_mode() function to debug feature API
[S390] crypto: use more descriptive function names for init/exit routines.
[S390] switch sched_clock to store-clock-extended.
[S390] zcrypt: add support for large random numbers
[S390] hw_random: allow rng_dev_read() to return hardware errors.
[S390] Vertical cpu management.
[S390] cpu topology support for s390.
...
commit 7d939fbdfee49e5c06bd27214d25f726fb87a25a
Merge: 18c98b65279c00c3c983a4525161207f1aa6a04b 0f389ec63077521166f071e1e970aed36147fd45
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Apr 18 08:19:00 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: No need for per node slab counters if !SLUB_DEBUG
slub: Move map/flag clearing to __free_slab
slub: Fixes to per cpu stat output in sysfs
slub: Deal with config variable dependencies
slub: Reduce #ifdef ZONE_DMA by moving kmalloc_caches_dma near dma logic
slub: Initialize per-cpu stats
commit 18c98b65279c00c3c983a4525161207f1aa6a04b
Author: Roland McGrath <roland at redhat.com>
Date: Thu Apr 17 18:44:38 2008 -0700
ptrace_signal subroutine
This breaks out the ptrace handling from get_signal_to_deliver into a
new subroutine. The actual code there doesn't change, and it gets
inlined into nearly identical compiled code. This makes the function
substantially shorter and thus easier to read, and it nicely isolates
the ptrace magic.
Signed-off-by: Roland McGrath <roland at redhat.com>
Acked-by: Kyle McMartin <kyle at mcmartin.ca>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0e04388f0189fa1f6812a8e1cb6172136eada87e
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Thu Apr 17 11:37:15 2008 +0800
cgroup: fix a race condition in manipulating tsk->cg_list
When I ran a test program to fork mass processes and at the same time
'cat /cgroup/tasks', I got the following oops:
------------[ cut here ]------------
kernel BUG at lib/list_debug.c:72!
invalid opcode: 0000 [#1] SMP
Pid: 4178, comm: a.out Not tainted (2.6.25-rc9 #72)
...
Call Trace:
[<c044a5f9>] ? cgroup_exit+0x55/0x94
[<c0427acf>] ? do_exit+0x217/0x5ba
[<c0427ed7>] ? do_group_exit+0.65/0x7c
[<c0427efd>] ? sys_exit_group+0xf/0x11
[<c0404842>] ? syscall_call+0x7/0xb
[<c05e0000>] ? init_cyrix+0x2fa/0x479
...
EIP: [<c04df671>] list_del+0x35/0x53 SS:ESP 0068:ebc7df4
---[ end trace caffb7332252612b ]---
Fixing recursive fault but reboot is needed!
After digging into the code and debugging, I finlly found out a race
situation:
do_exit()
->cgroup_exit()
->if (!list_empty(&tsk->cg_list))
list_del(&tsk->cg_list);
cgroup_iter_start()
->cgroup_enable_task_cg_list()
->list_add(&tsk->cg_list, ..);
In this case the list won't be deleted though the process has exited.
We got two bug reports in the past, which seem to be the same bug as
this one:
http://lkml.org/lkml/2008/3/5/332
http://lkml.org/lkml/2007/10/17/224
Actually sometimes I got oops on list_del, sometimes oops on list_add.
And I can change my test program a bit to trigger other oops.
The patch has been tested both on x86_32 and x86_64.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Acked-by: Paul Menage <menage at google.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: stable at kernel.org
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5f46ce14bd432cf52bf91079270af164ca48f821
Author: maximilian attems <max at stro.at>
Date: Wed Apr 16 19:36:36 2008 +0200
security: enhance DEFAULT_MMAP_MIN_ADDR description
Got burned by setting the proposed default of 65536
across all Debian archs.
Thus proposing to be more specific on which archs you may
set this. Also propose a value for arm and friends that
doesn't break sshd.
Reword to mention working archs ia64 and ppc64 too.
Signed-off-by: maximilian attems <max at stro.at>
Cc: Martin Michlmayr <tbm at cyrius.com>
Cc: Gordon Farquharson <gordonfarquharson at gmail.com>
Acked-by: Eric Paris <eparis at redhat.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 27cc2a6e572e1a86a08a02918517558f175f6974
Author: James Morris <jmorris at namei.org>
Date: Mon Apr 14 15:09:53 2008 +1000
SELinux: add netport.[ch]
Thank you, git.
Signed-off-by: James Morris <jmorris at namei.org>
commit 3e11217263d0521e212cb8a017fbc2a1514db78f
Author: Paul Moore <paul.moore at hp.com>
Date: Thu Apr 10 10:48:14 2008 -0400
SELinux: Add network port SID cache
Much like we added a network node cache, this patch adds a network port
cache. The design is taken almost completely from the network node cache
which in turn was taken from the network interface cache. The basic idea is
to cache entries in a hash table based on protocol/port information. The
hash function only takes the port number into account since the number of
different protocols in use at any one time is expected to be relatively
small.
Signed-off-by: Paul Moore <paul.moore at hp.com>
Acked-by: Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: James Morris <jmorris at namei.org>
commit 832cbd9aa1293cba57d06571f5fc8f0917c672af
Author: Eric Paris <eparis at redhat.com>
Date: Tue Apr 1 13:24:09 2008 -0400
SELinux: turn mount options strings into defines
Convert the strings used for mount options into #defines rather than
retyping the string throughout the SELinux code.
Signed-off-by: Eric Paris <eparis at redhat.com>
Acked-by: Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: James Morris <jmorris at namei.org>
commit 0e55a004b58847c53e48d846b9a4570b1587c382
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Mar 31 01:54:02 2008 +0300
selinux/ss/services.c should #include <linux/selinux.h>
Every file should include the headers containing the externs for its global
code.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: James Morris <jmorris at namei.org>
commit 64dbf07474d011540ca479a2e87fe998f570d6e3
Author: Eric Paris <eparis at redhat.com>
Date: Mon Mar 31 12:17:33 2008 +1100
selinux: introduce permissive types
Introduce the concept of a permissive type. A new ebitmap is introduced to
the policy database which indicates if a given type has the permissive bit
set or not. This bit is tested for the scontext of any denial. The bit is
meaningless on types which only appear as the target of a decision and never
the source. A domain running with a permissive type will be allowed to
perform any action similarly to when the system is globally set permissive.
Signed-off-by: Eric Paris <eparis at redhat.com>
Acked-by: Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: James Morris <jmorris at namei.org>
commit 0356357c5158c71d4cbf20196b2f784435dd916c
Author: Roland McGrath <roland at redhat.com>
Date: Wed Mar 26 15:46:39 2008 -0700
selinux: remove ptrace_sid
This changes checks related to ptrace to get rid of the ptrace_sid tracking.
It's good to disentangle the security model from the ptrace implementation
internals. It's sufficient to check against the SID of the ptracer at the
time a tracee attempts a transition.
Signed-off-by: Roland McGrath <roland at redhat.com>
Acked-by: Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: James Morris <jmorris at namei.org>
commit eda4f69ca5a532b425db5a6c2c6bc50717b9b5fe
Author: Eric Paris <eparis at redhat.com>
Date: Tue Mar 11 14:19:34 2008 -0400
SELinux: requesting no permissions in avc_has_perm_noaudit is a BUG()
This patch turns the case where we have a call into avc_has_perm with no
requested permissions into a BUG_ON. All callers to this should be in
the kernel and thus should be a function we need to fix if we ever hit
this. The /selinux/access permission checking it done directly in the
security server and not through the avc, so those requests which we
cannot control from userspace should not be able to trigger this BUG_ON.
Signed-off-by: Eric Paris <eparis at redhat.com>
Acked-by: Stephen D. Smalley <sds at tycho.nsa.gov>
Signed-off-by: James Morris <jmorris at namei.org>
commit f0115e6c8980ea9125a17858291c90ecd990bc1c
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu Mar 6 10:05:08 2008 +1100
security: code cleanup
ERROR: "(foo*)" should be "(foo *)"
#168: FILE: security/selinux/hooks.c:2656:
+ "%s, rc=%d\n", __func__, (char*)value, -rc);
total: 1 errors, 0 warnings, 195 lines checked
./patches/security-replace-remaining-__function__-occurences.patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Please run checkpatch prior to sending patches
Cc: Harvey Harrison <harvey.harrison at gmail.com>
Cc: James Morris <jmorris at namei.org>
Cc: Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: James Morris <jmorris at namei.org>
commit dd6f953adb5c4deb9cd7b6a5054e7d5eafe4ed71
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Mar 6 10:03:59 2008 +1100
security: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: James Morris <jmorris at namei.org>
Cc: Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: James Morris <jmorris at namei.org>
commit b0c636b99997c8594da6a46e166ce4fcf6956fda
Author: Eric Paris <eparis at redhat.com>
Date: Thu Feb 28 12:58:40 2008 -0500
SELinux: create new open permission
Adds a new open permission inside SELinux when 'opening' a file. The idea
is that opening a file and reading/writing to that file are not the same
thing. Its different if a program had its stdout redirected to /tmp/output
than if the program tried to directly open /tmp/output. This should allow
policy writers to more liberally give read/write permissions across the
policy while still blocking many design and programing flaws SELinux is so
good at catching today.
Signed-off-by: Eric Paris <eparis at redhat.com>
Acked-by: Stephen Smalley <sds at tycho.nsa.gov>
Reviewed-by: Paul Moore <paul.moore at hp.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit d4ee4231a3a8731576ef0e0a7e1225e4fde1e659
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Feb 27 23:20:42 2008 +0200
selinux: selinux/netlabel.c should #include "netlabel.h"
Every file should include the headers containing the externs for its
global code.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Paul Moore <paul.moore at hp.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 454d972c24e6efce3d7b07a97f1ad18b14845de9
Author: James Morris <jmorris at namei.org>
Date: Tue Feb 26 20:42:02 2008 +1100
SELinux: unify printk messages
Replace "security:" prefixes in printk messages with "SELinux"
to help users identify the source of the messages. Also fix a
couple of minor formatting issues.
Signed-off-by: James Morris <jmorris at namei.org>
commit 98e9894650455426f67c2157db4f39bd14fac2f6
Author: James Morris <jmorris at namei.org>
Date: Tue Feb 26 09:52:58 2008 +1100
SELinux: remove unused backpointers from security objects
Remove unused backpoiters from security objects.
Signed-off-by: James Morris <jmorris at namei.org>
commit f74af6e816c940c678c235d49486fe40d7e49ce9
Author: Paul Moore <paul.moore at hp.com>
Date: Mon Feb 25 11:40:33 2008 -0500
SELinux: Correct the NetLabel locking for the sk_security_struct
The RCU/spinlock locking approach for the nlbl_state in the sk_security_struct
was almost certainly overkill. This patch removes both the RCU and spinlock
locking, relying on the existing socket locks to handle the case of multiple
writers. This change also makes several code reductions possible.
Less locking, less code - it's a Good Thing.
Signed-off-by: Paul Moore <paul.moore at hp.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit 3c051235a7f115c34e675c9cf55820bd3435f860
Author: David S. Miller <davem at davemloft.net>
Date: Fri Apr 18 01:46:19 2008 -0700
[IPV6]: Fix dangling references on error in fib6_add().
Fixes bugzilla #8895
If a super-tree leaf has 'rt' assigned to it and we
get an error from fib6_add_rt2node(), we'll leave
a reference to 'rt' in pn->leaf and then do an
unconditional dst_free().
We should prune such references.
Based upon a report by Vincent Perrier.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 62be1f71677c53d5e51223807a06ac9052f49b0f
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Thu Apr 17 17:25:37 2008 +0200
[GFS2] fix assertion in log_refund()
since unsigned, unused >= 0 is always true.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
commit 1e42198609d73ed1a9adcba2af275c24c2678420
Merge: 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a 4b119e21d0c66c22e8ca03df05d9de623d0eb50f
Author: David S. Miller <davem at davemloft.net>
Date: Thu Apr 17 23:56:30 2008 -0700
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit 9f264be6101c42cb9e471c58322fb83a5cde1461
Author: Paul Mackerras <paulus at samba.org>
Date: Fri Apr 18 14:26:08 2008 +1000
[POWERPC] Optimize fls64() on 64-bit processors
64-bit powerpc processors can find the leftmost 1 bit in a 64-bit
doubleword in one instruction, so use that rather than using the
generic fls64(), which does two 32-bit fls() calls.
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a
Author: Jesper Juhl <jesper.juhl at gmail.com>
Date: Thu Apr 17 23:22:54 2008 -0700
[NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
dev_get_by_index() may return NULL if nothing is found. In
net/netlabel/netlabel_unlabeled.c::netlbl_unlabel_staticlist_gen() the
function is called, but the return value is never checked. If it returns
NULL then we'll deref a NULL pointer on the very next line.
I checked the callers, and I don't think this can actually happen today,
but code changes over time and in the future it might happen and it does
no harm to be defensive and check for the failure, so that if/when it
happens we'll fail gracefully instead of crashing.
Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
Acked-by: Paul Moore <paul.moore at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f5ba2d32170679eb9b7c251ac3d9687916a41c18
Author: Patrick McHardy <kaber at trash.net>
Date: Thu Apr 17 23:19:55 2008 -0700
[PKT_SCHED]: Fix datalen check in tcf_simp_init().
datalen is unsigned so it can never be less than zero,
but that's ok because the attribute passed to nla_len()
has been validated and therefore a negative return
value is impossible.
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 53083773dcbd3c80477e2ace143e361e1e806745
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu Apr 17 23:18:15 2008 -0700
[INET]: Uninline the __inet_inherit_port call.
This deblats ~200 bytes when ipv6 and dccp are 'y'.
Besides, this will ease compilation issues for patches
I'm working on to make inet hash tables more scalable
wrt net namespaces.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e56d8b8a2ee5fb7f63ceba58e1c0fb3c844888a4
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu Apr 17 23:17:34 2008 -0700
[INET]: Drop the inet_inherit_port() call.
As I can see from the code, two places (tcp_v6_syn_recv_sock and
dccp_v6_request_recv_sock) that call this one already run with
BHs disabled, so it's safe to call __inet_inherit_port there.
Besides (in case I missed smth with code review) the calltrace
tcp_v6_syn_recv_sock
`- tcp_v4_syn_recv_sock
`- __inet_inherit_port
and the similar for DCCP are valid, but assumes BHs to be disabled.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 945feb174b14e7098cc7ecf0cf4768d35bc52f9c
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Thu Apr 17 14:35:01 2008 +1000
[POWERPC] irqtrace support for 64-bit powerpc
This adds the low level irq tracing hooks to the powerpc architecture
needed to enable full lockdep functionality.
This is partly based on Johannes Berg's initial version. I removed
the asm trampoline that isn't needed (thus improving performance) and
modified all sorts of bits and pieces, reworking most of the assembly,
etc...
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit fd3e0bbc6052ca9747a5332b382584ece83aab6d
Author: Christoph Hellwig <hch at lst.de>
Date: Thu Apr 17 14:35:00 2008 +1000
[POWERPC] Stacktrace support for lockdep
This adds stacktrace support for powerpc, which will be needed for
lockdep.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit ec2b36b9f23cfbbe94d89724b796b44fd57d5221
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Thu Apr 17 14:34:59 2008 +1000
[POWERPC] Move stackframe definitions to common header
This moves various definitions used all over the place to parse stack
frames to ptrace.h so only one definition is needed.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f4ac7b5eb79ef15819c966b1f6b84bf443949123
Author: Benjamin Herrenschmidt <benh at ozlabs.org>
Date: Wed Apr 9 17:21:36 2008 +1000
[POWERPC] Fix device-tree locking vs. interrupts
Lockdep found out that we can occasionally take the device-tree
lock for reading from softirq time (from rtas_token called
by the rtas real time clock code called by the NTP code),
while we take it occasionally for writing without masking
interrupts. The combination of those two can thus deadlock.
While some of those cases of interrupt read lock could be fixed
(such as caching the RTAS tokens) I figured that taking the
lock for writing is so rare (device-tree modification) that we
may as well penalize that case and allow reading from interrupts.
Thus, this turns all the writers to take the lock with irqs
masked to avoid the situation.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f13f4ca8036516ca1b99a41f95f7dea7e4dce104
Author: Trent Piepho <tpiepho at freescale.com>
Date: Wed Apr 9 12:19:32 2008 +1000
[POWERPC] Make pci_bus_to_host()'s struct pci_bus * argument const
A) It's not modified and so it can be made const. const is good.
B) If one has a function that was given a const pci_bus pointer and you
want to get a pointer to its pci_controller, you'll get a warning from gcc
when you use pci_bus_to_host(). This is the right way to stop that
warning.
Signed-off-by: Trent Piepho <tpiepho at freescale.com>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 49a99978849e86541c3bb789788f7f874a841935
Author: Olof Johansson <olof at lixom.net>
Date: Tue Apr 8 01:33:07 2008 +1000
[POWERPC] Remove unused __max_memory variable
Remove the __max_memory variable, as it is not referenced anywhere
in the tree besides some code in arch/ppc.
Signed-off-by: Olof Johansson <olof at lixom.net>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 1af9fa8994a049359c2bb9093a2f33775e28e7ea
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Tue Apr 1 17:42:27 2008 +1100
[POWERPC] Simplify xics direct/lpar irq_host setup
The xics code currently has a direct and lpar variant of
xics_host_map, the only difference being which irq_chip they use. If
we remember which irq_chip we're using we can combine these two
routines. That also allows us to have a single irq_host_ops instead
of two.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f01567d6d5688f8f613cd23da31aaf02d9538525
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Tue Apr 1 17:42:26 2008 +1100
[POWERPC] Use pseries_setup_i8259_cascade() in pseries_mpic_init_IRQ()
pseries_mpic_init_IRQ() implements the same logic as the xics code did to
find the i8259 cascade irq. Now that we've pulled that logic out into
pseries_setup_i8259_cascade() we can use it in the mpic code.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 30d6ad251b5dcf497a266c4dc7d38fcde7185422
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Tue Apr 1 17:42:25 2008 +1100
[POWERPC] Turn xics_setup_8259_cascade() into a generic pseries_setup_i8259_cascade()
Remove the xics references from xics_setup_8259_cascade(), and merge the
good bits from the almost identical logic in pseries_mpic_init_IRQ().
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 032ace7e17f141a5cf350e4ec0c5bf4f5faf1c49
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Tue Apr 1 17:42:25 2008 +1100
[POWERPC] Move xics_setup_8259_cascade() into platforms/pseries/setup.c
The code in xics.c to setup the i8259 cascaded irq handler is not really
xics specific, so move it into setup.c - we will clean this up further in
a subsequent patch.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 47b9d9bddf1877187d965f4dd4d7d454d8cdb50c
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Wed Apr 16 15:55:08 2008 +0200
[POWERPC] Use asm-generic/bitops/find.h in bitops.h
Powerpc and ppc have some code in their bitops.h that is exactly the
same as asm-generic/bitops/find.h. Include this header instead of the
private implementation.
Signed-off-by: Alexander van Heukelum <heukelum at fastmail.fm>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 11a55f2274bf0d719e4dd05f4ac5e89a15740211
Merge: 858c52d15f186e055dc33a1872f5b45a66d42296 1a9ebc0cd2b3bb4450834e564722630fbc40611b
Author: Paul Mackerras <paulus at samba.org>
Date: Fri Apr 18 13:34:30 2008 +1000
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
commit 858c52d15f186e055dc33a1872f5b45a66d42296
Merge: 771168494719b90621ac61f9ae68c4af494e418f ada397e93d6002021f5bf4ba060aa4ecd5dea3e5
Author: Paul Mackerras <paulus at samba.org>
Date: Fri Apr 18 13:33:43 2008 +1000
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs
commit 65e67f5165c8a156b34ee7adf65d5ed3b16a910d
Author: Lachlan McIlroy <lachlan at redback.melbourne.sgi.com>
Date: Fri Apr 18 12:59:45 2008 +1000
[XFS] Fix merge failure
commit 3b2816be271b8b364294a5b48721a3e68af46cfa
Author: Lachlan McIlroy <lachlan at redback.melbourne.sgi.com>
Date: Fri Apr 18 12:43:35 2008 +1000
[XFS] The forward declarations for the xfs_ioctl() helpers and the
associated comment about gcc behavior really aren't needed; all of these
functions are marked STATIC which includes noinline, and the stack usage
won't be a problem.
This effectively just removes the forward declarations and moves
xfs_ioctl() back to the end of the file.
SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:30534a
Signed-off-by: Eric Sandeen <sandeen at sandeen.net>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit f6e9f28865552bd9d79a9df93cf120436b073223
Author: Josef Sipek <jeffpc at josefsipek.net>
Date: Fri Apr 11 17:11:02 2008 +1000
[XFS] Update XFS documentation for noikeep/ikeep.
Mention how DMAPI affects default for noikeep.
Slightly modified since Josef's patch was based on
an old xfs.txt prior to Dave's (dgc) checkin which
missed going to oss.
Signed-off-by: Josef Sipek <jeffpc at josefsipek.net>
Signed-off-by: Tim Shimmin <tes at sgi.com>
commit 033bfb1a65242e0d60e6fc991cd9b3553053d334
Author: David Chinner <dgc at sgi.com>
Date: Fri Apr 11 17:05:49 2008 +1000
[XFS] Update XFS Documentation for ikeep and ihashsize
Update xfs docs for:
* In memory inode hashes has been removed.
* noikeep is now the default.
SGI-PV: 969561
SGI-Modid: 2.6.x-xfs-melb:linux:29481b
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Tim Shimmin <tes at sgi.com>
commit e687330b5ed1ea899fdaf0dea50aba196b6e019a
Author: Donald Douwsma <donaldd at sgi.com>
Date: Thu Apr 17 16:50:28 2008 +1000
[XFS] Remove unused HAVE_SPLICE macro.
HAVE_SPLICE was part of the infrastructure for building 2.4 and 2.6
kernels out of the same tree. Now we don't build 2.4 kernels this
SGI-PV: 971046
SGI-Modid: xfs-linux-melb:xfs-kern:30878a
Signed-off-by: Donald Douwsma <donaldd at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit f7d3c34788696f5ba9ac9fa414ad80e2a91d4b2e
Author: Eric Sandeen <sandeen at sandeen.net>
Date: Thu Apr 17 16:50:22 2008 +1000
[XFS] Remove CONFIG_XFS_SECURITY.
There is no point to the CONFIG_XFS_SECURITY option; it disables the
ability to set security attributes at runtime, but it does not actually
slim down or remove any code for runtime. Just remove it and always allow
security attributes to be set.
SGI-PV: 980310
SGI-Modid: xfs-linux-melb:xfs-kern:30877a
Signed-off-by: Eric Sandeen <sandeen at sandeen.net>
Signed-off-by: Tim Shimmin <tes at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 6d1337b29bf09a97682d39db36ac2d0dfc6659c0
Author: Tim Shimmin <tes at sgi.com>
Date: Thu Apr 17 16:50:16 2008 +1000
[XFS] xfs_bmap_compute_maxlevels should be based on di_forkoff
Fix up xfs_bmap_compute_maxlevels() to account for the case when we go
from using attr2 to using attr1. In that case attr1 will no longer
necessarily be at m_attr_offset>>3, but could be at a different value for
di_forkoff. Therefore, we return the worst case scenario using MINDBTPTRS
and MINABTPTRS, as this function is used for determining the maximum log
space.
SGI-PV: 979606
SGI-Modid: xfs-linux-melb:xfs-kern:30862a
Signed-off-by: Tim Shimmin <tes at sgi.com>
Signed-off-by: Eric Sandeen <sandeen at sandeen.net>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit cb49dbb130e17a6f9af4cb4714cf6976cf09afdf
Author: Eric Sandeen <sandeen at sandeen.net>
Date: Thu Apr 17 16:50:09 2008 +1000
[XFS] Always use di_forkoff when checking for attr space.
In the case where we mount a filesystem which was previously using the
attr2 format as attr1, returning the default mp->m_attroffset instead of
the per-inode di_forkoff for inline attribute fit calculations, may result
in corruption, if for example, the data fork is already taking more space
than the default fork offset and we try to add an extended attribute. Fix
tested by xfstests/186.
SGI-PV: 979606
SGI-Modid: xfs-linux-melb:xfs-kern:30861a
Signed-off-by: Eric Sandeen <sandeen at sandeen.net>
Signed-off-by: Tim Shimmin <tes at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit f6485057c5cfbc84e5eff639ddea1ce0d668607b
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 17 16:50:04 2008 +1000
[XFS] Ensure the inode is joined in xfs_itruncate_finish
On success, we still need to join the inode to the current transaction in
xfs_itruncate_finish(). Fixes regression from error handling changes.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30845a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 7e20694d91f817f8e9f62404aca793ae0df4d98a
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 17 16:49:55 2008 +1000
[XFS] Remove periodic logging of in-core superblock counters.
xfssyncd triggers the logging of superblock counters every 30s if the
filesystem is made with lazy-count=1. This will prevent disks from idling
and spinning down as there will be a log write every 30s. With the way
counter recovery works for lazy-count=1, this code is unnecessary and
provides no real benefit, so just remove it.
SGI-PV: 980145
SGI-Modid: xfs-linux-melb:xfs-kern:30840a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Barry Naujok <bnaujok at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit e6430037e9fd0b3d02ceaf5ab99bfe3ccb763be7
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 17 16:49:49 2008 +1000
[XFS] fix logic error in xfs_alloc_ag_vextent_near()
Fix a logic error in xfs_alloc_ag_vextent_near(). This is a regression
introduced by the error handling changes.
SGI-PV: 890084
SGI-Modid: xfs-linux-melb:xfs-kern:30838a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Barry Naujok <bnaujok at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit d4055947bd0913864f4d8ac96bf1197338071622
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 17 16:49:35 2008 +1000
[XFS] Don't error out on good I/Os.
xfsbdstrat() made all I/Os error out, good or bad. Fix it.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30836a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Donald Douwsma <donaldd at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 1bb7d6b5a82f1d9487fd44415484a368f7c87bed
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:24:38 2008 +1000
[XFS] Catch log unmount failures.
Unmounting the log can fail. unlikely, but it can. Catch all the error
conditions an make sure it's propagated upwards.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30833a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit b911ca0472c3762d2bafc4d21e432a9056844064
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:24:30 2008 +1000
[XFS] Sanitise xfs_log_force error checking.
xfs_log_force() is declared to return an error, but we almost never check
it. We don't need to check it in most cases; if there's a log I/O error
then we'll be shutting down the filesystem anyway and that means we'll
catch the error somewhere else.
However, on certain calls we should be returning an error - sync
transactions, fsync, sync writes, etc. so this isn't a pure black and
white distinction. Hence make xfs_log_force() a void function that issues
a warning to the syslog on error, and call _xfs_log_force() in all the
places where we actually care about the error status returned.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30832a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 234f56aca20a4f66b6ba3d3bf2787634dd9e0999
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:24:24 2008 +1000
[XFS] Check for errors when changing buffer pointers.
xfs_buf_associate_memory() can fail, but the return is never checked.
Propagate the error through XFS_BUF_SET_PTR() so that failures are
detected.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30831a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 78e9da77f1bf265fe750b9223ec15707473fb6e8
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:24:17 2008 +1000
[XFS] Don't allow silent errors in xfs_inactive().
xfs_inactive() fails to report errors when committing the inactive
transaction. Hence we can get silent failures either finishing off the
truncation or committing the transaction. Even if we get errors, we need
to continue, so simply warn loudly to the system if we get errors here.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30830a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 64bfe1bfae833e89ed77f72c61ded19f4b1976f8
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:24:10 2008 +1000
[XFS] Catch errors from xfs_imap().
Catch errors from xfs_imap() in log recovery when we might be trying to
map an invalid inode number due to a corrupted log.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30829a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 7b07339048f7b020575706b492c004b5664b67ab
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:24:04 2008 +1000
[XFS] xfs_bulkstat_one_dinode() never returns an error.
Mark it void.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30828a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit e4ac967b117c5780760abbd9ae996210c31cb398
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:23:58 2008 +1000
[XFS] xfs_iflush_fork() never returns an error.
xfs_iflush_fork() never returns an error. Mark it void and clean up the
code calling it that checks for errors.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30827a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit cc88466f3f67bb16fc91b0b974e51c2a43a9e597
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:23:52 2008 +1000
[XFS] Catch unwritten extent conversion errors.
On unwritten I/O completion, we fail to propagate an error when converting
the extent to a written extent. This means that the I/O silently fails.
propagate the error onto the ioend so that the inode is marked with an
error appropriately.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30826a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 958d4ec606d4af590f86a601a238613f21e878ee
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:23:46 2008 +1000
[XFS] xfs_bdwrite() does not return errors.
xfs_bdwrite() cannot return an error; it only queues buffers to the
delayed write list and as such never encounters anything that can fail.
Mark it void.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30825a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit db7a19f2c89d99b66874a7e0c0dc681ff1f37b4e
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:22:24 2008 +1000
[XFS] Ensure xfs_bawrite() errors are checked.
xfs_bawrite() can return immediate error status on async writes. Unlike
xfsbdstrat() we don't ever check the error on the buffer after the call,
so we currently do not catch errors at all here. Ensure we catch and
propagate or warn to the syslog about up-front async write errors.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30824a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit d64e31a2f53cdcb2f95b782196faacb0995ca0c0
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:22:17 2008 +1000
[XFS] Ensure errors from xfs_bdstrat() are correctly checked.
xfsbdstrat() is declared to return an error. That is never checked because
the error is propagated by the xfs_buf_t that is passed through the
function.
Mark xfsbdstrat() as returning void and comment the prototype on the
methods needed for error checking.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30823a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 556b8b166c9514b5f940047a41dad8fe8cd9a778
Author: Barry Naujok <bnaujok at sgi.com>
Date: Thu Apr 10 12:22:07 2008 +1000
[XFS] remove bhv_vname_t and xfs_rename code
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30804a
Signed-off-by: Barry Naujok <bnaujok at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 7c9ef85c5672ae316aafd7bbe0bbadebe90301e6
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:21:59 2008 +1000
[XFS] Catch errors returned from xfs_bmap_last_offset().
xfs_bmap_last_offset() can fail and return an error.
xfs_iomap_write_allocate() fails to detect and propagate the error.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30802a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit fc6149d8d9634814cdcd9283b8f2efd3359181df
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:21:53 2008 +1000
[XFS] Check for xfs_free_extent() failing.
xfs_free_extent() can fail, but log recovery never bothers to check if it
successfully free the extent it was supposed to. This could lead to silent
corruption during log recovery. Abort log recovery if we fail to free an
extent.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30801a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit d87dd6360dce86cad9099aed74f14b4dd0143301
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:21:46 2008 +1000
[XFS] Warn if errors come from block_truncate_page().
block_truncate_page() can return errors that we currently ignore and
silently discard. We should not ever get errors reported here - an error
indicates a bug somewhere else. Hence catch the error and issue a stack
dump to the syslog because we cannot propagate the error any further up
the call chain.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30800a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit c2b1cba6833da77b1b478ac144f9cf5144d276ec
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:21:40 2008 +1000
[XFS] xfs_bmap_adjacent() never returns an error.
Mark it void.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30798a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 12375c82375ec39ec948a3ad62e5e77533515e83
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:21:32 2008 +1000
[XFS] Make xfs_alloc_compute_aligned() void.
xfs_alloc_compute_aligned() returns a value based on a comparison of the
computed extent length and the minimum length allowed. This is only used
by some callers - the other four return parameters are used more often.
Hence move the comparison to the code that actually needs to do it and
make xfs_alloc_compute_aligned() a void function.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30797a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit f4586e40613a9f8bb9f7f9c8a796062a9ab1614c
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:21:25 2008 +1000
[XFS] Clean up xfs_alloc_search_busy() return values.
xfs_alloc_search_busy() returns an index into the busy array if the extent
was found in the array. This is never checked, and the
xfs_alloc_search_busy() does a log force to prevent reuse of the extent
before the free transaction hits the disk. Hence the return value is
useless. Declare the function void and remove the slot number from the
tracing as well.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30796a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit e5720eec0548c08943d759e39db0388d8fe59287
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:21:18 2008 +1000
[XFS] Propagate errors from xfs_trans_commit().
xfs_trans_commit() can return errors when there are problems in the
transaction subsystem. They are indicative that the entire transaction may
be incomplete, and hence the error should be propagated as there is a good
possibility that there is something fatally wrong in the filesystem. Catch
and propagate or warn about commit errors in the places where they are
currently ignored.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30795a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 3c1e2bbe5bcdcd435510a05eb121fa74b848e24f
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:21:11 2008 +1000
[XFS] Propagate xfs_trans_reserve() errors.
xfs_trans_reserve() reports errors that should not be ignored. For
example, a shutdown filesystem will report errors through
xfs_trans_reserve() to prevent further changes from being attempted on a
damaged filesystem. Catch and propagate all error conditions from
xfs_trans_reserve().
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30794a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 5ca1f261a08d5cff5f29eaa0887b59baae2ae7f7
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:21:04 2008 +1000
[XFS] Catch errors from xfs_acl_vremove().
Removing an ACL can return an error. Propagate it.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30793a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 0c928299676c8df2b00e75d5691cd4846e6c0868
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:20:58 2008 +1000
[XFS] Catch errors from xfs_acl_setmode().
Propagate the error status from xfs_acl_setmode() so that callers know if
the ACl was set correctly or not.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30792a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 88ab02085363b7c45935d66ab3e969b4fec9a20c
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:20:51 2008 +1000
[XFS] Propagate quota file truncation errors.
Truncating the quota files can silently fail. Ensure that truncation
errors are propagated to the callers.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30791a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit cb6edc26c386d2268dcf61bcdec02b6fb50b6ba2
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:20:45 2008 +1000
[XFS] Catch errors when turning off quotas.
When turning off quota, we need to write various transactions to the log
to ensure that they are cleanly removed in the case of a crash. We need to
check that the transactions hit the disk correctly. If we fail to write
the final quota off transaction, we are corrupt in memory and so the only
option is to shut the filesystem down at this point.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30790a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 31d5577b35d8397dea19f2ba7550e9225605a785
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:20:38 2008 +1000
[XFS] Catch errors resetting quota flags.
Warn to the syslog if we fail to reset the quota flags in the superblock
when a quota check fails.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30789a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 53aa7915d67b9d0f5986c9f08e76846fedc520d4
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:20:31 2008 +1000
[XFS] Clean up quotamount error handling.
xfs_qm_mount_quotas() returns an error status that is ignored. If we fail
to mount quotas, we continue with quota's turned off, which is all handled
inside xfs_qm_mount_quotas(). Mark it as void to indicate that errors need
not be returned to the callers.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30788a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 3c56836f92683cb871ebbf44c512069b0d48a08f
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:20:24 2008 +1000
[XFS] Check for dquot flush errors
xfs_qm_dqflush() can fail, but the return is not checked anywhere. Hence
we never know if we've failed to flush a dquot to disk. Propagate the
error and warn to the syslog if a flush ever fails.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30787a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 4b8879df8c21bed3efd1eb2da5d72501199aba29
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:20:17 2008 +1000
[XFS] Propagate xfs_qm_dqflush_all() errors.
xfs_qm_dqflush_all() can return flush errors. Ensure they are propagated
into the quotacheck code to determine if the quotacheck succeeded or not.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30786a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 5b1397385bf536cbdb60f3362f44079d15d5f5ee
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:20:10 2008 +1000
[XFS] xfs_qm_reset_dqcounts() does not return errors.
Declare it void.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30785a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 714082bc12b6c305f825411df02177efcb0085f1
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:20:03 2008 +1000
[XFS] Report errors from xfs_reserve_blocks().
xfs_reserve_blocks() can fail in interesting ways. In neither case is it a
fatal error, but the result can lead to sub-optimal behaviour. Warn to the
syslog if the call fails but otherwise continue.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30784a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 36fbe6e6bd5408b09341043dfece978b4a7a0f34
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:19:56 2008 +1000
[XFS] xfs_icsb_counter_disabled() never returns an error.
Mark it void.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30782a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit a414047fc97aea7db6237176ce00013117839cd5
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:19:47 2008 +1000
[XFS] Remove useless whitespace in function prototypes
Makes it simpler to annotate function prototypes with __must_check via sed
scripts.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30781a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 3c85c36cc2e87018d38fcd033f41bbdf1360c07a
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:19:40 2008 +1000
[XFS] xfs_quiesce_fs() never returns an error. Mark it void.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30780a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit b6ddc4e6fed9c6f4adb273c8b36e1731f90ec17e
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Apr 10 12:19:27 2008 +1000
[XFS] Don't validate symlink target component length
This target component validation is not POSIX conformant and it is not
done by any other Linux filesystem so remove it from XFS.
SGI-PV: 980080
SGI-Modid: xfs-linux-melb:xfs-kern:30776a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 34a622b2e1c8e11c8990184634f101c1aad42fec
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Apr 10 12:19:21 2008 +1000
[XFS] replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30775a
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 0225da1f35df46c67785eb08526995d7cdb4e3b0
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Apr 10 12:19:10 2008 +1000
[XFS] Replace __inline with inline
Remove the remaining uses of __inline in the XFS code base.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30774a
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 6b1d1a732f886936fe515d911b1a01d9cc50e179
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:19:02 2008 +1000
[XFS] Fix lock inversion in forced shutdown.
Recent changes to xlog_state_release_iclog() placed the grant_lock inside
the icloglock. forced unmount of the log does this the opposite way
around, but does not depend on the order for correct working. Fix the
inversion by changing the order locks are gained in
xfs_log_force_umount().
SGI-PV: 979661
SGI-Modid: xfs-linux-melb:xfs-kern:30773a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 4679b2d36d53ed508c956337972fbbea8db99a77
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:18:54 2008 +1000
[XFS] Reorganise xlog_t for better cacheline isolation of contention
To reduce contention on the log in large CPU count, separate out different
parts of the xlog_t structure onto different cachelines. Move each lock
onto a different cacheline along with all the members that are
accessed/modified while that lock is held.
Also, move the debugging code into debug code.
SGI-PV: 978729
SGI-Modid: xfs-linux-melb:xfs-kern:30772a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit eb01c9cd87c7a9998c2edf209721ea069e3e3652
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:18:46 2008 +1000
[XFS] Remove the xlog_ticket allocator
The ticket allocator is just a simple slab implementation internal to the
log. It requires the icloglock to be held when manipulating it and this
contributes to contention on that lock.
Just kill the entire allocator and use a memory zone instead. While there,
allow us to gracefully fail allocation with ENOMEM.
SGI-PV: 978729
SGI-Modid: xfs-linux-melb:xfs-kern:30771a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 114d23aae51233b2bc62d8e2a632bcb55de1953d
Author: David Chinner <dgc at sgi.com>
Date: Thu Apr 10 12:18:39 2008 +1000
[XFS] Per iclog callback chain lock
Rather than use the icloglock for protecting the iclog completion callback
chain, use a new per-iclog lock so that walking the callback chain doesn't
require holding a global lock.
This reduces contention on the icloglock during transaction commit and log
I/O completion by reducing the number of times we need to hold the global
icloglock during these operations.
SGI-PV: 978729
SGI-Modid: xfs-linux-melb:xfs-kern:30770a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 2abdb8c88110bab78bfe17e51346e735560daa02
Author: Lachlan McIlroy <lachlan at sgi.com>
Date: Thu Mar 27 18:01:14 2008 +1100
[XFS] Prevent xfs_bmap_check_leaf_extents() referencing unmapped memory.
While investigating the extent corruption bug I ran into this bug in debug
only code. xfs_bmap_check_leaf_extents() loops through the leaf blocks of
the extent btree checking that every extent is entirely before the next
extent. It also compares the last extent in the previous block to the
first extent in the current block when the previous block has been
released and potentially unmapped. So take a copy of the last extent
instead of a pointer. Also move the last extent check out of the loop
because we only need to do it once.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30718a
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
commit 433550990e6c2e94995239bac6a52b4df454cae0
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 27 18:01:08 2008 +1100
[XFS] remove most calls to VN_RELE
Most VN_RELE calls either directly contain a XFS_ITOV or have the
corresponding xfs_inode already in scope. Use the IRELE helper instead of
VN_RELE to clarify the code. With a little more work we can kill VN_RELE
altogether and define IRELE in terms of iput directly.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30710a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit df26cfe849d8fd767b26fcd4bfebfff67bda9f3a
Author: Lachlan McIlroy <lachlan at redback.melbourne.sgi.com>
Date: Fri Apr 18 11:44:03 2008 +1000
[XFS] split xfs_ioc_xattr
The three subcases of xfs_ioc_xattr don't share any semantics and almost
no code, so split it into three separate helpers.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30709a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit f3dcc13f6fa20af1171eac7a537a4b89b1a84849
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 27 18:00:54 2008 +1100
[XFS] cleanup root inode handling in xfs_fs_fill_super
- rename rootvp to root for clarify
- remove useless vn_to_inode call
- check is_bad_inode before calling d_alloc_root
- use iput instead of VN_RELE in the error case
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30708a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 59a33f9f776b051018ec98af95bd9fe8ba9d0f3e
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 27 18:00:45 2008 +1100
[XFS] Ensure a btree insert returns a valid cursor.
When writing into preallocated regions there is a case where XFS can oops
or hang doing the unwritten extent conversion on I/O completion. It turns
out that the problem is related to the btree cursor being invalid.
When we do an insert into the tree, we may need to split blocks in the
tree. When we only split at the leaf level (i.e. level 0), everything
works just fine. However, if we have a multi-level split in the btreee,
the cursor passed to the insert function is no longer valid once the
insert is complete.
The leaf level split is handled correctly because all the operations at
level 0 are done using the original cursor, hence it is updated correctly.
However, when we need to update the next level up the tree, we don't use
that cursor - we use a cloned cursor that points to the index in the next
level up where we need to do the insert.
Hence if we need to split a second level, the changes to the tree are
reflected in the cloned cursor and not the original cursor. This
clone-and-move-up-a-level-on-split behaviour recurses all the way to the
top of the tree.
The complexity here is that these cloned cursors do not point to the
original index that was inserted - they point to the newly allocated block
(the right block) and the original cursor pointer to that level may still
point to the left block. Hence, without deep examination of the cloned
cursor and buffers, we cannot update the original cursor with the new path
from the cloned cursor.
In these cases the original cursor could be pointing to the wrong block(s)
and hence a subsequent modification to the tree using that cursor will
lead to corruption of the tree.
The crash case occurs when the tree changes height - we insert a new level
in the tree, and the cursor does not have a buffer in it's path for that
level. Hence any attempt to walk back up the cursor to the root block will
result in a null pointer dereference.
To make matters even more complex, the BMAP BT is rooted in an inode, so
we can have a change of height in the btree *without a root split*. That
is, if the root block in the inode is full when we split a leaf node, we
cannot fit the pointer to the new block in the root, so we allocate a new
block, migrate all the ptrs out of the inode into the new block and point
the inode root block at the newly allocated block. This changes the height
of the tree without a root split having occurred and hence invalidates the
path in the original cursor.
The patch below prevents xfs_bmbt_insert() from returning with an invalid
cursor by detecting the cases that invalidate the original cursor and
refresh it by do a lookup into the btree for the original index we were
inserting at.
Note that the INOBT, AGFBNO and AGFCNT btree implementations also have
this bug, but the cursor is currently always destroyed or revalidated
after an insert for those trees. Hence this patch only address the problem
in the BMBT code.
SGI-PV: 979339
SGI-Modid: xfs-linux-melb:xfs-kern:30701a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 75de2a91c98a6f486f261c1367fe59f5583e15a3
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 27 18:00:38 2008 +1100
[XFS] Account for inode cluster alignment in all allocations
At ENOSPC, we can get a filesystem shutdown due to a cancelling a dirty
transaction in xfs_mkdir or xfs_create. This is due to the initial
allocation attempt not taking into account inode alignment and hence we
can prepare the AGF freelist for allocation when it's not actually
possible to do an allocation. This results in inode allocation returning
ENOSPC with a dirty transaction, and hence we shut down the filesystem.
Because the first allocation is an exact allocation attempt, we must tell
the allocator that the alignment does not affect the allocation attempt.
i.e. we will accept any extent alignment as long as the extent starts at
the block we want. Unfortunately, this means that if the longest free
extent is less than the length + alignment necessary for fallback
allocation attempts but is long enough to attempt a non-aligned
allocation, we will modify the free list.
If we then have the exact allocation fail, all other allocation attempts
will also fail due to the alignment constraint being taken into account.
Hence the initial attempt needs to set the "alignment slop" field so that
alignment, while not required, must be taken into account when determining
if there is enough space left in the AG to do the allocation.
That means if the exact allocation fails, we will not dirty the freelist
if there is not enough space available fo a subsequent allocation to
succeed. Hence we get an ENOSPC error back to userspace without shutting
down the filesystem.
SGI-PV: 978886
SGI-Modid: xfs-linux-melb:xfs-kern:30699a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 535f6b3735db6ef6026537bfe55ae00c3d9cc1ee
Author: Josef 'Jeff' Sipek <jeffpc at josefsipek.net>
Date: Thu Mar 27 17:58:27 2008 +1100
[XFS] Replace custom AIL linked-list code with struct list_head
Replace the xfs_ail_entry_t with a struct list_head and clean the
surrounding code up. Also fixes a livelock in xfs_trans_first_push_ail()
by terminating the loop at the head of the list correctly.
SGI-PV: 978682
SGI-Modid: xfs-linux-melb:xfs-kern:30636a
Signed-off-by: Josef 'Jeff' Sipek <jeffpc at josefsipek.net>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit a45c796867df8dabc8eed6e72898d7ba1609bd7e
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:49:36 2008 +1100
[XFS] Remove superflous xfs_readsb call in xfs_mountfs.
When xfs_mountfs is called by xfs_mount xfs_readsb was called 35 lines
above unconditionally, so there is no need to try to read the superblock
if it's not present. If any other port doesn't have the superblock read at
this point it should just call it directly from it's xfs_mount equivalent.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30603a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Donald Douwsma <donaldd at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit dfa18b117974d7667a2d5b941853fac3f2e256db
Author: Niv Sardi <xaiki at sgi.com>
Date: Thu Mar 6 13:49:26 2008 +1100
[XFS] kill t_sema member of struct xfs_trans
It's completely unused so we might aswell kill it. Note that there is
another t_sema in struct xlog_ticket, which is used and actually an sv_t
despite the name. That one is left untouched by this patch.
SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:30591a
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 5f90150abad61b49dbb4a6ca1087fe0a75001ef9
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:46:49 2008 +1100
[XFS] cleanup vnode use in xfs_bmap.c
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30553a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit af048193fcfe2650e7ed3b1ab3d48b1ed0efb467
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:46:43 2008 +1100
[XFS] cleanup vnode use in xfs_iops.c
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30552a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit dcf49cc5cfbbc0070ad4307428f8282dc7e04e58
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:46:37 2008 +1100
[XFS] cleanup vnode use in xfs_lrw.c
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30551a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit ef1f5e7ad38e5414d016983a8cc5a8db7654a61d
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:46:25 2008 +1100
[XFS] cleanup vnode use in xfs_lookup
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30550a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 3937be5ba836a204d3d1df96b518eecd6cdacbb9
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:46:19 2008 +1100
[XFS] cleanup vnode use in xfs_symlink and xfs_rename
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30548a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit a3da789640871c897901c5f766e33be78d56f35a
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:46:12 2008 +1100
[XFS] cleanup vnode use in xfs_link
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30547a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 979ebab11623894528d4d37b947533ea4e8649d1
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:46:05 2008 +1100
[XFS] cleanup vnode use in xfs_create/mknod/mkdir
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30546a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit bc4ac74a4e5bd7db02976eb1b681e1d11f81c9ce
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:45:58 2008 +1100
[XFS] cleanup vnode use in dmapi calls
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30545a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit d234154125197053d5215711b5df867979e55ebd
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 6 13:45:43 2008 +1100
[XFS] Use power-of-2 sized buffers to reduce overhead
Now that the ktrace_enter() code is using atomics, the non-power-of-2
buffer sizes - which require modulus operations to get the index - are
showing up as using substantial CPU in the profiles.
Force the buffer sizes to be rounded up to the nearest power of two and
use masking rather than modulus operations to convert the index counter to
the buffer index. This reduces ktrace_enter overhead to 8% of a CPU time,
and again almost halves the trace intensive test runtime.
SGI-PV: 977546
SGI-Modid: xfs-linux-melb:xfs-kern:30538a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 6ee4752ffe782be6e86bea1403a2fe0f682aa71a
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 6 13:45:35 2008 +1100
[XFS] Use atomic counters for ktrace buffer indexes
ktrace_enter() is consuming vast amounts of CPU time due to the use of a
single global lock for protecting buffer index increments. Change it to
use per-buffer atomic counters - this reduces ktrace_enter() overhead
during a trace intensive test on a 4p machine from 58% of all CPU time to
12% and halves test runtime.
SGI-PV: 977546
SGI-Modid: xfs-linux-melb:xfs-kern:30537a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 44d814ced4cffbfe6a775c5bb8b941a6e734e7d9
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 6 13:45:29 2008 +1100
[XFS] Update c/mtime correctly on truncates
XFS changes the c/mtime of an inode when truncating it to the same size.
The c/mtime is only supposed to change if the size is changed. Not to be
confused with ftruncate, where the c/mtime is supposed to be changed even
if the size is not changed.
The Linux VFS encodes this semantic difference in the flags it sends down
to ->setattr, which XFS currently ignores. We need to make XFS pay
attention to the VFS flags and hence Do The Right Thing.
SGI-PV: 977547
SGI-Modid: xfs-linux-melb:xfs-kern:30536a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 24bd861d1c3fff5248de7ba3bdddb3369087ad46
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:45:16 2008 +1100
[XFS] don't encode parent in nfs filehandles unless nessecary
As Dave pointed out after the export ops changes we now always encode the
parent into the filehandle for regular files, but it's not actually needed
when the filesystem is export with no_subtree_check. This one-liner fixes
xfs_fs_encode_fh to skip encoding the parent unless nessecary.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30535a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 126468b1156211e26d97f74b2f1767acd141005a
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:44:57 2008 +1100
[XFS] kill xfs_rwlock/xfs_rwunlock
We can just use xfs_ilock/xfs_iunlock instead and get rid of the ugly
bhv_vrwlock_t.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30533a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 43973964a386348af0a392266f008ba24170aa30
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:44:50 2008 +1100
[XFS] kill xfs_get_dir_entry
Instead of of xfs_get_dir_entry use a macro to get the xfs_inode from the
dentry in the callers and grab the reference manually.
Only grab the reference once as it's fine to keep it over the dmapi calls.
(And even that reference is actually superflous in Linux but I'll leave
that for another patch)
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30531a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit a8b3acd57e3aaaf73a863a28e0e9f6cca37cd8e3
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:44:41 2008 +1100
[XFS] vnode cleanup in xfs_fs_subr.c
Cleanup the unneeded intermediate vnode step in the flushing helpers and
go directly from the xfs_inode to the struct address_space.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30530a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit db0bb7baa1533db156d8af3ebeda1f0473a0197a
Author: Christoph Hellwig <hch at infradead.org>
Date: Thu Mar 6 13:44:35 2008 +1100
[XFS] cleanup xfs_vn_mknod
- use proper goto based unwinding instead of the current mess of
multiple conditionals
- rename ip to inode because that's the normal convention for Linux
inodes while ip is the convention for xfs_inodes
- remove unlikely checks for the default_acl - branches marked unlikely
might lead to extreme branch bredictor slowdons if taken and for some
workloads a default acl is quite common
- properly indent the switch statements
- remove xfs_has_fs_struct as nfsd has a fs_struct in any semi-recent
kernel
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30529a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 155cc6b784a959ed456fe46dca522e1d28b3b718
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 6 13:44:14 2008 +1100
[XFS] Use atomics for iclog reference counting
Now that we update the log tail LSN less frequently on transaction
completion, we pass the contention straight to the global log state lock
(l_iclog_lock) during transaction completion.
We currently have to take this lock to decrement the iclog reference
count. there is a reference count on each iclog, so we need to take þhe
global lock for all refcount changes.
When large numbers of processes are all doing small trnasctions, the iclog
reference counts will be quite high, and the state change that absolutely
requires the l_iclog_lock is the except rather than the norm.
Change the reference counting on the iclogs to use atomic_inc/dec so that
we can use atomic_dec_and_lock during transaction completion and avoid the
need for grabbing the l_iclog_lock for every reference count decrement
except the one that matters - the last.
SGI-PV: 975671
SGI-Modid: xfs-linux-melb:xfs-kern:30505a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Tim Shimmin <tes at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit b589334c7a1fff85d2f009d5db4c34fad48925e9
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 6 13:44:06 2008 +1100
[XFS] Prevent AIL lock contention during transaction completion
When hundreds of processors attempt to commit transactions at the same
time, they can contend on the AIL lock when updating the tail LSN held in
the in-core log structure.
At the moment, the tail LSN is only needed when actually writing out an
iclog, so it really does not need to be updated on every single
transaction completion - only those that result in switching iclogs and
flushing them to disk.
The result is that we reduce the number of times we need to grab the AIL
lock and the log grant lock by up to two orders of magnitude on large
processor count machines. The problem has previously been hidden by AIL
lock contention walking the AIL list which was recently solved and
uncovered this issue.
SGI-PV: 975671
SGI-Modid: xfs-linux-melb:xfs-kern:30504a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Tim Shimmin <tes at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 3354040897f828644be6ca5783588e9f64a53b8e
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 6 13:43:59 2008 +1100
[XFS] Use xfs_inode_clean() in more places
Remove open coded checks for the whether the inode is clean and replace
them with an inlined function.
SGI-PV: 977461
SGI-Modid: xfs-linux-melb:xfs-kern:30503a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit bad5584332e888ac40ca13584e8c114149ddb01e
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 6 13:43:49 2008 +1100
[XFS] Remove the xfs_icluster structure
Remove the xfs_icluster structure and replace with a radix tree lookup.
We don't need to keep a list of inodes in each cluster around anymore as
we can look them up quickly when we need to. The only time we need to do
this now is during inode writeback.
Factor the inode cluster writeback code out of xfs_iflush and convert it
to use radix_tree_gang_lookup() instead of walking a list of inodes built
when we first read in the inodes.
This remove 3 pointers from each xfs_inode structure and the xfs_icluster
structure per inode cluster. Hence we reduce the cache footprint of the
xfs_inodes by between 5-10% depending on cluster sparseness.
To be truly efficient we need a radix_tree_gang_lookup_range() call to
stop searching once we are past the end of the cluster instead of trying
to find a full cluster's worth of inodes.
Before (ia64):
$ cat /sys/slab/xfs_inode/object_size 536
After:
$ cat /sys/slab/xfs_inode/object_size 512
SGI-PV: 977460
SGI-Modid: xfs-linux-melb:xfs-kern:30502a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit a3f74ffb6d1448d9a8f482e593b80ec15f1695d4
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 6 13:43:42 2008 +1100
[XFS] Don't block pdflush when writing back inodes
When pdflush is writing back inodes, it can get stuck on inode cluster
buffers that are currently under I/O. This occurs when we write data to
multiple inodes in the same inode cluster at the same time.
Effectively, delayed allocation marks the inode dirty during the data
writeback. Hence if the inode cluster was flushed during the writeback of
the first inode, the writeback of the second inode will block waiting for
the inode cluster write to complete before writing it again for the newly
dirtied inode.
Basically, we want to avoid this from happening so we don't block pdflush
and slow down all of writeback. Hence we introduce a non-blocking async
inode flush flag that pdflush uses. If this flag is set, we use
non-blocking operations (e.g. try locks) whereever we can to avoid
blocking or extra I/O being issued.
SGI-PV: 970925
SGI-Modid: xfs-linux-melb:xfs-kern:30501a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 4ae29b4321b99b711bcfde5527c4fbf249eac60f
Author: David Chinner <dgc at sgi.com>
Date: Thu Mar 6 13:43:34 2008 +1100
[XFS] Factor xfs_itobp() and xfs_inotobp().
The only difference between the functions is one passes an inode for the
lookup, the other passes an inode number. However, they don't do the same
validity checking or set all the same state on the buffer that is returned
yet they should.
Factor the functions into a common implementation.
SGI-PV: 970925
SGI-Modid: xfs-linux-melb:xfs-kern:30500a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit e9a56b7cdaf6129892fd7c8d950b71a1a4304bb0
Author: Lachlan McIlroy <lachlan at sgi.com>
Date: Thu Mar 6 13:43:27 2008 +1100
[XFS] Fix regression due to refcache removal
SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:30490a
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
Signed-off-by: Donald Douwsma <donaldd at sgi.com>
commit 163d3686bb09d88e2120bffe780a3f2d7cc4c948
Author: Donald Douwsma <donaldd at sgi.com>
Date: Thu Mar 6 13:43:20 2008 +1100
[XFS] Remove the xfs_refcache
Remove the xfs_refcache, it was only needed while we were still
building for 2.4 kernels.
SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:30472a
Signed-off-by: Donald Douwsma <donaldd at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 461aa8a22595e3bd3e6f4dc2894d7c4315ea2bb9
Author: Lachlan McIlroy <lachlan at sgi.com>
Date: Thu Mar 6 13:43:11 2008 +1100
[XFS] make inode reclaim synchronise with xfs_iflush_done()
On a forced shutdown, xfs_finish_reclaim() will skip flushing the inode.
If the inode flush lock is not already held and there is an outstanding
xfs_iflush_done() then we might free the inode prematurely. By acquiring
and releasing the flush lock we will synchronise with xfs_iflush_done().
SGI-PV: 909874
SGI-Modid: xfs-linux-melb:xfs-kern:30468a
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
Signed-off-by: David Chinner <dgc at sgi.com>
commit e12070a5dca8bfeee352e9655ae79772a96b32f8
Author: Niv Sardi <xaiki at sgi.com>
Date: Thu Mar 6 13:43:03 2008 +1100
[XFS] actually check error returned by xfs_flush_pages, clean up and
bailout if fails.
SGI-PV: 973041
SGI-Modid: xfs-linux-melb:xfs-kern:30462a
Signed-off-by: Niv Sardi <xaiki at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 675c46796d601f63f2d47c6dd07332bca77ddae5
Author: Steve French <sfrench at us.ibm.com>
Date: Thu Apr 17 23:41:01 2008 +0000
[CIFS] Add various missing flags and defintions
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 20e673810c69d18bee2ed74d19af3806ec2504f5
Merge: 8d142137b4fe87188f211042b16a5993964226f9 4b119e21d0c66c22e8ca03df05d9de623d0eb50f
Author: Steve French <sfrench at us.ibm.com>
Date: Thu Apr 17 23:38:45 2008 +0000
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
commit 273b8385e5817a4765f82257004c5ec661a6a5b2
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:35 2008 +0200
ide: remove ide_init_default_irq() macro
* Use ide_default_irq() instead of ide_init_default_irq() in
ide_generic host driver (so the correct IRQ is always set
regardless of CONFIG_PCI / CONFIG_BLK_DEV_IDEPCI).
* Remove no longer needed ide_init_default_irq() macro.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 486c92e2900d618c650a7099536310651aa6cf1b
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:35 2008 +0200
ide: move default IDE ports setup to ide_generic host driver
* Make CONFIG_IDE_GENERIC depended on CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS.
* Move default IDE ports setup from init_ide_data() to ide_generic.
* Use ide_init_port_hw() in ide_generic.
* Remove no longer needed CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f01674e459923c6df540e6c983d37e5fc94d43b8
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:35 2008 +0200
ide: remove obsoleted "idex=noprobe" kernel parameter (take 2)
* Remove obsoleted "idex=noprobe" kernel parameter.
* Remove no longer needed hwif->noprobe quirk from ide_hwif_configure()
and hwif->noprobe checking from cmd640.c.
v2:
* "ide?=noprobe" -> "ide?=ata66" in Documentation/kernel-parameters.txt.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit aab8ad9ec81255ee08825bed36b57484052b94ea
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:35 2008 +0200
ide: remove needless hwif->irq check from ide_hwif_configure()
ide_init_default_irq() is always zero for CONFIG_PCI=y so hwif->irq
check in ide_hwif_configure() can be safely removed.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit dfd87842a97e848cb5d62a5249d3f479c5f92c4b
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:35 2008 +0200
ide: init hwif->{io_ports,irq} explicitly in legacy VLB host drivers
Do explicit port setup in legacy VLB host drivers instead of depending
on init_ide_data(). This way hwif->io_ports[] and hwif->irq are always
correctly set regardless of CONFIG_PCI / CONFIG_BLK_DEV_IDEPCI.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e4079df0c273719f539aaa7cc19ed17c9a5b0aba
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:35 2008 +0200
ide: limit legacy VLB host drivers to alpha, x86 and mips
These host drivers indirectly depend on CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS=y
which is defined only on alpha, x86, ia64, m32r, mips and ppc32.
Moreover:
- on ia64 there is no ISA
- m32r is too new for VLB
- on ppc32 ISA is available only on PPC_CHRP (no default IDE ports)
and PPC_PREP (marked as BROKEN)
[ the common sense tells me that VLB was only used on x86 but there
are urban legends that one of these host drivers was needed on some
other arch - thus the extra care ]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 6d3803b68e29d898c29eab5185261682f8f07650
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:34 2008 +0200
cmd640: init hwif->{io_ports,irq} explicitly
Do explicit port setup instead of depending on init_ide_data().
This way hwif->io_ports[] and hwif->irq are always correctly set
regardless of CONFIG_PCI / CONFIG_BLK_DEV_IDEPCI.
While at it fix printk().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit daaad24fdc2ed7cd45d9a09abdec46c0d34031a1
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:34 2008 +0200
cmd640: cleanup setup_device_ptrs()
This loop is no longer needed.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ffd4f6f0eed0423652826f3775077d11918b4180
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:34 2008 +0200
ide: add ide-4drives host driver (take 3)
CONFIG_BLK_DEV_4DRIVES deserves its own host driver:
* Add drivers/ide/legacy/ide-4drives.c and move "4drives" support there.
* Add ide-4drives.o in the link order after all other legacy host
drivers enabled by "ide0=" options (they all are mutually exclusive).
* Make ide-4drives host driver probe itself for IDE devices instead of
indirectly depending on ide_generic host driver.
* Add "probe" module parameter to ide-4drives and update documentation.
v2:
* s/paramater/parameter/ in ide.txt. (Noticed by Randy Dunlap)
v3:
* s/ide_4drives.probe/ide-4drives.probe/ in help entry.
(Noticed by Sergei Shtylyov)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 26d799b729003220c0f3e5d9e046e1588c011897
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:34 2008 +0200
ide: remove ppc ifdef from init_ide_data()
On PPC32 ide_init_default_irq() is non-zero only for PPLUS and PPC_PREP
(the latter marked as BROKEN currently) so this ifdef can be removed.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9dfcd15a6dc1ef81307295e08b797fa9212be71a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:34 2008 +0200
ide: remove ide_default_io_ctl() macro
It is always == '((base) + 0x206)' if CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS=y
and it is not needed otherwise (arm, blackfin, parisc, ppc64, sh, sparc[64]).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5c50427090303a6552949c14128200154ff69594
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:33 2008 +0200
ide: remove CONFIG_IDE_ARCH_OBSOLETE_INIT
* Use CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS instead of
CONFIG_IDE_ARCH_OBSOLETE_INIT in init_ide_data().
* Remove no longer needed CONFIG_IDE_ARCH_OBSOLETE_INIT.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 0e33555fffdc8490630d98070e76e5fe031bcac2
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:33 2008 +0200
ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS (take 2)
* Add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS to drivers/ide/Kconfig and use
it instead of defining IDE_ARCH_OBSOLETE_DEFAULTS in <arch/ide.h>.
v2:
* Define ide_default_irq() in ide-probe.c/ns87415.c if not already defined
and drop defining ide_default_irq() for CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS=n.
[ Thanks to Stephen Rothwell and David Miller for noticing the problem. ]
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Cc: David Miller <davem at davemloft.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 359c2e2d2039029a8167fb00499296b228928024
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:32 2008 +0200
ppc/pmac: remove no longer needed IDE quirk
IDE PMAC host driver and all IDE PCI host drivers use pci_enable_device()
nowadays so the following quirk in pmac_pcibios_after_init() can be removed.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7e41e7b3f010f047f1b6cc0d13eab2591382367c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:32 2008 +0200
ppc: don't include <linux/ide.h>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1d850bd0b291efd1740b8d87ce025363436eb6dc
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:32 2008 +0200
ppc: remove ppc_ide_md
* Add special cases for pplus and prep to ide_default_{irq,io_base}()
(+ FIXMEs about the need to use IDE platform host driver instead).
* Remove no longer needed ppc_ide_md and struct ide_machdep_calls.
* Then remove <linux/ide.h> include from:
- arch/powerpc/kernel/setup_32.c
- arch/ppc/kernel/ppc_ksyms.c
- arch/ppc/kernel/setup.c
- arch/ppc/platforms/pplus.c
- arch/ppc/platforms/prep_setup.c
There should be no functional changes caused by this patch.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5d682e4407d8364c286650baafcccae54d4b7c89
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:31 2008 +0200
ppc/pplus: remove ppc_ide_md.ide_init_hwif hook
* Call ide_init_default_irq() for pplus in init_ide_data().
* Remove no longer needed pplus_ide_init_hwif_ports().
There should be no functional changes caused by this patch.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7ef8df81def587ddb610b1c6f4572178ce0a97a6
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:30 2008 +0200
ppc/sandpoint: remove ppc_ide_md hooks
* Add IDE_HFLAG_FORCE_LEGACY_IRQS host flag for Motorola-Sandpoint platform
to sl82c105 host driver.
* Disable ide_generic host driver in arch/ppc/configs/sandpoint_defconfig
and enable sl82c105 one.
* Remove ppc_ide_md hooks from arch/ppc/platforms/sandpoint.c - no need for
them (sl82c105 host driver takes care of all this setup).
* Then remove no longer needed <linux/ide.h> include.
* Also update arch/ppc/platforms/sandpoint.h.
Unfortunately (unlike lopec's case) sl82c105 host driver was not enabled
in defconfing so there is a funcionality change.
[ Not a big deal since sl82c105 is superior over ide_generic. ]
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5510b1255726d5d4ff424be4264aa0c99275dfdc
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:29 2008 +0200
ppc/lopec: remove ppc_ide_md hooks
* Add IDE_HFLAG_FORCE_LEGACY_IRQS host flag for Motorola-LoPEC platform
to sl82c105 host driver.
* Remove ppc_ide_md hooks from arch/ppc/platforms/lopec.c - no need for
them (sl82c105 host driver takes care of all this setup).
* Then remove no longer needed <linux/ide.h> include.
Looking at arch/ppc/configs/lopec_defconfig:
...
CONFIG_IDE_GENERIC=y
CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_IDEPCI_SHARE_IRQ is not set
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=y
# CONFIG_BLK_DEV_OPTI621 is not set
CONFIG_BLK_DEV_SL82C105=y
...
there should be no functional changes unless somebody preferred to disable
sl82c105 host driver and use only ide_generic one (but why would anybody
want to do such thing :-).
PS It seems that lopec_defconfig hasn't been updated for ages but if somebody
is going to do it please look into disabling IDE_GENERIC and BLK_DEV_GENERIC
config options. Thanks.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 2661b13a21f609b279b4048978f8625d518df6e1
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:29 2008 +0200
ppc/mpc8xx: remove ppc_ide_md hooks
* Initialize IDE ports in mpc8xx_ide_probe().
* Remove m8xx_ide_init() and ppc_ide_md hooks - no need for them
(IDE mpc8xx host driver takes care of all this setup).
* Remove needless 'if (irq)' and 'if (data_port >= MAX_HWIFS)' checks
from m8xx_ide_init_hwif_ports().
* Remove 'ctrl_port' and 'irq' arguments from m8xx_ide_init_hwif_ports().
* Rename m8xx_ide_init_hwif_ports() to m8xx_ide_init_ports().
* Add __init tag to m8xx_ide_init_ports().
This patch fixes hwif->irq always being overriden to 0 (== auto-probe, is
this even working on PPC?) because of ide_init_default_irq() call in ide.c.
There should be no other functional changes.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Acked-by: Vitaly Bordug <vitb at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5c58666fae58cd69f862beaeb88d293ad00f6e37
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:29 2008 +0200
ppc/pmac: remove ppc_ide_md hooks
* Add pmac_ide_init_ports() helper and use it instead of
pmac_ide_init_hwif_ports().
* Remove ppc_ide_md hooks - no need for them
(IDE pmac host driver takes care of all this setup).
* Then remove no longer needed <linux/ide.h> include
from arch/powerpc/platforms/powermac/pmac.h.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e4f7f3a0994522303c006c84cb651e4caba1158e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:28 2008 +0200
ppc/ppc4xx: remove ppc_ide_md hooks
There are no "default" IDE ports on PPC4xx so ppc4xx_ide_init_hwif_ports() is
unnecessary, remove it. Also remove no longer needed <linux/ide.h> include.
There should be no functional changes caused by this patch.
Cc: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Cc: Matt Porter <mporter at kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3671e9a9ecb5090c38454cbf830a640f6c221ca8
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:28 2008 +0200
ppc/hdpu: remove dead IDE code
Also remove now not needed <linux/ide.h> include.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit af007ec6c9467c2a26f5f684cee52efa497280c4
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:28 2008 +0200
ide-pmac: remove dead code
Remove unused pmac_ide_{check_base,get_irq}() and pmac_find_ide_boot(),
then remove no longer needed ide_majors[] and pmac_ide_count.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e3bfae4c105c9b79a539bb868e8541d2ad38deee
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Fri Apr 18 00:46:27 2008 +0200
ide-scsi: do non-atomic pc->flags testing
...also, convert ide-scsi to using the generic pc->flags defines.
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit eaec3e7ded9dbc88bad393c076b65f4b7b11d30d
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Fri Apr 18 00:46:27 2008 +0200
ide: use generic ATAPI packet command flags in ide-{floppy,tape}
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit c2b2b29361dde5f1d9169a487c3021b14cf36518
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Fri Apr 18 00:46:27 2008 +0200
ide-floppy: rename end_request handler properly
mv idefloppy_do_end_request -> idefloppy_end_request as is the case with ide-cd
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1c065787c0359fc3b438c1c0aa2fcfd514fef07a
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Fri Apr 18 00:46:27 2008 +0200
ide-scsi: convert driver to using generic ide_atapi_pc
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 8e555123911cc912427bd25b52ebfb7b6c08e39a
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Fri Apr 18 00:46:27 2008 +0200
ide-floppy: convert driver to using generic ide_atapi_pc
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d236d74c0d91c7eeaef26560d3690430189e171f
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Fri Apr 18 00:46:27 2008 +0200
ide-tape: convert driver to using generic ide_atapi_pc
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 8303b46e18b58b2d0257e6842e60b50ac880a6d1
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Fri Apr 18 00:46:26 2008 +0200
ide: add generic packet command representation ide_atapi_pc
This new struct unifies ide{-floppy,-tape,-scsi}'s view of a packet command. For now,
it represents the common denominator between the three drivers while adding driver-
specific members at the end of the struct which will be merged/simplified into the
generic ATAPI handling code in later steps, or removed completely.
Bart:
- move struct ide_atapi_pc outside of #ifdef/#endif CONFIG_IDE_PROC_FS
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 346331f82823682fb5c2df6e827db25d95cc2e92
Author: Borislav Petkov <petkovbb at gmail.com>
Date: Fri Apr 18 00:46:26 2008 +0200
ide-tape: remove atomic test/set macros for packet commands
Removing the atomic tests for pc's is unobjectionable. Since this driver will
probably go to /dev/null soon, the atomic tests for tape->flags are left in
place for there are some situations where they're needed (chrdev DSC handling,
low level pipeline operation and so on). While at it, rename all test/set flag
bit defines explicitly to *_FLAG_* for clarity.
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 03056b909b72c47cbba3605ea3b48a63ef031736
Author: Borislav Petkov <petkovbb at gmail.com>
Date: Fri Apr 18 00:46:26 2008 +0200
ide-tape: move all struct and other defs at the top
Bart:
- no need to move defines for tape flags around
(they are completely rewritten by the next patch)
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 23579a2a170265aacf78069f4817a41c1d6e9323
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:26 2008 +0200
ide: remove IDE_*_REG macros
* Add IDE_{ALTSTATUS,IREASON,BCOUNTL,BCOUNTH}_OFFSET defines.
* Remove IDE_*_REG macros - this results in more readable
and slightly smaller code.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov <petkovbb at gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 7616c0ad2087c7d244b8985390c63059a6223c45
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:26 2008 +0200
ide: add ide_atapi_{discard_data,write_zeros} inline helpers
Add ide_atapi_{discard_data,write_zeros} inline helpers to <linux/ide.h>
and use them instead of home-brewn helpers in ide-{floppy,tape,scsi}.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3ad6776cca21f2456b7288f44f224b344ac3c4d0
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Fri Apr 18 00:46:25 2008 +0200
ide-floppy: remove struct idefloppy_id_gcw
Bart:
- minor fixups
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3d53ba87f079c078f608729120ada862cb0896e0
Author: Akira Iguchi <akira2.iguchi at toshiba.co.jp>
Date: Fri Apr 18 00:46:25 2008 +0200
scc_pata.c: do setup itself instead of ide_setup_pci_device()
scc_pata has the different BAR configuration and using ide_setup_pci_device()
is inappropriate.
(ide_setup_pci_device() expects a normal PCI IDE controller with
BAR0..BAR3 either non-existant or being primary/secondary port bases
in I/O space.)
This patch do all needed setup itself instead of calling ide_setup_pci_device().
[bart: minor checkpatch.pl fixes]
Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
Signed-off-by: Akira Iguchi <akira2.iguchi at toshiba.co.jp>
Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit e6bfa38a4803646e212ef542b957344e790c3733
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:25 2008 +0200
ide: remove ide_init_hwif_ports()
ide_init_hwif_ports() is only used by init_ide_data() now, inline it there.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 05734266c07ac588d1773bd9ae51a0ff20456443
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:25 2008 +0200
ide: remove init_hwif_default()
init_hwif_default() is only used by init_ide_data() now, inline it there.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 2304dc6481f9d4fb4f0cb5b72497dfe1694cef9c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:24 2008 +0200
ide: remove ->hold field from ide_hwif_t (take 2)
->hold is write-only now, remove it.
v2:
* v1 missed bast-ide, palm_bk3710, ide-cs and delkin_cb host drivers.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 93de00fd1c70e1a23a73a865e0f9abfe74a7a719
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:24 2008 +0200
ide: remove broken/dangerous HDIO_[UNREGISTER,SCAN]_HWIF ioctls (take 3)
hdparm explicitely marks HDIO_[UNREGISTER,SCAN]_HWIF ioctls as DANGEROUS
and given the number of bugs we can assume that there are no real users:
* DMA has no chance of working because DMA resources are released by
ide_unregister() and they are never allocated again.
* Since ide_init_hwif_ports() is used for ->io_ports[] setup the ioctls
don't work for almost all hosts with "non-standard" (== non ISA-like)
layout of IDE taskfile registers (there is a lot of such host drivers).
* ide_port_init_devices() is not called when probing IDE devices so:
- drive->autotune is never set and IDE host/devices are not programmed
for the correct PIO/DMA transfer modes (=> possible data corruption)
- host specific I/O 32-bit and IRQ unmasking settings are not applied
(=> possible data corruption)
- host specific ->port_init_devs method is not called (=> no luck with
ht6560b, qd65xx and opti621 host drivers)
* ->rw_disk method is not preserved (=> no HPT3xxN chipsets support).
* ->serialized flag is not preserved (=> possible data corruption when
using icside, aec62xx (ATP850UF chipset), cmd640, cs5530, hpt366
(HPT3xxN chipsets), rz1000, sc1200, dtc2278 and ht6560b host drivers).
* ->ack_intr method is not preserved (=> needed by ide-cris, buddha,
gayle and macide host drivers).
* ->sata_scr[] and sata_misc[] is cleared by ide_unregister() and it
isn't initialized again (SiI3112 support needs them).
* To issue an ioctl() there need to be at least one IDE device present
in the system.
* ->cable_detect method is not preserved + it is not called when probing
IDE devices so cable detection is broken (however since DMA support is
also broken it doesn't really matter ;-).
* Some objects which may have already been freed in ide_unregister()
are restored by ide_hwif_restore() (i.e. ->hwgroup).
* ide_register_hw() may unregister unrelated IDE ports if free ide_hwifs[]
slot cannot be found.
* When IDE host drivers are modular unregistered port may be re-used by
different host driver that owned it first causing subtle bugs.
Since we now have a proper warm-plug support remove these ioctls,
then remove no longer needed:
- ide_register_hw() and ide_hwif_restore() functions
- 'init_default' and 'restore' arguments of ide_unregister()
- zeroeing of hwif->{dma,extra}_* fields in ide_unregister()
As an added bonus IDE core code size shrinks by ~3kB (x86-32).
v2:
* fix ide_unregister() arguments in cleanup_module() (Andrew Morton).
v3:
* fix ide_unregister() arguments in palm_bk3710.c.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 9a0e77f28b50128df0c9e26ae489e44e29a7270a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:24 2008 +0200
ide: remove obsoleted "idex=base[,ctl[,irq]]" kernel parameters (take 2)
* Remove obsoleted "idex=base[,ctl[,irq]]" kernel parameters
and update Documentation/ide/ide.txt.
* Remove no longer needed ide_forced chipset type.
v2:
* is_chipset_set[] -> is_chipset_set in ide.c.
* Documentation/ide/ide.txt fix.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 80aa31cb460d12c1e02327b43eceb3eebc6e7090
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:24 2008 +0200
ide: remove CONFIG_BLK_DEV_HD_IDE config option (take 2)
* Remove CONFIG_BLK_DEV_HD hack from init_hwif_default()
("hda=noprobe hdb=noprobe" kernel parameters should be used
instead if somebody wishes to use the old "hd" driver).
* Make CONFIG_BLK_DEV_HD_ONLY config option available also when
IDE subsystem is used and update help entry.
* Remove no longer needed CONFIG_BLK_DEV_HD_IDE config option.
v2:
* Update documentation to suggest "hda=noprobe hdb=noprobe"
instead of obsoleted "ide0=noprobe".
* Update Documentation/ide/ide.txt.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit fef39d95ea19d4b5e2547e344809a5398eba8b3c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:23 2008 +0200
ide: remove needless CONFIG_BLK_DEV_HD hack from init_hwif()
request_irq() will fail if there is already another IRQ handler
registered and IRQ flags are mismatched.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f0298512c86ebc2eae9f4556d0b15087aa750646
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:23 2008 +0200
ide-generic: add ide_generic class and attribute for adding new interfaces
* Add ide_generic_sysfs_init() helper registering 'ide_generic' class
(together with ide_generic_class_release() ->class_release method)
and use it in ide_generic_init().
* Add "add" class attribute to 'ide_generic' class for adding new interfaces
(it is intended to be a replacement for obsoleted "idex=base[,ctl[,irq]]"
kernel parameters).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f74c91413ec6140ee0553180c5f56fdd27c22a2e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:23 2008 +0200
ide: add warm-plug support for IDE devices (take 2)
* Add 'struct class ide_port_class' ('ide_port' class) and a 'struct
device *portdev' ('ide_port' class device) in ide_hwif_t.
* Register 'ide_port' class in ide_init() and unregister it in
cleanup_module().
* Create ->portdev in ide_register_port () and unregister it in
ide_unregister().
* Add "delete_devices" class device attribute for unregistering IDE devices
on a port and "scan" one for probing+registering IDE devices on a port.
* Add ide_sysfs_register_port() helper for registering "delete_devices"
and "scan" attributes with ->portdev. Call it in ide_device_add_all().
* Document IDE warm-plug support in Documentation/ide/warm-plug-howto.txt.
v2:
* Convert patch from using 'struct class_device' to use 'struct device'.
(thanks to Kay Sievers for doing it)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 50672e5d7486c9ab312432cbe180ac071f1de8e0
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:23 2008 +0200
ide: remove dead/obsolete ->busproc method
->busproc method is used by HDIO_SET_BUSSTATE ioctl but it has no chance
of working as intended (in 2.4.x days) because to issue an ioctl there
is a device node needed and:
- for BUSSTATE_TRISTATE+OFF it is too late (devices are already gone)
- for BUSSTATE_TRISTATE+ON it is too early (devices are not registered yet)
Just remove ->busproc method for now (it was only implemented by hpt366,
siimage and tc86c001 host drivers).
Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 2dde7861afa23cd59db83515cb0b810b92b220aa
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:23 2008 +0200
ide: rework PowerMac media-bay support (take 2)
Rework PowerMac media-bay support in such way that instead of
un/registering the IDE interface we un/register IDE devices:
* Add ide_port_scan() helper for probing+registerering devices on a port.
* Rename ide_port_unregister_devices() to __ide_port_unregister_devices().
* Add ide_port_unregister_devices() helper for unregistering devices on a port.
* Add 'ide_hwif_t *cd_port' to 'struct media_bay_info', pass 'hwif' instead
of hwif->index to media_bay_set_ide_infos() and use it to setup 'cd_port'.
* Use ide_port_unregister_devices() instead of ide_unregister()
and ide_port_scan() instead of ide_register_hw() in media_bay_step().
* Unexport ide_register_hw() and make it static.
v2:
* Fix build by adding <linux/ide.h> include to <asm-powerpc/mediabay.h>.
(Reported by Michael/Kamalesh/Andrew).
Cc: Kamalesh Babulal <kamalesh at linux.vnet.ibm.com>
Cc: Michael Ellerman <michael at ellerman.id.au>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 26042d058ba21305aeb8ac92e4b1483dbec642ac
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:22 2008 +0200
ide: move ide_port_setup_devices() call to ide_device_add_all()
Add ide_cfg_mtx lock/unlock to ide_port_setup_devices() and then move
ide_port_setup_devices() call from init_irq() to ide_device_add_all().
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 43514ed1ee6a2325692e173ea4eb41068bf72de0
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:22 2008 +0200
ide: factor out devices init from ide_init_port_data()
* Factor out devices init from ide_init_port_data() to
ide_port_init_devices_data().
While at it:
* Add explicit clearing of IDE device structure.
There should be no functionality changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 71bf9f6fe822397e2cce781a2408c658a776fd68
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:22 2008 +0200
ide: factor out code unregistering devices from ide_unregister()
Factor out code unregistering devices from ide_unregister() to
ide_port_unregister_devices().
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5b0c4b30a625927340a3e7f565aa4de8b60489cc
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:22 2008 +0200
ide: remove IDE devices from /proc/ide/ before unregistering them
IDE devices need to be removed from /proc/ide/ _before_ being unregistered:
* Drop 'ide_hwif_t *hwif' argument from destroy_proc_ide_device()
and use drive->hwif instead.
* Rename destroy_proc_ide_device() to ide_proc_unregister_device().
* Call ide_proc_unregister_device() in drive_release_dev().
* Remove no longer needed destroy_proc_ide_drives().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit c7f6f21aaeb826a9b04b5897a92f29226995170f
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:22 2008 +0200
ide: factor out cable detection from ide_init_port()
* Factor out cable detection from ide_init_port() to ide_port_cable_detect().
* Move ide_port_cable_detect() call to ide_device_add_all().
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 8f22a72bf52e76d6bcd11bf9e695fdde61bd454c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:21 2008 +0200
ide-acpi: add missing drive->acpidata zeroing
There should be no functionality changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 4f0eee4d877e3b617b6a22d209d52b3dfca2b2a7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:21 2008 +0200
ide: use ide_find_port() instead of ide_deprecated_find_port()
* Use ide_find_port() instead of ide_deprecated_find_port() in bast-ide/
palm_bk3710/ide-cs/delkin_cb host drivers and in ide_register_hw().
* Remove no longer needed ide_deprecated_find_port().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 2625cd52b6eafb63b72f2e53f933f41ba9e34dff
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:21 2008 +0200
ide: fix ide_find_port()
* Instead of checking for '->io_ports[IDE_DATA_OFFSET] == 0' check for
'->chipset == ide_unknown' when looking for an empty ide_hwifs[] slot.
* Do ide-pnp initialization after ide-generic when IDE is built-in
(ide-pnp is the only user of ide_find_port() which needs such fixup).
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ce9b248bb451134fcb41e189e83e3838fb57caf0
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Apr 18 00:46:21 2008 +0200
ide-generic: set hwif->chipset
This hwif->chipset fixup is already present in ide_device_add_all()
but for warm-plug support we also need to reserve not currently present
interfaces.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit a594eeb1a1d320981fccc29584b6f21fcebd765f
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Fri Apr 18 00:46:20 2008 +0200
IDE: remove ide=reverse IDE core
This option is obsolete and can be removed safely.
It allows us to remove the pci_get_device_reverse() function from the
PCI core.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 8b73a07c8ffaa70683022566080f4df3328ea18d
Author: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Date: Thu Apr 17 14:22:18 2008 -0700
SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
According to RFC4960 7.2.2,
When all of the data transmitted by the sender has
been acknowledged by the recerver, partial_bytes_acked is initialized to 0.
This patch conforms to rfc requirement.
Without this fix, cwnd might be error incremented.
Signed-off-by: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Acked-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 2e5a3eaca386ce026f240c7b21e5c4958fcea946
Merge: 8c95b4773dd8d0415269ffad7301ef96d75be8ee 36b30ea940bb88d88c90698e0e3d97a805ab5856
Author: David S. Miller <davem at davemloft.net>
Date: Thu Apr 17 14:13:13 2008 -0700
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit 21e197f231343201368338603cb0909a13961bac
Author: Ivan Vecera <ivecera at redhat.com>
Date: Thu Apr 17 22:48:41 2008 +0200
r8169: fix oops in r8169_get_mac_version
r8169_get_mac_version crashes when it meets an unknown MAC
due to tp->pci_dev not being set. Initialize it early.
Signed-off-by: Ivan Vecera <ivecera at redhat.com>
Acked-by: Francois Romieu <romieu at fr.zoreil.com>
commit cee60c377de6d9d10f0a2876794149bd79a15020
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Thu Apr 17 22:35:54 2008 +0200
r8169: fix past rtl_chip_info array size for unknown chipsets
'i' is unsigned.
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Acked-by: Francois Romieu <romieu at fr.zoreil.com>
commit 636bdeaa1243327501edfd2a597ed7443eb4239a
Author: Dan Williams <dan.j.williams at intel.com>
Date: Thu Apr 17 20:17:26 2008 -0700
dmaengine: ack to flags: make use of the unused bits in the 'ack' field
'ack' is currently a simple integer that flags whether or not a client is done
touching fields in the given descriptor. It is effectively just a single bit
of information. Converting this to a flags parameter allows the other bits to
be put to use to control completion actions, like dma-unmap, and capture
results, like xor-zero-sum == 0.
Changes are one of:
1/ convert all open-coded ->ack manipulations to use async_tx_ack
and async_tx_test_ack.
2/ set the ack bit at prep time where possible
3/ make drivers store the flags at prep time
4/ add flags to the device_prep_dma_interrupt prototype
Acked-by: Maciej Sosnowski <maciej.sosnowski at intel.com>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
commit c4fe15541d0ef5cc8cc1ce43057663851f8fc387
Author: Dan Williams <dan.j.williams at intel.com>
Date: Thu Apr 17 20:17:26 2008 -0700
iop-adma: remove the workaround for missed interrupts on iop3xx
This workaround was covering the dependency submission bug in async_tx.
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
commit ce4d65a5db77e1568c82d5151a746f627c4f6ed5
Author: Dan Williams <dan.j.williams at intel.com>
Date: Thu Apr 17 20:17:26 2008 -0700
async_tx: kill ->device_dependency_added
DMA drivers no longer need to be notified of dependency submission
events as async_tx_run_dependencies and async_tx_channel_switch will
handle the scheduling and execution of dependent operations.
[sfr at canb.auug.org.au: extend this for fsldma]
Acked-by: Shannon Nelson <shannon.nelson at intel.com>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
commit 19242d7233df7d658405d4b7ee1758d21414cfaa
Author: Dan Williams <dan.j.williams at intel.com>
Date: Thu Apr 17 20:17:25 2008 -0700
async_tx: fix multiple dependency submission
Shrink struct dma_async_tx_descriptor and introduce
async_tx_channel_switch to properly inject a channel switch interrupt in
the descriptor stream. This simplifies the locking model as drivers no
longer need to handle dma_async_tx_descriptor.lock.
Acked-by: Shannon Nelson <shannon.nelson at intel.com>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
commit 1c62979ed29a8e2bf9fbe1db101c81a0089676f8
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Thu Apr 17 20:17:25 2008 -0700
fsldma: Split the MPC83xx event from MPC85xx and refine irq codes.
Split MPC83xx EOCDI event from MPC85xx EOLNI event, which is
also need to update cookie and start the next transfer.
The DMA channel irq handler function code is refined.
The patch is tested on MPC8377MDS board.
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by; Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
commit 411e23dbe9c5867045f34ba83ee84b31b5b9950c
Author: Zhang Wei <wei.zhang at freescale.com>
Date: Thu Apr 17 20:17:25 2008 -0700
fsldma: Remove CONFIG_FSL_DMA_SELFTEST, keep fsl_dma_self_test() running always.
Always enabling the fsl_dma_self_test() to ensure the DMA controller
should works well after the driver probed.
Signed-off-by: Zhang Wei <wei.zhang at freescale.com>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
commit 48feb3c419508487becfb9ea3afcc54c3eac6d80
Author: Shaohua Li <shaohua.li at intel.com>
Date: Tue Mar 25 16:50:45 2008 +0800
ata-acpi: don't call _GTF for disabled drive
I got below log after a S3 resume in a ASUS A6VC laptop. The system has
only one IDE drive. It appears there is no reason calling _GTF for
disabled drive.
ACPI Error (dsopcode-0483): Attempt to CreateField of length zero [20070126]
ACPI Error (psparse-0537): Method parse/execution failed [\_SB_.PCI0.IDE0.RATA] (Node df822a7c), AE_AML_OPERAND_VALUE
ACPI Error (psparse-0537): Method parse/execution failed [\_SB_.PCI0.IDE0.CHN1.DRV0._GTF] (Node df822bd0), AE_AML_OPERAND_VALUE
ata2.00: _GTF evaluation failed (AE 0x3006)
ACPI Error (dsopcode-0483): Attempt to CreateField of length zero [20070126]
ACPI Error (psparse-0537): Method parse/execution failed [\_SB_.PCI0.IDE0.RATA] (Node df822a7c), AE_AML_OPERAND_VALUE
ACPI Error (psparse-0537): Method parse/execution failed [\_SB_.PCI0.IDE0.CHN1.DRV1._GTF] (Node df822b94), AE_AML_OPERAND_VALUE
ata2.01: _GTF evaluation failed (AE 0x3006)
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 094e50b2f74146d8ee924fea4808e58c4ed2f163
Author: Mark Lord <liml at rtr.ca>
Date: Wed Apr 16 15:01:19 2008 -0400
sata_mv add temporary 3 second init delay for SiliconImage PMs
sata_mv does not yet fully support hotplug (coming soon, though).
This means that the driver may not find a Silicon Image port-multiplier
when first loaded, because those devices take in exceess of 3 seconds
to sync up the SATA PHY (most devices do this in mere microseconds).
So, as a short-term interim measure, here we insert a 3-second pause
on initial driver load, once per controller board (not once per port!),
to allow the Silicon Image port-multipliers to be detected later.
This will be removed again (soon!) once hotplug is fully implemented/working.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8a74f1a4680614dfb77fc5dfd37d0ece13b2b357
Author: Mark Lord <liml at rtr.ca>
Date: Wed Apr 16 15:00:17 2008 -0400
sata_mv remove redundant edma init code
Remove unnecessary edma init code from port_start.
This sequence gets done later on the first I/O to the port.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit e49856d82a887ce365637176f9f99ab68076eae8
Author: Mark Lord <liml at rtr.ca>
Date: Wed Apr 16 14:59:07 2008 -0400
sata_mv add basic port multiplier support
Add basic port-multiplier support to sata_mv.
This works in Command-based-switching mode for Gen-II chipsets,
and in FIS-based-switching mode for Gen-IIe chipsets.
Error handling remains at the primary port level for now
(works okay, but not great). This will get fixed in a subsequent
patch series for IRQ/EH handling fixes. There are also some
known NCQ/PMP errata to be dealt with in the near future,
once we have this basic PMP support in place.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 02c1f32f1c524d2a389989f2482121f7c7d9b164
Author: Mark Lord <liml at rtr.ca>
Date: Wed Apr 16 14:58:13 2008 -0400
sata_mv fix SOC flags, enable NCQ on SOC
The System-On-Chip (SOC) core supports all of the same
features as the other recent Marvell chips,
including NCQ and IRQ coalescing.
Fix the chip_soc flags to enable these capabilities
(note that the driver currently does nothing special
for IRQ coalescing, though).
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 40f0bc2d77d2d9ead3812f4eec2eefc11455e5de
Author: Mark Lord <liml at rtr.ca>
Date: Wed Apr 16 14:57:25 2008 -0400
sata_mv disable hotplug for now
Disable hot plug/unplug detection in sata_mv for now.
It is currently broken, and also interferes with PMP support.
This will get fixed in a subsequent patch series.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 17c5aab5b34e351531466e35b154ca86db7d46a9
Author: Mark Lord <liml at rtr.ca>
Date: Wed Apr 16 14:56:51 2008 -0400
sata_mv cosmetics
More cosmetic cleanups to unclutter the changes needed for PMP support.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0d8be5cbff8fd95da72d749a64e150b851f470c6
Author: Mark Lord <liml at rtr.ca>
Date: Wed Apr 16 14:56:12 2008 -0400
sata_mv hardreset rework
Rework and simplify sata_mv's hardreset code to take advantage of
libata improvements since it was first coded.
Also, get rid of the now unnecessary prereset, postreset, and phy_reset
functions.
This patch also paves the way for subsequent pmp support patches,
which will follow once this one passes muster.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f3360ebffae254ab99a64bf97c7b4f8380b1e114
Author: Jeff Garzik <jeff at garzik.org>
Date: Thu Apr 17 15:55:24 2008 -0400
[libata] improve Kconfig help text for new PMP, SFF options
commit 4f7faa3f2b99f8fb246c8cdeef971e55ceda4e52
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Jan 30 18:18:26 2008 +0900
libata: make EH fail gracefully if no reset method is available
When no reset method is available, libata currently oopses. Although
the condition can't happen unless there's a bug in a low level driver,
oopsing isn't the best way to report the error condition. Complain,
dump stack and fail reset instead.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b93fda12357b3f1aa55cf69d8e088372788ea9ea
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Apr 8 16:36:44 2008 +0100
libata: Be a bit more slack about early devices
We have a certain number of 'ATA' emulations often on CF or other flash
devices that are at best "loosely based" on the CF 1.1 standard. These
devices report themselves as disk but don't support the ATA minimal
command set only the CF 1.1 set.
Relax the PIO checking for devices reporting ATA rev 0, or no iordy
support, or CFA. Rework the code a bit as it was already messy and this
made it quite ugly.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f792068e43a3a156139569304b29ec8fc5dec4e3
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Apr 8 16:37:50 2008 +0100
libata: cable logic
The cable detect isolation patch inadvertently removed 40 wire short
cable handling. Put it back
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 45db2f6c95eee7c6622ea1b3edb9abafba58e3ab
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Apr 8 01:46:56 2008 +0900
libata: move link onlineness check out of softreset methods
Currently, SATA softresets should do link onlineness check before
actually performing SRST protocol but it doesn't really belong to
softreset.
This patch moves onlineness check in softreset to ata_eh_reset() and
ata_eh_followup_srst_needed() to clean up code and help future sata_mv
changes which need clear separation between SCR and TF accesses.
sata_fsl is peculiar in that its softreset really isn't softreset but
combination of hardreset and softreset. This patch adds dummy private
->prereset to keep the current behavior but the driver really should
implement separate hard and soft resets and return -EAGAIN from
hardreset if it should be follwed by softreset.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 2a0c15ca39f5881aa1b472ca856bb7a2e584ece7
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Apr 8 01:25:35 2008 +0900
libata: kill dead code paths in reset path
Some code paths which had been made obsolete by recent reset
simplification were still around. Kill them.
* ata_eh_reset() checked for ATA_DEV_UNKNOWN to determine
classification failure. This is no longer applicable.
* ata_do_reset() should convert ATA_DEV_UNKNOWN to ATA_DEV_NONE
regardless of reset result (e.g. -EAGAIN).
* LLDs don't need to convert ATA_DEV_UNKNOWN to ATA_DEV_NONE.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit e50e3ce5e70e36e6069a8cc8292df76058fa9e23
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Wed Apr 9 13:34:40 2008 +1000
pata_scc: fix build breakage
drivers/ata/pata_scc.c: In function 'scc_bus_softreset':
drivers/ata/pata_scc.c:594: error: 'deadlien' undeclared (first use in this function)
drivers/ata/pata_scc.c:594: error: (Each undeclared identifier is reported only once
drivers/ata/pata_scc.c:594: error: for each function it appears in.)
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 88fcd5627563722483427a55113c0a83f56e8080
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:22 2008 +0900
libata: make PMP support optional
Make PMP support optional by adding CONFIG_SATA_PMP and leaving out
libata-pmp.c if it isn't set. PMP helpers return constant values if
PMP support is not enabled and PMP declarations alias non-PMP
counterparts. This makes the compiler to leave out PMP related part
out and LLDs to use non-PMP counterparts automatically.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 071f44b1d2c051641b62a3571223314737ccbe59
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:22 2008 +0900
libata: implement PMP helpers
Implement helpers to test whether PMP is supported, attached and
determine pmp number to use when issuing SRST to a link. While at it,
move ata_is_host_link() so that it's together with the two new PMP
helpers.
This change simplifies LLDs and helps making PMP support optional.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 48515f6c006c2a9d7b624ee8ad068018c2d3fe0e
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:21 2008 +0900
libata: separate PMP support code from core code
Most of PMP support code is already in libata-pmp.c. All that are in
libata-core.c are sata_pmp_port_ops and EXPORTs. Move them to
libata-pmp.c. Also, collect PMP related prototypes and declarations
in header files and move them right above of SFF stuff.
This change is to make PMP support optional.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 127102aea2ea9ec4e9ca233e2b1a75c8d3b058c4
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:21 2008 +0900
libata: make SFF support optional
Now that SFF support is completely separated out from the core layer,
it can be made optional. Add CONFIG_ATA_SFF and let SFF drivers
depend on it. If CONFIG_ATA_SFF isn't set, all codes in libata-sff.c
and data structures for SFF support are disabled. This saves good
number of bytes for small systems.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 350756f6dab6d37ef9ed3f18dec520e88969ddac
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:21 2008 +0900
libata: don't use ap->ioaddr in non-SFF drivers
ap->ioaddr is to carry addresses for TF and BMDMA registers of a SFF
controller, don't abuse it in non-SFF controllers.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 182d7bbac322d6921ce81f8e6aa23d250816381d
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:21 2008 +0900
libata: clean up dummy port_ops
Now that SFF assumptions are removed from core layer, dummy port_ops
can be slimmed down. Chop it down.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit c9f75b04ed5ed65a058d18a8a8dda50632a96de8
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:21 2008 +0900
libata: kill ata_noop_dev_select()
Now that SFF assumptions are separated out from non-SFF reset
sequence, port_ops->sff_dev_select() is no longer necessary for
non-SFF controllers. Kill ata_noop_dev_select() and ->sff_dev_select
initialization from base and other non-SFF port_ops.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 520d06f92b32d7abe5127d7cc46a819db0f384e6
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:21 2008 +0900
libata: remove check_status from non-SFF drivers
Now that all SFF stuff is separated out of core layer, core layer
doesn't call ops->[alt_]check_status(). In fact, no one calls them
for non-SFF drivers anymore. Kill them.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 4c9bf4e799ce06a7378f1196587084802a414c03
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:20 2008 +0900
libata: replace tf_read with qc_fill_rtf for non-SFF drivers
Now that all SFF stuff is separated out of core layer, core layer
doesn't call ops->tf_read directly. It gets called only via
ops->qc_fill_rtf() for non-SFF drivers. This patch directly
implements private ops->qc_fill_rtf() for non-SFF controllers and kill
ops->tf_read().
This is much cleaner for non-SFF controllers as some of them have to
cache SFF register values in private data structure and report the
cached values via ops->tf_read(). Also, ops->tf_read() gets nasty for
controllers which don't have clear notion of TF registers when
operation is not in progress.
As this change makes default ops->qc_fill_rtf unnecessary, move
ata_sff_qc_fill_rtf() form ata_base_port_ops to ata_sff_port_ops where
it belongs.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 79f97dadfe9b4b561634d202225ba2fa910dc225
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:20 2008 +0900
libata: drop @finish_qc from ata_qc_complete_multiple()
ata_qc_complete_multiple() took @finish_qc and called it on every qc
before completing it. This was to give opportunity to update TF cache
before ata_qc_complete() tries to fill result_tf. Now that result TF
is a separate operation, this is no longer necessary.
Update sata_sil24, which was the only user of this mechanism, such
that it implements its own ops->qc_fill_rtf() and drop @finish_qc from
ata_qc_complete_multiple().
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 22183bf569c8600ff414ac25f23134044e0ef453
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:20 2008 +0900
libata: add qc_fill_rtf port operation
On command completion, ata_qc_complete() directly called ops->tf_read
to fill qc->result_tf. This patch adds ops->qc_fill_rtf to replace
hardcoded ops->tf_read usage.
ata_sff_qc_fill_rtf() which uses ops->tf_read to fill result_tf is
implemented and set in ata_base_port_ops and other ops tables which
don't inherit from ata_base_port_ops, so this patch doesn't introduce
any behavior change.
ops->qc_fill_rtf() is similar to ops->sff_tf_read() but can only be
called when a command finishes. As some non-SFF controllers don't
have TF registers defined unless they're associated with in-flight
commands, this limited operation makes life easier for those drivers
and help lifting SFF assumptions from libata core layer.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 305d2a1ab137d11d573319c315748a87060fe82d
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:20 2008 +0900
libata: unify mechanism to request follow-up SRST
Previously, there were two ways to trigger follow-up SRST from
hardreset method - returning -EAGAIN and leaving all device classes
unmodified. Drivers never used the latter mechanism and the only use
case for the former was when hardreset couldn't classify.
Drop the latter mechanism and let -EAGAIN mean "perform follow-up SRST
if classification is required". This change removes unnecessary
follow-up SRSTs and simplifies reset implementations.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 5958e3025fd9d97429163e074d9cfa3848f51f28
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:20 2008 +0900
libata: move PMP SCR access failure during reset to ata_eh_reset()
If PMP fan-out reset fails and SCR isn't accessible, PMP should be
reset. This used to be tested by sata_pmp_std_hardreset() and
communicated to EH by -ERESTART. However, this logic is generic and
doesn't really have much to do with specific hardreset implementation.
This patch moves SCR access failure detection logic to ata_eh_reset()
where it belongs. As this makes sata_pmp_std_hardreset() identical to
sata_std_hardreset(), the function is killed and replaced with the
standard method.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit ac371987a81c61c2efbd6931245cdcaf43baad89
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:19 2008 +0900
libata: clear SError after link resume
SError used to be cleared in ->postreset. This has small hotplug race
condition. If a device is plugged in after reset is complete but
postreset hasn't run yet, its hotplug event gets lost when SError is
cleared. This patch makes sata_link_resume() clear SError. This
kills the race condition and makes a lot of sense as some PMP and host
PHYs don't work properly without SError cleared.
This change makes sata_pmp_std_{pre|post}_reset()'s unnecessary as
they become identical to ata_std counterparts. It also simplifies
sata_pmp_hardreset() and ahci_vt8251_hardreset().
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 57c9efdfb3cee5d4564fcb5f70555e2edb1bc52a
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:19 2008 +0900
libata: implement and use sata_std_hardreset()
Implement sata_std_hardreset(), which simply wraps around
sata_link_hardreset(). sata_std_hardreset() becomes new standard
hardreset method for sata_port_ops and sata_sff_hardreset() moves from
ata_base_port_ops to ata_sff_port_ops, which is where it really
belongs.
ata_is_builtin_hardreset() is added so that both
ata_std_error_handler() and ata_sff_error_handler() skip both builtin
hardresets if SCR isn't accessible.
piix_sidpr_hardreset() in ata_piix.c is identical to
sata_std_hardreset() in functionality and got replaced with the
standard function.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 9dadd45b24145d6aee2fabb28d7aef972301892b
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:19 2008 +0900
libata: move generic hardreset code from sata_sff_hardreset() to sata_link_hardreset()
sata_sff_hardreset() contains link readiness wait logic which isn't
SFF specific. Move that part into sata_link_hardreset(), which now
takes two more parameters - @online and @check_ready. Both are
optional. The former is out parameter for link onlineness after
reset. The latter is used to wait for link readiness after hardreset.
Users of sata_link_hardreset() is updated to use new funtionality and
ahci_hardreset() is updated to use sata_link_hardreset() instead of
sata_sff_hardreset(). This doesn't really cause any behavior change.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit a89611e8489ac24f371c9fd6fef6605b170b16ba
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:19 2008 +0900
ahci: use ata_wait_after_reset() instead of ata_sff_wait_ready()
Implement ahci_check_ready() and replace ata_sff_wait_after_reset()
with ata_wait_after_reset(). As ahci was faking TF access, this
change doesn't result in any functional difference.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit aa2731ad9ad80ac3fca48bd1c4cf0eceede4810e
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:19 2008 +0900
libata: separate out ata_wait_ready() and implement ata_wait_after_reset()
Factor out waiting logic (which is common to all ATA controllers) from
ata_sff_wait_ready() into ata_wait_ready(). ata_wait_ready() takes
@check_ready function pointer and uses it to poll for readiness. This
allows non-SFF controllers to use ata_wait_ready() to wait for link
readiness.
This patch also implements ata_wait_after_reset() - generic version of
ata_sff_wait_after_reset() - using ata_wait_ready().
ata_sff_wait_ready() is reimplemented using ata_wait_ready() and
ata_sff_check_ready(). Functionality remains the same.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 705e76beb90b97421e1f61e857c4246799781bb5
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:19 2008 +0900
libata: restructure SFF post-reset readiness waits
Previously, post-softreset readiness is waited as follows.
1. ata_sff_wait_after_reset() waits for 150ms and then for
ATA_TMOUT_FF_WAIT if status is 0xff and other conditions meet.
2. ata_bus_softreset() finishes with -ENODEV if status is still 0xff.
If not, continue to #3.
3. ata_bus_post_reset() waits readiness of dev0 and/or dev1 depending
on devmask using ata_sff_wait_ready().
And for post-hardreset readiness,
1. ata_sff_wait_after_reset() waits for 150ms and then for
ATA_TMOUT_FF_WAIT if status is 0xff and other conditions meet.
2. sata_sff_hardreset waits for device readiness using
ata_sff_wait_ready().
This patch merges and unifies post-reset readiness waits into
ata_sff_wait_ready() and ata_sff_wait_after_reset().
ATA_TMOUT_FF_WAIT handling is merged into ata_sff_wait_ready(). If TF
status is 0xff, link status is unknown and the port is SATA, it will
continue polling till ATA_TMOUT_FF_WAIT.
ata_sff_wait_after_reset() is updated to perform the following steps.
1. waits for 150ms.
2. waits for dev0 readiness using ata_sff_wait_ready(). Note that
this is done regardless of devmask, as ata_sff_wait_ready() handles
0xff status correctly, this preserves the original behavior except
that it may wait longer after softreset if link is online but
status is 0xff. This behavior change is very unlikely to cause any
actual difference and is intended. It brings softreset behavior to
that of hardreset.
3. waits for dev1 readiness just the same way ata_bus_post_reset() did.
Now both soft and hard resets call ata_sff_wait_after_reset() after
reset to wait for readiness after resets. As
ata_sff_wait_after_reset() contains calls to ->sff_dev_select(),
explicit call near the end of sata_sff_hardreset() is removed.
This change makes reset implementation simpler and more consistent.
While at it, make the magical 150ms wait post-reset wait duration a
constant and ata_sff_wait_ready() and ata_sff_wait_after_reset() take
@link instead of @ap. This is to make them consistent with other
reset helpers and ease core changes.
pata_scc is updated accordingly.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 203c75b8245c5386044721d9c5eda5c6b71b3d14
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:18 2008 +0900
libata: separate out ata_std_postreset() from ata_sff_postreset()
Separate out generic ATA portion from ata_sff_postreset() into
ata_std_postreset() and implement ata_sff_postreset() using the std
version.
ata_base_port_ops now has ata_std_postreset() for its postreset and
ata_sff_port_ops overrides it to ata_sff_postreset().
This change affects pdc_adma, ahci, sata_fsl and sata_sil24. pdc_adma
now specifies postreset to ata_sff_postreset() explicitly. sata_fsl
and sata_sil24 now use ata_std_postreset() which makes no difference
to them. ahci now calls ata_std_postreset() from its own postreset
method, which causes no behavior difference.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 0aa1113d544226bc2c4a20d6ac1d71170512a361
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:18 2008 +0900
libata: separate out ata_std_prereset() from ata_sff_prereset()
Separate out generic ATA portion from ata_sff_prereset() into
ata_std_prereset() and implement ata_sff_prereset() using the std
version. Waiting for device readiness is the only SFF specific part.
ata_base_port_ops now has ata_std_prereset() for its prereset and
ata_sff_port_ops overrides it to ata_sff_prereset(). This change can
affect pdc_adma, ahci, sata_fsl and sata_sil24. pdc_adma implements
its own prereset using ata_sff_prereset() and the rest has hardreset
and thus are unaffected by this change.
This change reflects real world situation. There is no generic way to
wait for device readiness for non-SFF controllers and some of them
don't have any mechanism for that. Non-sff drivers which don't have
hardreset should wrap ata_std_prereset() and wait for device readiness
itself but there's no such driver now and isn't likely to be popular
in the future either.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 288623a06c652239d2f57d271af12bb024cf7218
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:17 2008 +0900
libata: clean up port_ops->sff_irq_clear()
->sff_irq_clear() is called only from SFF interrupt handler, so there
is no reason to initialize it for non-SFF controllers. Also,
ata_sff_irq_clear() can handle both BMDMA and non-BMDMA SFF
controllers.
This patch kills ata_noop_irq_clear() and removes it from base
port_ops and sets ->sff_irq_clear to ata_sff_irq_clear() in sff
port_ops instead of bmdma port_ops.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 5682ed33aae05d10a25c95633ef9d9c062825888
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:16 2008 +0900
libata: rename SFF port ops
Add sff_ prefix to SFF specific port ops.
This rename is in preparation of separating SFF support out of libata
core layer. This patch strictly renames ops and doesn't introduce any
behavior difference.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 9363c3825ea9ad76561eb48a395349dd29211ed6
Author: Tejun Heo <htejun at gmail.com>
Date: Mon Apr 7 22:47:16 2008 +0900
libata: rename SFF functions
SFF functions have confusing names. Some have sff prefix, some have
bmdma, some std, some pci and some none. Unify the naming by...
* SFF functions which are common to both BMDMA and non-BMDMA are
prefixed with ata_sff_.
* SFF functions which are specific to BMDMA are prefixed with
ata_bmdma_.
* SFF functions which are specific to PCI but apply to both BMDMA and
non-BMDMA are prefixed with ata_pci_sff_.
* SFF functions which are specific to PCI and BMDMA are prefixed with
ata_pci_bmdma_.
* Drop generic prefixes from LLD specific routines. For example,
bfin_std_dev_select -> bfin_dev_select.
The following renames are noteworthy.
ata_qc_issue_prot() -> ata_sff_qc_issue()
ata_pci_default_filter() -> ata_bmdma_mode_filter()
ata_dev_try_classify() -> ata_sff_dev_classify()
This rename is in preparation of separating SFF support out of libata
core layer. This patch strictly renames functions and doesn't
introduce any behavior difference.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit b67a1064cb1c1d3b43e01e8b43a6a8dcdefed733
Author: Mark Lord <liml at rtr.ca>
Date: Mon Mar 31 19:35:13 2008 -0400
sata_mv fix ifctl handling
Fix handling of the SATA_INTERFACE_CFG register to match datasheet requirements.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit b562468cc3bd0c81decba1f5f39a7173f839e57e
Author: Mark Lord <liml at rtr.ca>
Date: Mon Mar 31 19:34:40 2008 -0400
sata_mv clean up mv_stop_edma usage
Clean up uses of mv_stop_edma{_engine}() to match datasheet requirements.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit e12bef50b7660cf7c19d1cd3eac381b9eff734d7
Author: Mark Lord <liml at rtr.ca>
Date: Mon Mar 31 19:33:56 2008 -0400
sata_mv cosmetic fixes
Various cosmetic fixes in preparation for real code changes later on.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 83c063dd730cb56bf3fc89b70250ff9a398fec1e
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Thu Feb 28 21:43:13 2008 +0900
use ATA_TAG_INTERNAL in ata_tag_internal()
It should be ATA_TAG_INTERNAL.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit c30484d775eb0b899f2b6a8f5508a99ecaba59fc
Author: Chris Wedgwood <cw at f00f.org>
Date: Tue Mar 18 15:06:48 2008 -0700
Add 'short help text' to ATA_ACPI so it's [de]selectable.
ATA_ACPI isn't selectable right now because it lacks 'short help
text'. This means it's always enabled and always enables ACPI_DOCK.
Add text so it's now [de]selectable.
cc: Jeff Garzik <jeff at garzik.org>
cc: Tejun Heo <htejun at gmail.com>
cc: Len Brown <len.brown at intel.com>
Signed-off-by: Chris Wedgwood <cw at f00f.org>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit fc4712d12e332a46f200b9ba641855182df282c0
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 21:36:06 2008 +0900
pdc_adma: kill adma_host_stop()
adma_host_stop() does the same thing that adma_port_stop() does. Kill
it.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Mark Lord <liml at rtr.ca>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit b0316b15ace0570c87b74c81f1296cf7bf8d459e
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 21:35:30 2008 +0900
pdc_adma: inherit ata_sff_port_ops
With the previous ops standardization, pdc_adma now can inherit
ata_sff_port_ops instead of ata_base_port_ops. Make the change.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Mark Lord <liml at rtr.ca>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit ed82f96425e744dffe62115e46f08eb785c0b2f3
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 21:34:39 2008 +0900
libata/pdc_adma: make SFF EH handle non-bmdma SFF drivers and standardize pdc_adma ops
pdc_adma has interface similar to SFF but has its own DMA interface.
It currently implements noop bmdma ops to avoid crashing
ata_bmdma_error_handler() which BTW actually is EH for SFF drivers.
This patch makes ata_bmdma_error_handler() dereference bmdma ops iff
bmdma_addr is initialized as done in ata_bmdma_post_internal_cmd.
This change allows pdc_adma to standardize ops and use SFF
error_handler and post_internal_cmd.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Mark Lord <liml at rtr.ca>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit d8b81b8008a0f131e01bb6eb5c681c900c327e2b
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Mar 27 19:14:25 2008 +0900
libata: kill unused ata_flush_cache()
ata_flush_code() hasn't been in use for quite some time now. Kill it.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 03faab7827e4e45823fd27c47b84c133e20a0cd0
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Mar 27 19:14:24 2008 +0900
libata: implement ATA_QCFLAG_RETRY
Currently whether a command should be retried after failure is
determined inside ata_eh_finish(). Add ATA_QCFLAG_RETRY and move the
logic into ata_eh_autopsy(). This makes things clearer and helps
extending retry determination logic.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit a5987e0a1b569146ed9cfa0a8c275a21b344fcaa
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Mar 27 19:14:23 2008 +0900
libata: make ata_tf_to_lba[48]() generic
ata_tf_to_lba[48]() currently return LBA in tf + 1 for
ata_read_native_max_address(). Make them return LBA and make it
global so that it can be used to read LBA off TF for other purposes.
ata_read_native_max_address() now adds 1 itself.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 06993d2237da45615b5a9a4dde3f344ce97ca17d
Author: Jeff Garzik <jeff at garzik.org>
Date: Fri Apr 4 03:34:45 2008 -0400
[libata] sata_nv: disable ADMA by default
Continues to have open issues, and engineering support is extremely difficult
to come by, according to fellow NVIDIA engineers.
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 826cd156de6cea1e4982f32238077215cfa4ae63
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Tue Mar 25 05:18:11 2008 +0000
libata annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 9c0bf675054883acd10dec99c0c854514e139f06
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Mar 26 16:00:58 2008 +0900
ata_piix: kill ich6_sata_ahci and clean up
ich6_sata_ahci and ich6_sata are identical. Kill ich6_sata_ahci and
drop _ahci postfixes from controller ids, which doesn't really mean
anything at this point.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 5016d7d212dbcc85cdc5130b1228d23f3423bd61
Author: Tejun Heo <htejun at gmail.com>
Date: Wed Mar 26 15:46:58 2008 +0900
ata_piix: don't attach to ICH6M in ahci mode
ata_piix when attached to ICH6M in AHCI mode doesn't provide any
benefit over using ahci and has detection problems. Don't let
ata_piix claim ICH6M if it's in AHCI mode.
This change makes ICH6R the only one which ata_piix can attach to even
when it's in ahci mode which is necessary as some devices don't work
properly under ahci mode. Drop PIIX_FLAG_AHCI and match the
controller directly so that piix_disable_ahci() is called only for it.
This change makes PIIX_SCC no longer used and it gets dropped too.
This fixes bz 9491.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Robert M. Albrecht <romal at gmx.de>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit c1796d9850aaa97ee7492d090499b5508971514b
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Mar 27 19:44:24 2008 +0900
pata_scc: fix compile warning
Missed one during mass conversion (dc14c0c5). Fix it. Spotted by
Stephen Rothwell.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 15a5551c847c8787d6cd75b8cf7682cd6d642e1b
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Fri Mar 28 14:33:46 2008 -0700
libata: isolate and rework cable logic
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit d21279f4125893c63ec285962e1f2164b4d71117
Author: Zoltan Boszormenyi <zboszor at dunaweb.hu>
Date: Fri Mar 28 14:33:46 2008 -0700
ata: SWNCQ should be enabled by default
Signed-off-by: Zoltan Boszormenyi <zboszor at dunaweb.hu>
Cc: Robert Hancock <hancockr at shaw.ca>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit d9c74fbead08de13e3965e1c6ffe289f24f45479
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Fri Mar 28 14:33:56 2008 -0700
pata_amd: fix sparse warning
Current code is essentially choosing between dividing by 1 or
dividing by two, make the conditions a little more obvious.
As a bonus, removes a sparse error:
drivers/ata/pata_amd.c:59:11: warning: symbol '__x' shadows an earlier one
drivers/ata/pata_amd.c:59:11: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 6fd36390117f7844ad147377878ddb52088f583a
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 22:16:44 2008 +0900
libata: kill ata_chk_status()
ata_chk_status() just calls ops->check_status and it only adds
confusion with other status functions. Kill it.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 3d5a3d67a578d95ac3a11a862d16a054e2d4d9cd
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 22:16:43 2008 +0900
libata: kill ata_chk_status() call from ata_dev_configure()
ata_dev_configure() isn't tied to any controller interface except for
the probe debug message printing at the end of the function. Kill the
message.
This is to help separating out SFF support from core layer.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 071ce34d57924edb76b76f7de460eb4991463959
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 22:16:42 2008 +0900
libata: move ata_pci_default_filter() out of CONFIG_PCI
ata_pci_default_filter() doesn't really have anything to do with PCI.
It's generally applicable to BMDMA controllers. Move it out of
CONFIG_PCI.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 624d5c514eed18d5a93062e9d86d67065175f30a
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 22:16:41 2008 +0900
libata: reorganize SFF related stuff
* Move SFF related functions from libata-core.c to libata-sff.c.
ata_[bmdma_]sff_port_ops, ata_devchk(), ata_dev_try_classify(),
ata_std_dev_select(), ata_tf_to_host(), ata_busy_sleep(),
ata_wait_after_reset(), ata_wait_ready(), ata_bus_post_reset(),
ata_bus_softreset(), ata_bus_reset(), ata_std_softreset(),
sata_std_hardreset(), ata_fill_sg(), ata_fill_sg_dumb(),
ata_qc_prep(), ata_dump_qc_prep(), ata_data_xfer(),
ata_data_xfer_noirq(), ata_pio_sector(), ata_pio_sectors(),
atapi_send_cdb(), __atapi_pio_bytes(), atapi_pio_bytes(),
ata_hsm_ok_in_wq(), ata_hsm_qc_complete(), ata_hsm_move(),
ata_pio_task(), ata_qc_issue_prot(), ata_host_intr(),
ata_interrupt(), ata_std_ports()
* Make ata_pio_queue_task() global as it's now called from
libata-sff.c.
* Move SFF related stuff in include/linux/libata.h and
drivers/ata/libata.h into one place. While at it, move timing
constants into the global enum definition and fortify comments a
bit.
This patch strictly moves stuff around and as such doesn't cause any
functional difference.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 272f7884e8c0effe594e5537092b9c0ccc0140b0
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 22:16:40 2008 +0900
libata: reorder functions in libata-sff.c
Reorder functions in drivers/ata/libata-sff.c such that functions
generally follow ops table order and init functions come last. This
is in preparation of SFF cleanup.
This patch strictly moves stuff around and as such doesn't cause any
functional difference.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit 21572ea58a1f99a59044febde90c31167d2f59ae
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 22:16:39 2008 +0900
libata: drop ata_dev_select() from ata_dev_read_id
There is no reason to issue device select in read_id, it will be done
by ops->qc_issue() when IDENTIFY[_PACKET] is issued via
ata_exec_internal().
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
commit a1efdaba2dbd6fb89e23a87b66d3f4dd92c9f5af
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:50 2008 +0900
libata: make reset related methods proper port operations
Currently reset methods are not specified directly in the
ata_port_operations table. If a LLD wants to use custom reset
methods, it should construct and use a error_handler which uses those
reset methods. It's done this way for two reasons.
First, the ops table already contained too many methods and adding
four more of them would noticeably increase the amount of necessary
boilerplate code all over low level drivers.
Second, as ->error_handler uses those reset methods, it can get
confusing. ie. By overriding ->error_handler, those reset ops can be
made useless making layering a bit hazy.
Now that ops table uses inheritance, the first problem doesn't exist
anymore. The second isn't completely solved but is relieved by
providing default values - most drivers can just override what it has
implemented and don't have to concern itself about higher level
callbacks. In fact, there currently is no driver which actually
modifies error handling behavior. Drivers which override
->error_handler just wraps the standard error handler only to prepare
the controller for EH. I don't think making ops layering strict has
any noticeable benefit.
This patch makes ->prereset, ->softreset, ->hardreset, ->postreset and
their PMP counterparts propoer ops. Default ops are provided in the
base ops tables and drivers are converted to override individual reset
methods instead of creating custom error_handler.
* ata_std_error_handler() doesn't use sata_std_hardreset() if SCRs
aren't accessible. sata_promise doesn't need to use separate
error_handlers for PATA and SATA anymore.
* softreset is broken for sata_inic162x and sata_sx4. As libata now
always prefers hardreset, this doesn't really matter but the ops are
forced to NULL using ATA_OP_NULL for documentation purpose.
* pata_hpt374 needs to use different prereset for the first and second
PCI functions. This used to be done by branching from
hpt374_error_handler(). The proper way to do this is to use
separate ops and port_info tables for each function. Converted.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 959471936241bd83da7d0a76411cef6772140fe6
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:49 2008 +0900
libata: kill port_info->sht and ->irq_handler
libata core layer doesn't care about sht or ->irq_handler. Those are
only of interest to the LLD during initialization. This is confusing
and has caused several drivers to have duplicate unused initializers
for these fields.
Currently only sata_nv uses these fields. Make sata_nv use
->private_data, which is supposed to carry LLD-specific information,
instead and kill ->sht and ->irq_handler. nv_pi_priv structure is
defined and struct literals are used to initialize private_data.
Notational overhead is negligible.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 887125e3740283be25564bfc6fb5d24974b651ab
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:49 2008 +0900
libata: stop overloading port_info->private_data
port_info->private_data is currently used for two purposes - to record
private data about the port_info or to specify host->private_data to
use when allocating ata_host.
This overloading is confusing and counter-intuitive in that
port_info->private_data becomes host->private_data instead of
port->private_data. In addition, port_info and host don't correspond
to each other 1-to-1. Currently, the first non-NULL
port_info->private_data is used.
This patch makes port_info->private_data just be what it is -
private_data for the port_info where LLD can jot down extra info.
libata no longer sets host->private_data to the first non-NULL
port_info->private_data, @host_priv argument is added to
ata_pci_init_one() instead. LLDs which use ata_pci_init_one() can use
this argument to pass in pointer to host private data. LLDs which
don't should use init-register model anyway and can initialize
host->private_data directly.
Adding @host_priv instead of using init-register model for LLDs which
use ata_pci_init_one() is suggested by Alan Cox.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
commit 1bd5b715a305f6f13455e89becbd839010dd14b5
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:49 2008 +0900
libata: make ata_pci_init_one() not use ops->irq_handler and pi->sht
ata_pci_init_one() is the only function which uses ops->irq_handler
and pi->sht. Other initialization functions take the same information
as arguments. This causes confusion and duplicate unused entries in
structures.
Make ata_pci_init_one() take sht as an argument and use ata_interrupt
implicitly. All current users use ata_interrupt and if different irq
handler is necessary open coding ata_pci_init_one() using
ata_prepare_sff_host() and ata_activate_sff_host can be done under ten
lines including error handling and driver which requires custom
interrupt handler is likely to require custom initialization anyway.
As ata_pci_init_one() was the last user of ops->irq_handler, this
patch also kills the field.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 029cfd6b74fc5c517865fad78cf4a3ea8d9b664a
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:49 2008 +0900
libata: implement and use ops inheritance
libata lets low level drivers build ata_port_operations table and
register it with libata core layer. This allows low level drivers
high level of flexibility but also burdens them with lots of
boilerplate entries.
This becomes worse for drivers which support related similar
controllers which differ slightly. They share most of the operations
except for a few. However, the driver still needs to list all
operations for each variant. This results in large number of
duplicate entries, which is not only inefficient but also error-prone
as it becomes very difficult to tell what the actual differences are.
This duplicate boilerplates all over the low level drivers also make
updating the core layer exteremely difficult and error-prone. When
compounded with multi-branched development model, it ends up
accumulating inconsistencies over time. Some of those inconsistencies
cause immediate problems and fixed. Others just remain there dormant
making maintenance increasingly difficult.
To rectify the problem, this patch implements ata_port_operations
inheritance. To allow LLDs to easily re-use their own ops tables
overriding only specific methods, this patch implements poor man's
class inheritance. An ops table has ->inherits field which can be set
to any ops table as long as it doesn't create a loop. When the host
is started, the inheritance chain is followed and any operation which
isn't specified is taken from the nearest ancestor which has it
specified. This operation is called finalization and done only once
per an ops table and the LLD doesn't have to do anything special about
it other than making the ops table non-const such that libata can
update it.
libata provides four base ops tables lower drivers can inherit from -
base, sata, pmp, sff and bmdma. To avoid overriding these ops
accidentaly, these ops are declared const and LLDs should always
inherit these instead of using them directly.
After finalization, all the ops table are identical before and after
the patch except for setting .irq_handler to ata_interrupt in drivers
which didn't use to. The .irq_handler doesn't have any actual effect
and the field will soon be removed by later patch.
* sata_sx4 is still using old style EH and currently doesn't take
advantage of ops inheritance.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 68d1d07b510bb57a504588adc2bd2758adea0965
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:49 2008 +0900
libata: implement and use SHT initializers
libata lets low level drivers build scsi_host_template and register it
to the SCSI layer. This allows low level drivers high level of
flexibility but also burdens them with lots of boilerplate entries.
This patch implements SHT initializers which can be used to initialize
all the boilerplate entries in a sht. Three variants of them are
implemented - BASE, BMDMA and NCQ - for different types of drivers.
Note that entries can be overriden by putting individual initializers
after the helper macro.
All sht tables are identical before and after this patch.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 6bd99b4e0998571808fc1f09d5162348f21ff8c1
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:48 2008 +0900
libata: normalize port_info, port_operations and sht tables
Over the time, port info, ops and sht structures developed quite a bit
of inconsistencies. This patch updates drivers.
* Enable/disable_pm callbacks added to all ahci ops tables.
* Every driver for SFF controllers now uses ata_sff_port_start()
instead of ata_port_start() unless the driver has custom
implementation.
* Every driver for SFF controllers now uses ata_pci_default_filter()
unless the driver has custom implementation.
* Removed an odd port_info->sht initialization from ata_piix.c.
Likely a merge byproduct.
* A port which has ATA_FLAG_SATA set doesn't need to set cable_detect
to ata_cable_sata(). Remove it from via and mv port ops.
* Some drivers had unnecessary .max_sectors initialization which is
ignored and was missing .slave_destroy callback. Fixed.
* Removed unnecessary sht initializations port_info's.
* Removed onsolete scsi device suspend/resume callbacks from
pata_bf54x.
* No reason to set ata_pci_default_filter() and bmdma functions for
PIO-only drivers. Remove those callbacks and replace
ata_bmdma_irq_clear with ata_noop_irq_clear.
* pata_platform sets port_start to ata_dummy_ret0. port_start can
just be set to NULL.
* sata_fsl supports NCQ but was missing qc_defer. Fixed.
* pata_rb600_cf implements dummy port_start. Removed.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 358f9a77a668660729e705fde9c3cf69f013aa98
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:47 2008 +0900
libata: implement and use ata_noop_irq_clear()
->irq_clear() is used to clear IRQ bit of a SFF controller and isn't
useful for drivers which don't use libata SFF HSM implementation.
However, it's a required callback and many drivers implement their own
noop version as placeholder. This patch implements ata_noop_irq_clear
and use it to replace those custom placeholders.
Also, SFF drivers which don't support BMDMA don't need to use
ata_bmdma_irq_clear(). It becomes noop if BMDMA address isn't
initialized. Convert them to use ata_noop_irq_clear().
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit c1bc899f5805771926c9198e2ab4d77122c356a1
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:47 2008 +0900
libata: reorganize ata_port_operations
Over the time, ops in ata_port_operations has become a bit confusing.
Reorganize. SFF/BMDMA ops are separated into separate a group as they
will be taken out of ata_port_operations later.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit f08048e94564d009b19038cfbdd800aa83e79c7f
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Mar 25 12:22:47 2008 +0900
libata: PCI device should be powered up before being accessed
PCI device should be powered up or powered up before its PCI regsiters
are accessed. Although PCI configuration register access is allowed
in D3hot, PCI device is free to reset its status when transiting from
D3hot to D0 causing configuration data to change.
Many libata SFF drivers which use ata_pci_init_one() read and update
configuration registers before calling ata_pci_init_one() which
enables the PCI device. Also, in resume paths, some drivers access
registers without resuming the PCI device.
This patch adds a call to pcim_enable_device() in init path if
register is accessed before calling ata_pci_init_one() and make resume
paths first resume PCI devices, access PCI configuration regiters then
resume ATA host.
While at it...
* cmd640 was strange in that it set ->resume even when CONFIG_PM is
not. This is by-product of minimal build fix. Updated.
* In cs5530, Don't BUG() on reinit failure. Just whine and fail
resume.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit b558edddb1c42c70a30cfe494984d4be409f7b2b
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Jan 24 00:05:14 2008 +0900
libata: kill ata_ehi_schedule_probe()
ata_ehi_schedule_probe() was created to hide details of link-resuming
reset magic. Now that all the softreset workarounds are gone,
scheduling probe is very simple - set probe_mask and request RESET.
Kill ata_ehi_schedule_probe() and open code it. This also increases
consistency as ata_ehi_schedule_probe() couldn't cover individual
device probings so they were open-coded even when the helper existed.
While at it, define ATA_ALL_DEVICES as mask of all possible devices on
a link and always use it when requesting probe on link level for
simplicity and consistency. Setting extra bits in the probe_mask
doesn't hurt anybody.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 8cebf274dd1c955a6e03385a85fd6569ce445946
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Jan 24 00:05:14 2008 +0900
libata: kill ATA_LFLAG_SKIP_D2H_BSY
Some controllers can't reliably record the initial D2H FIS after SATA
link is brought online for whatever reason. Advanced controllers
which don't have traditional TF register based interface often have
this problem as they don't really have the TF registers to update
while the controller and link are being initialized.
SKIP_D2H_BSY works around the problem by skipping the wait for device
readiness before issuing SRST, so for such controllers libata issues
SRST blindly and hopes for the best.
Now that libata defaults to hardreset, this workaround is no longer
necessary. For controllers which have support for hardreset, SRST is
never issued by itself. It is only issued as follow-up SRST for
device classification and PMP initialization, so there's no need to
wait for it from prereset.
Kill ATA_LFLAG_SKIP_D2H_BSY.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 672b2d65ba83a6f3f801fd3d58851aa9c0725a54
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Jan 24 00:05:14 2008 +0900
libata: kill ATA_EHI_RESUME_LINK
ATA_EHI_RESUME_LINK has two functions - promote reset to hardreset if
ATA_LFLAG_HRST_TO_RESUME is set and preventing EH from shortcutting
reset action when probing is requested. The former is gone now and
the latter can easily be achieved by making EH to perform at least one
reset if reset is requested, which also makes more sense than
depending on RESUME_LINK flag.
As ATA_EHI_RESUME_LINK was the only EHI reset modifier, this also
kills reset modifier handling.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit d692abd92f22a81b38d52c39601871003262841c
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Jan 24 00:05:14 2008 +0900
libata: kill ATA_LFLAG_HRST_TO_RESUME
Now that hardreset is the preferred method of resetting, there's no
need for ATA_LFLAG_HRST_TO_RESUME flag. Kill it.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit cf48062658e7ab3bc55e10c65676c3c73c16f8bf
Author: Tejun Heo <htejun at gmail.com>
Date: Thu Jan 24 00:05:14 2008 +0900
libata: prefer hardreset
When both soft and hard resets are available, libata preferred
softreset till now. The logic behind it was to be softer to devices;
however, this doesn't really help much. Rationales for the change:
* BIOS may freeze lock certain things during boot and softreset can't
unlock those. This by itself is okay but during operation PHY event
or other error conditions can trigger hardreset and the device may
end up with different configuration.
For example, after a hardreset, previously unlockable HPA can be
unlocked resulting in different device size and thus revalidation
failure. Similar condition can occur during or after resume.
* Certain ATAPI devices require hardreset to recover after certain
error conditions. On PATA, this is done by issuing the DEVICE RESET
command. On SATA, COMRESET has equivalent effect. The problem is
that DEVICE RESET needs its own execution protocol.
For SFF controllers with bare TF access, it can be easily
implemented but more advanced controllers (e.g. ahci and sata_sil24)
require specialized implementations. Simply using hardreset solves
the problem nicely.
* COMRESET initialization sequence is the norm in SATA land and many
SATA devices don't work properly if only SRST is used. For example,
some PMPs behave this way and libata works around by always issuing
hardreset if the host supports PMP.
Like the above example, libata has developed a number of mechanisms
aiming to promote softreset to hardreset if softreset is not going
to work. This approach is time consuming and error prone.
Also, note that, dependingon how you read the specs, it could be
argued that PMP fan-out ports require COMRESET to start operation.
In fact, all the PMPs on the market except one don't work properly
if COMRESET is not issued to fan-out ports after PMP reset.
* COMRESET is an integral part of SATA connection and any working
device should be able to handle COMRESET properly. After all, it's
the way to signal hardreset during reboot. This is the most used
and recommended (at least by the ahci spec) method of resetting
devices.
So, this patch makes libata prefer hardreset over softreset by making
the following changes.
* Rename ATA_EH_RESET_MASK to ATA_EH_RESET and use it whereever
ATA_EH_{SOFT|HARD}RESET used to be used. ATA_EH_{SOFT|HARD}RESET is
now only used to tell prereset whether soft or hard reset will be
issued.
* Strip out now unneeded promote-to-hardreset logics from
ata_eh_reset(), ata_std_prereset(), sata_pmp_std_prereset() and
other places.
Signed-off-by: Tejun Heo <htejun at gmail.com>
commit 36b30ea940bb88d88c90698e0e3d97a805ab5856
Author: Jeff Garzik <jeff at garzik.org>
Date: Tue Oct 16 01:40:30 2007 -0400
[netdrvr] forcedeth: internal simplifications; changelog removal
* remove changelog from source; its kept in git repository
* consolidate descriptor version tests using nv_optimized()
* consolidate NIC DMA start, stop and drain into
nv_start_txrx(), nv_stop_txrx(), nv_drain_txrx()
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit cac1f3c8a80f3fc0b4489d1d3ba29214677ffab2
Author: Paul Gortmaker <paul.gortmaker at windriver.com>
Date: Tue Apr 15 12:49:21 2008 -0400
phylib: factor out get_phy_id from within get_phy_device
We were already doing what amounts to a get_phy_id from within
get_phy_device, and rather than duplicate this for the TBIPA
probing, we might as well just factor it out and make it available
instead.
Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
Acked-by: Andy Fleming <afleming at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b1394f961a90a7195ea177ee56d54fe5c37181ca
Author: Paul Gortmaker <paul.gortmaker at windriver.com>
Date: Mon Apr 14 23:35:41 2008 -0400
PHY: add BCM5464 support to broadcom PHY driver
The BCM5464 can be used with the current broadcom PHY driver
by just adding the appropriate chip ID and using the existing
support within.
Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d96a51f6b8040ef2b25b88032f23ffdb1ddba681
Author: Dan Noe <dpn at isomerica.net>
Date: Sat Apr 12 22:34:38 2008 -0400
cxgb3: Fix __must_check warning with dev_dbg.
Fix the warning:
drivers/net/cxgb3/cxgb3_main.c: In function ‘offload_open’:
drivers/net/cxgb3/cxgb3_main.c:936: warning: ignoring return value of
‘sysfs_create_group’, declared with attribute warn_unused_result
Now the return value is checked; if sysfs_create_group() returns failure,
a warning is printed using dev_dbg, and the code continues as before. Use
of dev_dbg ensures printk is not needlessly included unless desired for
debugging.
Signed-off-by: Dan Noe <dpn at isomerica.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 10e05f78c5566cb762ced12bf70307c60168d56e
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Sun Apr 13 00:11:46 2008 +0900
tc35815: Statistics cleanup
On Sat, 12 Apr 2008 05:00:49 -0400, Jeff Garzik <jeff at garzik.org> wrote:
> applied 1-6
Thanks.
Could you apply this too, or hopufully fold into Andy Fleming's "phy:
Change mii_bus id field to a string" patch (commit c69fedae) ?
------------------------------------------------------
Subject: [PATCH] tc35815: build fix
Fix build failure caused by Andy Fleming's "phy: Change mii_bus id
field to a string" patch.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 703bb99ca73aa38d3f200d4c7e9bb460dce35fda
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Sat Apr 12 20:58:30 2008 +0400
natsemi: fix MMIO for PPC 44x platforms
The driver stores the PCI resource address into 'unsigned long' variable before
calling ioremap() on it. This warrants a kernel oops when the registers are
accessed on PPC 44x platforms which (being 32-bit) have PCI memory space mapped
beyond 4 GB.
The arch/ppc/ kernel has a fixup in ioremap() that creates an illusion of the
PCI memory resources are mapped below 4 GB, but arch/powerpc/ code got rid of
this trick, having instead CONFIG_RESOURCES_64BIT enabled.
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1a9a3e76dde191f82f7a8a66059dcbb4a9f63ff3
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Tue Apr 1 16:55:28 2008 -0500
kgdb: always use icache flush for sw breakpoints
On the ppc 4xx architecture the instruction cache must be flushed as
well as the data cache. This patch just makes it generic for all
architectures where CACHE_FLUSH_IS_SAFE is set to 1.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 56fb70932964927597ce30bbd820471633c72adc
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Tue Apr 1 16:55:27 2008 -0500
kgdb: fix SMP NMI kgdb_handle_exception exit race
Fix the problem of protecting the kgdb handle_exception exit
which had an NMI race condition, while trying to restore
normal system operation.
There was a small window after the master processor sets cpu_in_debug
to zero but before it has set kgdb_active to zero where a
non-master processor in an SMP system could receive an NMI and
re-enter the kgdb_wait() loop.
As long as the master processor sets the cpu_in_debug before sending
the cpu roundup the cpu_in_debug variable can also be used to guard
against the race condition.
The kgdb_wait() function no longer needs to check
kgdb_active because it is done in the arch specific code
and handled along with the nmi traps at the low level.
This also allows kgdb_wait() to exit correctly if it was
entered for some unknown reason due to a spurious NMI that
could not be handled by the arch specific code.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 225a4424ade24e913c081d5a4c4bd71a0fe2e0ac
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Tue Apr 1 16:55:26 2008 -0500
kgdb: documentation fixes
Minor cleanups to kgdb docs.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 974460c5bfd9f6c38aa3dda189a63f9fc351035f
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Thu Mar 20 13:43:44 2008 -0500
kgdb: allow static kgdbts boot configuration
This patch adds in the ability to compile the kgdb internal test
string into the kernel so as to run the tests at boot without changing
the kernel boot arguments. This patch also changes all the error
paths to invoke WARN_ON(1) which will emit the line number of the file
and dump the kernel stack when an error occurs.
You can disable the tests in a kernel that is built this way
using "kgdbts="
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e3e2aaf7dc0d82a055e084cfd48b9257c0c66b68
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Thu Mar 20 13:43:45 2008 -0500
kgdb: add documentation
Add in the kgdb documentation for kgdb.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4a1b5502d426df09b9ba1cbcc74fd09702a74cd8
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Fri Mar 7 15:51:16 2008 -0800
kgdb: Kconfig fix
ERROR: "uart_parse_options" [drivers/serial/serial_core.ko] undefined!
Cc: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e8d31c204e36e019b9134f2a11926cac0fcf9b19
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Mar 7 16:34:17 2008 -0600
kgdb: add kgdb internal test suite
This patch adds regression tests for testing the kgdb core and arch
specific implementation.
The kgdb test suite is designed to be built into the kernel and not as
a module because it uses a number of low level kernel and kgdb
primitives which should not be exported externally.
The kgdb test suite is designed as a KGDB I/O module which
simulates the communications that a debugger would have with kgdb.
The tests are broken up in to a line by line and referenced here as
a "get" which is kgdb requesting input and "put" which is kgdb
sending a response.
The kgdb suite can be invoked from the kernel command line
arguments system or executed dynamically at run time. The test
suite uses the variable "kgdbts" to obtain the information about
which tests to run and to configure the verbosity level. The
following are the various characters you can use with the kgdbts=
line:
When using the "kgdbts=" you only choose one of the following core
test types:
A = Run all the core tests silently
V1 = Run all the core tests with minimal output
V2 = Run all the core tests in debug mode
You can also specify optional tests:
N## = Go to sleep with interrupts of for ## seconds
to test the HW NMI watchdog
F## = Break at do_fork for ## iterations
S## = Break at sys_open for ## iterations
NOTE: that the do_fork and sys_open tests are mutually exclusive.
To invoke the kgdb test suite from boot you use a kernel start
argument as follows:
kgdbts=V1 kgdbwait
Or if you wanted to perform the NMI test for 6 seconds and do_fork
test for 100 forks, you could use:
kgdbts=V1N6F100 kgdbwait
The test suite can also be invoked at run time with:
echo kgdbts=V1N6F100 > /sys/module/kgdbts/parameters/kgdbts
Or as another example:
echo kgdbts=V2 > /sys/module/kgdbts/parameters/kgdbts
When developing a new kgdb arch specific implementation or
using these tests for the purpose of regression testing,
several invocations are required.
1) Boot with the test suite enabled by using the kernel arguments
"kgdbts=V1F100 kgdbwait"
## If kgdb arch specific implementation has NMI use
"kgdbts=V1N6F100
2) After the system boot run the basic test.
echo kgdbts=V1 > /sys/module/kgdbts/parameters/kgdbts
3) Run the concurrency tests. It is best to use n+1
while loops where n is the number of cpus you have
in your system. The example below uses only two
loops.
## This tests break points on sys_open
while [ 1 ] ; do find / > /dev/null 2>&1 ; done &
while [ 1 ] ; do find / > /dev/null 2>&1 ; done &
echo kgdbts=V1S10000 > /sys/module/kgdbts/parameters/kgdbts
fg # and hit control-c
fg # and hit control-c
## This tests break points on do_fork
while [ 1 ] ; do date > /dev/null ; done &
while [ 1 ] ; do date > /dev/null ; done &
echo kgdbts=V1F1000 > /sys/module/kgdbts/parameters/kgdbts
fg # and hit control-c
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 737a460f21febe551ff1d2299b63bae9b154078f
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Mar 7 16:34:16 2008 -0600
kgdb: fix several kgdb regressions
kgdb core fixes:
- Check to see that mm->mmap_cache is not null before calling
flush_cache_range(), else on arch=ARM it will cause a fatal
fault.
- Breakpoints should only be restored if they are in the BP_ACTIVE
state.
- Fix a typo in comments to "kgdb_register_io_module"
x86 kgdb fixes:
- Fix the x86 arch handler such that on a kill or detach that the
appropriate cleanup on the single stepping flags gets run.
- Add in the DIE_NMIWATCHDOG call for x86_64
- Touch the nmi watchdog before returning the system to normal
operation after performing any kind of kgdb operation, else
the possibility exists to trigger the watchdog.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 84b5ae15216aa3ea0314f395536ef9829af21e14
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Wed Feb 20 13:33:39 2008 -0600
kgdb: kgdboc pl011 I/O module
Implement the serial polling hooks for the pl011 uart for use with
kgdboc.
This patch was specifically tested on the ARM Versatile AB reference
platform.
[ mingo at elte.hu: minor cleanups. ]
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b4b8ac524d9b6ed7229017145afa1d7afbea4a48
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Wed Feb 20 13:33:38 2008 -0600
kgdb: fix optional arch functions and probe_kernel_*
Fix two regressions dealing with the kgdb core.
1) kgdb_skipexception and kgdb_post_primary_code are optional
functions that are only required on archs that need special exception
fixups.
2) The kernel address space scope must be set on any probe_kernel_*
function or archs such as ARCH=arm will not allow access to the kernel
memory space. As an example, it is required to allow the full kernel
address space is when you the kernel debugger to inspect a system
call.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 64e9ee3095b61d0300ea548216a57d2536611309
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Feb 15 14:55:56 2008 -0600
kgdb: add x86 HW breakpoints
Add HW breakpoints into the arch specific portion of x86 kgdb. In the
current x86 kernel.org kernels HW breakpoints are changed out in lazy
fashion because there is no infrastructure around changing them when
changing to a kernel task or entering the kernel mode via a system
call. This lazy approach means that if a user process uses HW
breakpoints the kgdb will loose out. This is an acceptable trade off
because the developer debugging the kernel is assumed to know what is
going on system wide and would be aware of this trade off.
There is a minor bug fix to the kgdb core so as to correctly call the
hw breakpoint functions with a valid value from the enum.
There is also a minor change to the x86_64 startup code when using
early HW breakpoints. When the debugger is connected, the cpu startup
code must not zero out the HW breakpoint registers or you cannot hit
the breakpoints you are interested in, in the first place.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 67baf94cd260dc37504dbd15ba3faa2d8cf8a444
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Feb 15 14:55:55 2008 -0600
kgdb: print breakpoint removed on exception
If kgdb does remove a breakpoint that had a problem on the recursion
check, it should also print the address of the breakpoint.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7c3078b637882303b1dcf6a16229d0e35f6b60a5
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Feb 15 14:55:54 2008 -0600
kgdb: clocksource watchdog
In order to not trip the clocksource watchdog, kgdb must touch the
clocksource watchdog on the return to normal system run state.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d359752407f8916c29ad53a5c30ac73e338f2797
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Feb 15 14:55:53 2008 -0600
kgdb: fix NMI hangs
This patch fixes the hang regression with kgdb when the NMI interrupt
comes in while the master core is returning from an exception.
Adjust the NMI logic such that KGDB will not stop NMI exceptions from
occurring by in general returning NOTIFY_DONE. It is not possible to
distinguish the debug NMI sync vs the normal NMI apic interrupt so
kgdb needs to catch the unknown NMI if it the debugger was previously
active on one of the cpus.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit c191e5ad6b3fd8cc84b2b6d62c02fcd6837c8a8f
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Feb 15 14:55:52 2008 -0600
kgdb: fix kgdboc dynamic module configuration
Fix the run time configuration of kgdboc such that it does not default
to 9600 baud if you use the "echo" command to configure the sysfs
module paramater.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 6cdf6e06d70dcf42314edb2c43b7c7ebc56e32e5
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Thu Apr 17 20:05:38 2008 +0200
kgdb: document parameters
document the kgdboc module/boot parameter.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Jan Kiszka <jan.kiszka at web.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 82da3ff89dc2a1842cff9b0d4cbc345cb90b59e1
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu Apr 17 20:05:37 2008 +0200
x86: kgdb support
simplified and streamlined kgdb support on x86, both 32-bit and 64-bit,
based on patch from:
Subject: kgdb: core-lite
From: Jason Wessel <jason.wessel at windriver.com>
[ and countless other authors - see the patch for details. ]
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Jan Kiszka <jan.kiszka at web.de>
Reviewed-by: Thomas Gleixner <tglx at linutronix.de>
commit f2d937f3bf00665ccf048b3b6616ef95859b0945
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Thu Apr 17 20:05:37 2008 +0200
consoles: polling support, kgdboc
polled console handling support, to access a console in an irq-less
way while in debug or irq context.
absolutely zero impact as long as CONFIG_CONSOLE_POLL is disabled.
(which is the default)
[ jan.kiszka at siemens.com: lots of cleanups ]
[ mingo at elte.hu: redesign, splitups, cleanups. ]
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Jan Kiszka <jan.kiszka at web.de>
Reviewed-by: Thomas Gleixner <tglx at linutronix.de>
commit dc7d552705215ac50a0617fcf51bb9c736255b8e
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Thu Apr 17 20:05:37 2008 +0200
kgdb: core
kgdb core code. Handles the protocol and the arch details.
[ mingo at elte.hu: heavily modified, simplified and cleaned up. ]
[ xemul at openvz.org: use find_task_by_pid_ns ]
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Jan Kiszka <jan.kiszka at web.de>
Reviewed-by: Thomas Gleixner <tglx at linutronix.de>
commit c33fa9f5609e918824446ef9a75319d4a802f1f4
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu Apr 17 20:05:36 2008 +0200
uaccess: add probe_kernel_write()
add probe_kernel_read() and probe_kernel_write().
Uninlined and restricted to kernel range memory only, as suggested
by Linus.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Reviewed-by: Thomas Gleixner <tglx at linutronix.de>
commit 0e4ff797d7f2f2bb860b8f31dc5d1f2273b2f05a
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu Apr 17 12:37:01 2008 +0300
[SCSI] qla1280: remove version check
There's no point for an in-kernel driver to check whether it's compiled
under kernel < 2.6.0 .
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Jes Sorensen <jes at sgi.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 17b7a8de3bf1eb2cba14d5c8d919e55d511d8a71
Author: Al Viro <viro at ZenIV.linux.org.uk>
Date: Wed Apr 16 23:27:45 2008 +0100
[SCSI] libsas: fix endianness bug in sas_ata
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit ee95a16d3950367d32beb6ffed287666631dbda9
Author: Martin Peschke <mp3 at de.ibm.com>
Date: Thu Apr 17 00:08:03 2008 +0200
[SCSI] zfcp: fix compiler warning caused by poking inside new semaphore (linux-next)
as seen in linux-next tree:
drivers/s390/scsi/zfcp_dbf.c: In function ‘zfcp_rec_dbf_event_thread’:
drivers/s390/scsi/zfcp_dbf.c:697: warning: passing argument 1 of ‘atomic_read’
from incompatible pointer type
Caused by recent git commit:
commit 348447e85749120ad600a5c8e23b6bb7058b931d
Author: Martin Peschke <mp3 at de.ibm.com>
Date: Thu Mar 27 14:22:01 2008 +0100
[SCSI] zfcp: Add trace records for recovery thread and its queues
We are not supposed to poke inside semaphore.
Signed-off-by: Martin Peschke <mp3 at de.ibm.com>
Acked-by: Christof Schmitt <christof.schmitt at de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 71b264f85ff50c14fe945ffff06ae0d5e9a9124e
Merge: f4df39cbdd9e9ab615e80148cc271db22a8508ad 072f042df335d7e0da2027637bcf720d7ff1589b
Author: Tony Luck <tony.luck at intel.com>
Date: Thu Apr 17 10:14:51 2008 -0700
Pull miscellaneous into release branch
Conflicts:
arch/ia64/kernel/mca.c
commit f4df39cbdd9e9ab615e80148cc271db22a8508ad
Merge: a49072bb367a94a9af6c6a6dcbaa1dc5617d7fa0 a6c75b86ce9f01db4ea9912877b526c2dc4d2f0a
Author: Tony Luck <tony.luck at intel.com>
Date: Thu Apr 17 10:13:57 2008 -0700
Pull nptcg into release branch
Conflicts:
arch/ia64/mm/tlb.c
commit a49072bb367a94a9af6c6a6dcbaa1dc5617d7fa0
Merge: fc494d6c1825de37f04abe147741d50be08403ab 31a6b11fed6ceec07ec4bdfefae56b8252d450cf
Author: Tony Luck <tony.luck at intel.com>
Date: Thu Apr 17 10:13:09 2008 -0700
Pull kvm-patches into release branch
commit fc494d6c1825de37f04abe147741d50be08403ab
Merge: 78514c106b90b628a90c630a3bc87a6538aed865 2c6e6db41f01b6b4eb98809350827c9678996698
Author: Tony Luck <tony.luck at intel.com>
Date: Thu Apr 17 10:12:55 2008 -0700
Pull percpureserve into release branch
commit 78514c106b90b628a90c630a3bc87a6538aed865
Merge: 14d0647c98f52e2d76113d44de6b771ec87a934f 4cd8dc83581906948ff4cfa65007e64496b5a7c8
Author: Tony Luck <tony.luck at intel.com>
Date: Thu Apr 17 10:12:44 2008 -0700
Pull regset into release branch
commit 14d0647c98f52e2d76113d44de6b771ec87a934f
Merge: 2a467d5f7d6bdc90c365db167a10022dd8351894 b64f34cdfe5bef9dfed1304c513220b0f2862eca
Author: Tony Luck <tony.luck at intel.com>
Date: Thu Apr 17 10:12:27 2008 -0700
Pull virt-cpu-accounting into release branch
commit 2a467d5f7d6bdc90c365db167a10022dd8351894
Merge: 4b119e21d0c66c22e8ca03df05d9de623d0eb50f 4fe01c68eba53c3f324807faff71535218c41e9c
Author: Tony Luck <tony.luck at intel.com>
Date: Thu Apr 17 10:12:07 2008 -0700
Pull fsys_gettimeofday into release branch
commit 79b34afa68de4088081bcb7b4aed0fc4d8bf3618
Author: David Anders <danders at amltd.com>
Date: Thu Apr 10 22:36:59 2008 +0100
[ARM] 4963/1: S3C2410 - add basic machine support for the TCT Hammer
Add the TinCanTools Hammer board to list of supported machines in the
arch/arm/mach-s3c2410 directory, as well as a default config entry. the
mach-tct_hammer.c file initializes basic i/o, clocks, irqs, as well as
the mtd flash layout if enabled in the kernel configuration.
Signed-off-by: David Anders <danders at amltd.com>
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit de56a2f9228477866449963c2aff9df4728ea7fb
Author: Davide Rizzo <davide at elpa.it>
Date: Sun Mar 30 08:58:33 2008 +0100
[ARM] 4883/1: Adds some missing gpio defines for S3C2410
This is a small addition of forgotten defines to regs-gpio.h include file for the Samsung S3C2410 ARM9 SoC
Signed-off-by: Davide Rizzo <davide at elpa.it>
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 3c7d9c81e1302c244180e62999a08ca95b175cf5
Author: Ben Dooks <ben-linux at fluff.org>
Date: Wed Apr 16 00:15:20 2008 +0100
[ARM] 4987/1: S3C24XX: Ensure watchdog reset initiated from cached code.
There seems to be some problem with at-least the S3C2440 and
bus traffic during an reset. It is unlikely, but still possible
that the system will hang in such a way that the watchdog cannot
get the system out of the state it is in.
Change to making the code that calls the watchdog reset run from
cached memory so that instruction fetches have quiesced before the
watchdog fires.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit d96a980441a70168a8ead0a0f23c4c63725da5fa
Author: Ben Dooks <ben-linux at fluff.org>
Date: Wed Apr 16 00:12:39 2008 +0100
[ARM] 4986/1: S3C24XX: Simtec machines need UCLK as parent to DCLK
All current Simtec designs source the DCLK outputs from
the UPLL. This means the DCLK's parent must be set to UPLL
so that anything enabling and disabling an UPLL sourced
clock does not shutdown the DCLK due to missing open counts.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 1017be88d341c05adc8d790d8092781b7330dafd
Author: Ben Dooks <ben-linux at fluff.org>
Date: Wed Apr 16 00:08:36 2008 +0100
[ARM] 4985/1: S3C2412: Fix ARMDIVN name in CLKDIVN definition.
Fix the name of the S3C2412_CLKDIVN_ARMDIVN define.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 6ddc4b07a2669bdb8b90e3e12fb1ccfb6dc4a99c
Author: Ben Dooks <ben-linux at fluff.org>
Date: Wed Apr 16 00:06:14 2008 +0100
[ARM] 4984/1: S3C24XX: Do not assert nRSTOUT on BAST over suspend.
Change GPA21 to output over reset so that nRSTOUT is not
asserted whilst suspended.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit c63fc13f806b11576e8c41969d4b1598dd261d80
Author: Ben Dooks <ben-linux at fluff.org>
Date: Wed Apr 16 00:04:19 2008 +0100
[ARM] 4983/1: S3C2412: Add initial memory controller registers
Add initial defines for the S3C2412's memory controller registers.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 77ad386e596c6b0930cc2e09e3cce485e3ee7f72
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Mar 21 15:23:19 2008 +0100
x86: standalone trampoline code
move the trampoline setup code out of smpboot.c - UP kernels can have
suspend support too.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e44b7b7525ad9d43163ab5e60c784325419e0ea6
Author: Pavel Machek <pavel at suse.cz>
Date: Thu Apr 10 23:28:10 2008 +0200
x86: move suspend wakeup code to C
Move wakeup code to .c, so that video mode setting code can be shared
between boot and wakeup. Remove nasty assembly code in 64-bit case by
re-using trampoline code. Stack setup was fixed to clear high 16bits
of %esp, maybe that fixes some machines.
.c code sharing and morse code was done H. Peter Anvin, Sam Ravnborg
reviewed kbuild related stuff, and it seems okay to him. Rafael did
some cleanups.
[rjw:
* Made the patch stop breaking compilation on x86-32
* Added arch/x86/kernel/acpi/sleep.h
* Got rid of compiler warnings in arch/x86/kernel/acpi/sleep.c
* Fixed 32-bit compilation on x86-64 systems
* Added include/asm-x86/trampoline.h and fixed the non-SMP
compilation on 64-bit x86
* Removed arch/x86/kernel/acpi/sleep_32.c which was not used
* Fixed some breakage caused by the integration of smpboot.c done
under us in the meantime]
Signed-off-by: Pavel Machek <pavel at suse.cz>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
Reviewed-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f49688d459c5eaa62db3597cbfd3cb13e361d415
Author: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Date: Fri Feb 22 23:11:39 2008 +0100
x86: coding style fixes to arch/x86/kernel/acpi/sleep.c
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e223f162a1d37aeeaa6c1ee37d81cc084aa2b004
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Thu Apr 10 21:16:41 2008 +0200
x86: setup_trampoline() - fix section mismatch warning
this patch fixes section mismatch warnings (on x86_64 host) in setup_trampoline(),
which was referencing __initdata variables trampoline_data and trampoline_end.
Warning messages:
WARNING: arch/x86/kernel/built-in.o(.cpuinit.text+0x2b6a): Section mismatch in reference from the function setup_trampoline()
to the variable .init.data:trampoline_data
The function __cpuinit setup_trampoline() references
a variable __initdata trampoline_data.
If trampoline_data is only used by setup_trampoline then
annotate trampoline_data with a matching annotation.
WARNING: arch/x86/kernel/built-in.o(.cpuinit.text+0x2b71): Section mismatch in reference from the function setup_trampoline()
to the variable .init.data:trampoline_end
The function __cpuinit setup_trampoline() references
a variable __initdata trampoline_end.
If trampoline_end is only used by setup_trampoline then
annotate trampoline_end with a matching annotation.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit df96323dfaebdf7e17cdf0656096e6ab2158ec76
Author: Jacek Luczak <difrost.kernel at gmail.com>
Date: Fri Apr 11 13:28:37 2008 +0200
x86: section mismatch fixes, #1
This patch fixes mismatch warnings in smp_checks() (in arch/x86/kernel/smpboot.c):
WARNING: arch/x86/kernel/built-in.o(.text+0x11922): Section mismatch in reference from the function smp_checks()
to the variable .cpuinit.data:smp_b_stepping
The function smp_checks() references
the variable __cpuinitdata smp_b_stepping.
This is often because smp_checks lacks a __cpuinitdata
annotation or the annotation of smp_b_stepping is wrong.
Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 63d38198a0f57dca87e6cb79931c7bedbb7ab069
Author: Alok Kataria <akataria at vmware.com>
Date: Mon Apr 7 11:38:33 2008 -0700
x86: fix paranoia about using BIOS quickboot mechanism.
> > Make sure that we clear the "shutdown status flag" in the CMOS
> > register after each CPU is brought up. This fixes a problem where the
> > "shutdown status flag" may remain set when a CPU is brought up after
> > booting.
>
> btw., what problem does this result in, exactly?
The shutdown status flag set to "0xA", corresponds to "JMP double word
request without INT init".
This JMP at reboot time is at an unintended location. And results in
Triple faults in our case.
Though this error at reboot can be safely ignored in a VM environment,
am not sure what the effect would be on a physical system. May be it
will result in a triple fault and an eventual hardware reset thus
masking this BUG in the kernel.
This fix just makes sure that we reset that status flag after
initialization is done.
Fix paranoia about using BIOS quickboot mechanism.
Make sure that we clear the "shutdown status flag" in the CMOS register
after each CPU is brought up. This fixes a problem where the "shutdown
status flag" may remain set when a CPU is brought up after booting.
Signed-off-by: Alok N Kataria <akataria at vmware.com>
Signed-off-by: Dan Arai <arai at vmware.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 711554dbc4d5402338ce115dca0df38e9f633330
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date: Mon Apr 7 11:36:39 2008 -0700
x86: print out buggy mptable
print out buggy mptable, instead of skipping it quietly
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 6107a7c4e2a871c37bb6c49e5e8286079f0968f9
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 5 22:39:09 2008 +0900
x86: use cpu_online()
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7281c96f37f784d64b0241a7b082bb13bab9580b
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 5 22:39:08 2008 +0900
x86: use cpumask_of_cpu()
Use cpumask_of_cpu() rather than the pair of cpus_clear() and cpu_set().
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit addfc66bb55234c154bb43f0f7606bc5c9fc511d
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 5 22:39:07 2008 +0900
x86: remove unnecessary tmp local variable
There is no reason to use obscurer name.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 07004b12a1199f82c016eb976f493e5b70820a1d
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 5 22:39:06 2008 +0900
x86: remove unnecessary memset()
No need to clear the memory allocated by alloc_bootmem().
It is already filled with zero.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit a2249cba2f1d7d06633de09c71353ae6b1567206
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 5 22:39:05 2008 +0900
x86: use ioapic_read_entry() and ioapic_write_entry()
Remove duplicate code by using ioapic_read_entry() and ioapic_write_entry()
in io_apic_{32,64}.c
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9d25cb0811fd0bca2cfd80095ee7663147363f68
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Sat Apr 5 22:39:04 2008 +0900
x86: avoid redundant loop in io_apic_level_ack_pending()
If one can find an ack pending pin, there is no need to check
the rest of them.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 03056c88cf65ec8375753900246b36ae1c4b8a33
Author: Alexander van Heukelum <heukelum at mailshack.com>
Date: Sun Apr 6 14:47:00 2008 +0200
x86: remove superfluous initialisation in boot code.
In arch/x86/boot/compressed/misc.c, the variable vidmem is
the only variable that ends up in de data segment. It's also
superfluous, because the first thing the code does is:
if (RM_SCREEN_INFO.orig_video_mode == 7) {
vidmem = (char *) 0xb0000;
vidport = 0x3b4;
} else {
vidmem = (char *) 0xb8000;
vidport = 0x3d4;
}
This patch removes the initialisation.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 85bdddec5eaeb2464bf1cad6a17225416e65a8d6
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Fri Apr 4 23:43:18 2008 +0400
x86: merge mpparse_{32,64}.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit cfa08d6cc3421bb08ebaa34467107e58999a7c28
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Fri Apr 4 23:43:12 2008 +0400
x86: unify mp_register_gsi
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit c769bfee5731f2614983bd7a9079eb90514e4b9f
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Fri Apr 4 23:43:06 2008 +0400
x86: unify mp_config_acpi_legacy_irqs
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 57b733e902f179dc453609db6334f8e9801cbb7a
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Fri Apr 4 23:43:00 2008 +0400
x86: unify mp_register_ioapic
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 22cbb4bd12a86b80125accb77515482894ee670f
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Fri Apr 4 23:42:53 2008 +0400
x86: unify uniq_io_apic_id
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 92fd4b7abdb2b5b85d73ca0adbb6ad3f8b79f805
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Fri Apr 4 23:42:46 2008 +0400
x86: unify smp_scan_config
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4421b1c8b9f5da24f8c737ede2c05d399dea2015
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Fri Apr 4 23:42:40 2008 +0400
x86: unify get_smp_config
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Ingo Molnar <