development kernel tree: Changes to 'master'
git at git.openmoko.org
git at git.openmoko.org
Sun Jun 22 09:38:53 CEST 2008
.gitignore | 1 +
Documentation/SubmittingPatches | 46 +
Documentation/cciss.txt | 5 +
Documentation/cpusets.txt | 11 +-
Documentation/filesystems/ext4.txt | 12 +-
Documentation/filesystems/sysfs-pci.txt | 1 +
Documentation/hwmon/sysfs-interface | 33 +-
Documentation/kernel-doc-nano-HOWTO.txt | 99 ++
Documentation/kernel-docs.txt | 8 +-
Documentation/kobject.txt | 2 +-
Documentation/laptops/thinkpad-acpi.txt | 2 +-
Documentation/networking/arcnet.txt | 2 +-
Documentation/video4linux/CARDLIST.cx88 | 2 +-
Documentation/video4linux/cx18.txt | 4 +-
Documentation/vm/pagemap.txt | 77 +
MAINTAINERS | 54 +-
Makefile | 4 +-
arch/alpha/Makefile | 1 +
arch/alpha/kernel/core_t2.c | 2 +
arch/alpha/kernel/pci.c | 17 +
arch/alpha/kernel/traps.c | 3 +-
arch/arm/boot/compressed/head-xscale.S | 4 -
arch/arm/mach-pxa/cm-x270.c | 2 +-
arch/arm/mach-pxa/em-x270.c | 2 +-
arch/arm/mach-pxa/ssp.c | 2 +-
arch/arm/mach-pxa/tosa.c | 4 +-
arch/blackfin/kernel/traps.c | 8 +-
arch/blackfin/mach-bf527/boards/ezkit.c | 9 +-
arch/blackfin/mach-bf533/boards/ezkit.c | 6 +-
arch/blackfin/mach-bf533/boards/stamp.c | 10 +-
arch/blackfin/mach-bf537/boards/stamp.c | 9 +-
arch/blackfin/mach-bf548/boards/ezkit.c | 10 +-
arch/blackfin/mach-bf561/boards/ezkit.c | 9 +-
arch/frv/kernel/cmode.S | 2 +-
arch/frv/kernel/sleep.S | 2 +-
arch/frv/mb93090-mb00/pci-dma-nommu.c | 2 +-
arch/ia64/Makefile | 1 +
arch/ia64/kernel/acpi.c | 9 +-
arch/ia64/kernel/perfmon.c | 10 +-
arch/ia64/kernel/sal.c | 7 +-
arch/ia64/kvm/mmio.c | 3 +-
arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 +
arch/ia64/uv/kernel/setup.c | 12 +
arch/m68k/configs/amiga_defconfig | 6 +-
arch/m68k/configs/apollo_defconfig | 6 +-
arch/m68k/configs/atari_defconfig | 6 +-
arch/m68k/configs/bvme6000_defconfig | 6 +-
arch/m68k/configs/hp300_defconfig | 6 +-
arch/m68k/configs/mac_defconfig | 6 +-
arch/m68k/configs/multi_defconfig | 6 +-
arch/m68k/configs/mvme147_defconfig | 6 +-
arch/m68k/configs/mvme16x_defconfig | 6 +-
arch/m68k/configs/q40_defconfig | 6 +-
arch/m68k/configs/sun3_defconfig | 6 +-
arch/m68k/configs/sun3x_defconfig | 6 +-
arch/m68knommu/platform/coldfire/timers.c | 8 +-
arch/mips/Makefile | 18 +-
arch/mips/au1000/common/clocks.c | 1 +
arch/mips/au1000/common/dbdma.c | 11 +
arch/mips/au1000/common/platform.c | 4 +-
arch/mips/configs/sb1250-swarm_defconfig | 676 ++++----
arch/mips/configs/tb0219_defconfig | 192 ++--
arch/mips/configs/tb0226_defconfig | 192 ++--
arch/mips/configs/tb0287_defconfig | 207 ++--
arch/mips/fw/arc/identify.c | 5 +
arch/mips/kernel/Makefile | 1 -
arch/mips/kernel/smp.c | 2 +
arch/mips/kernel/traps.c | 16 +-
arch/mips/lasat/interrupt.c | 2 +
arch/mips/lasat/lasat_board.c | 13 +-
arch/mips/lasat/sysctl.c | 172 +--
arch/mips/lasat/sysctl.h | 24 -
arch/mips/mips-boards/generic/amon.c | 4 +-
arch/mips/mips-boards/generic/time.c | 19 -
arch/mips/mips-boards/malta/Makefile | 3 +-
arch/mips/mm/c-r4k.c | 33 +-
arch/mips/mm/init.c | 1 +
arch/mips/mm/page.c | 10 +-
arch/mips/mm/tlbex.c | 3 +-
arch/mips/nxp/pnx8550/jbs/board_setup.c | 11 +-
arch/mips/nxp/pnx8550/stb810/board_setup.c | 10 +-
arch/mips/pci/ops-bridge.c | 20 +-
arch/mips/pci/pci-ip27.c | 8 +
arch/mips/pci/pci-sb1250.c | 8 +-
arch/mips/pci/pci-vr41xx.c | 14 +-
arch/mips/sgi-ip27/ip27-init.c | 22 -
arch/mips/sgi-ip27/ip27-memory.c | 117 +--
arch/mips/sgi-ip27/ip27-smp.c | 5 +-
arch/mips/sgi-ip27/ip27-timer.c | 27 +-
arch/mips/sibyte/swarm/Makefile | 4 +-
arch/mn10300/kernel/process.c | 1 -
arch/mn10300/kernel/setup.c | 1 -
arch/parisc/hpux/gate.S | 3 +-
arch/parisc/hpux/wrappers.S | 3 +-
arch/parisc/kernel/entry.S | 3 +-
arch/parisc/kernel/head.S | 1 +
arch/parisc/kernel/hpmc.S | 3 +-
arch/parisc/kernel/pacache.S | 3 +-
arch/parisc/kernel/parisc_ksyms.c | 3 +
arch/parisc/kernel/perf_asm.S | 2 +-
arch/parisc/kernel/real2.S | 13 +-
arch/parisc/kernel/signal32.c | 4 +-
arch/parisc/kernel/syscall.S | 5 +-
arch/parisc/kernel/vmlinux.lds.S | 1 +
arch/parisc/lib/fixup.S | 3 +-
arch/parisc/lib/lusercopy.S | 5 +-
arch/parisc/mm/init.c | 1 +
arch/powerpc/Makefile | 4 +-
arch/powerpc/boot/Makefile | 6 +-
arch/powerpc/boot/crtsavres.S | 233 +++
arch/powerpc/boot/dts/mpc8377_rdb.dts | 8 +-
arch/powerpc/boot/dts/mpc8378_rdb.dts | 8 +-
arch/powerpc/boot/dts/mpc8379_rdb.dts | 8 +-
arch/powerpc/boot/dts/mpc8548cds.dts | 4 +-
arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 155 ++-
arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 162 ++-
arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 146 +-
arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 150 ++-
arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 157 ++-
arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 150 ++-
arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 146 +-
arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 146 +-
arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 146 +-
arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 224 ++-
arch/powerpc/configs/83xx/sbc834x_defconfig | 140 +-
arch/powerpc/configs/85xx/ksi8560_defconfig | 168 ++-
arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 133 +-
arch/powerpc/configs/85xx/mpc8544_ds_defconfig | 210 ++-
arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 135 +-
arch/powerpc/configs/85xx/mpc8568mds_defconfig | 150 ++-
arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 210 ++-
arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 137 +-
arch/powerpc/configs/85xx/sbc8548_defconfig | 131 +-
arch/powerpc/configs/85xx/sbc8560_defconfig | 135 +-
arch/powerpc/configs/85xx/stx_gp3_defconfig | 152 ++-
arch/powerpc/configs/85xx/tqm8540_defconfig | 147 +-
arch/powerpc/configs/85xx/tqm8541_defconfig | 146 +-
arch/powerpc/configs/85xx/tqm8555_defconfig | 146 +-
arch/powerpc/configs/85xx/tqm8560_defconfig | 146 +-
arch/powerpc/configs/adder875_defconfig | 52 +-
arch/powerpc/configs/ep8248e_defconfig | 124 +-
arch/powerpc/configs/ep88xc_defconfig | 47 +-
arch/powerpc/configs/g5_defconfig | 62 +-
arch/powerpc/configs/linkstation_defconfig | 172 ++-
arch/powerpc/configs/mpc7448_hpc2_defconfig | 136 +-
arch/powerpc/configs/mpc8272_ads_defconfig | 126 +-
arch/powerpc/configs/mpc83xx_defconfig | 151 ++-
arch/powerpc/configs/mpc85xx_defconfig | 230 ++-
arch/powerpc/configs/mpc8610_hpcd_defconfig | 316 ++--
arch/powerpc/configs/mpc8641_hpcn_defconfig | 210 ++-
arch/powerpc/configs/mpc866_ads_defconfig | 128 +-
arch/powerpc/configs/mpc885_ads_defconfig | 47 +-
arch/powerpc/configs/ppc64_defconfig | 66 +-
arch/powerpc/configs/pq2fads_defconfig | 133 +-
arch/powerpc/configs/prpmc2800_defconfig | 153 ++-
arch/powerpc/configs/sbc8641d_defconfig | 150 ++-
arch/powerpc/configs/storcenter_defconfig | 71 +-
arch/powerpc/kernel/head_44x.S | 7 +-
arch/powerpc/kernel/irq.c | 2 +-
arch/powerpc/kernel/pci_64.c | 2 +-
arch/powerpc/kernel/ppc_ksyms.c | 2 -
arch/powerpc/kernel/prom_init_check.sh | 14 +
arch/powerpc/kernel/signal_64.c | 4 +-
arch/powerpc/kernel/vdso.c | 2 +-
arch/powerpc/kvm/44x_tlb.c | 9 +-
arch/powerpc/kvm/booke_guest.c | 33 -
arch/powerpc/kvm/emulate.c | 12 +
arch/powerpc/lib/Makefile | 2 +-
arch/powerpc/lib/crtsavres.S | 229 +++
arch/powerpc/mm/hash_low_64.S | 4 +
arch/powerpc/mm/mem.c | 3 +-
arch/powerpc/platforms/85xx/Kconfig | 1 +
arch/powerpc/platforms/cell/spu_base.c | 44 +-
arch/powerpc/platforms/cell/spufs/run.c | 21 +-
arch/powerpc/platforms/cell/spufs/sched.c | 19 +-
arch/powerpc/platforms/pseries/eeh_driver.c | 11 +-
arch/powerpc/platforms/pseries/nvram.c | 4 +-
arch/powerpc/sysdev/fsl_soc.c | 2 +-
arch/powerpc/xmon/xmon.c | 1 -
arch/s390/Kconfig | 1 +
arch/s390/kernel/smp.c | 2 +-
arch/s390/kvm/diag.c | 2 +-
arch/s390/kvm/interrupt.c | 7 +-
arch/s390/kvm/kvm-s390.c | 13 +-
arch/s390/mm/pgtable.c | 44 +-
arch/s390/mm/vmem.c | 2 +-
arch/sh/Makefile | 2 +
arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 41 +
arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 9 +-
arch/um/drivers/ubd_kern.c | 1 -
arch/um/include/os.h | 2 +-
arch/um/kernel/um_arch.c | 2 +-
arch/um/os-Linux/helper.c | 1 +
arch/um/os-Linux/skas/process.c | 2 +-
arch/um/os-Linux/start_up.c | 25 +-
arch/um/os-Linux/sys-i386/registers.c | 4 +-
arch/um/os-Linux/sys-i386/task_size.c | 31 +-
arch/um/os-Linux/sys-x86_64/task_size.c | 2 +-
arch/um/os-Linux/time.c | 7 +
arch/um/sys-x86_64/ksyms.c | 4 +
arch/x86/Kconfig | 11 +-
arch/x86/Kconfig.debug | 20 +-
arch/x86/boot/a20.c | 3 +-
arch/x86/kernel/entry_32.S | 1 +
arch/x86/kernel/geode_32.c | 5 +-
arch/x86/kernel/head_32.S | 2 +-
arch/x86/kernel/io_apic_32.c | 12 +-
arch/x86/kernel/mfgpt_32.c | 2 +
arch/x86/kernel/nmi_32.c | 9 +-
arch/x86/kernel/pci-dma.c | 14 +-
arch/x86/kernel/process_32.c | 1 +
arch/x86/kernel/process_64.c | 1 +
arch/x86/kernel/rtc.c | 34 +
arch/x86/kernel/setup_32.c | 10 +-
arch/x86/kernel/traps_32.c | 1 +
arch/x86/kernel/tsc_32.c | 18 +-
arch/x86/kvm/i8254.c | 14 +-
arch/x86/kvm/irq.c | 6 +
arch/x86/kvm/irq.h | 2 +
arch/x86/kvm/mmu.c | 3 +-
arch/x86/kvm/paging_tmpl.h | 2 +-
arch/x86/kvm/svm.c | 2 +-
arch/x86/kvm/vmx.c | 3 +-
arch/x86/kvm/x86.c | 2 +-
arch/x86/kvm/x86_emulate.c | 3 +-
arch/x86/lib/copy_user_64.S | 25 +-
arch/x86/lib/copy_user_nocache_64.S | 25 +-
arch/x86/mm/fault.c | 5 +
arch/x86/mm/srat_64.c | 27 -
arch/x86/pci/common.c | 8 +-
arch/x86/pci/init.c | 3 +-
arch/x86/pci/irq.c | 7 +
arch/x86/pci/olpc.c | 5 +-
arch/x86/pci/pci.h | 2 +-
arch/x86/xen/time.c | 13 +-
block/blktrace.c | 10 +-
block/genhd.c | 2 +
drivers/acpi/ac.c | 8 +-
drivers/acpi/bay.c | 16 +-
drivers/acpi/dispatcher/dsfield.c | 5 +-
drivers/acpi/dock.c | 2 +-
drivers/acpi/ec.c | 2 +-
drivers/acpi/executer/exconfig.c | 10 +-
drivers/acpi/glue.c | 6 +
drivers/acpi/hardware/hwsleep.c | 8 +-
drivers/acpi/numa.c | 31 +-
drivers/acpi/parser/psargs.c | 4 +-
drivers/acpi/processor_core.c | 1 -
drivers/acpi/processor_idle.c | 13 +-
drivers/acpi/sleep/proc.c | 6 +
drivers/acpi/system.c | 15 +-
drivers/acpi/tables/tbinstal.c | 25 +-
drivers/acpi/tables/tbxface.c | 2 +-
drivers/acpi/thermal.c | 11 +-
drivers/acpi/utilities/utmisc.c | 2 +-
drivers/acpi/video.c | 3 +-
drivers/ata/Kconfig | 10 +-
drivers/ata/ahci.c | 160 ++-
drivers/ata/ata_piix.c | 7 +
drivers/ata/libata-core.c | 4 +-
drivers/ata/libata-scsi.c | 16 +-
drivers/ata/libata-sff.c | 2 +-
drivers/ata/libata.h | 2 +-
drivers/ata/pata_pcmcia.c | 2 +
drivers/ata/sata_mv.c | 21 +
drivers/atm/eni.h | 1 -
drivers/atm/he.c | 11 +-
drivers/atm/he.h | 13 +-
drivers/atm/iphase.c | 27 +-
drivers/base/core.c | 1 +
drivers/block/brd.c | 1 +
drivers/block/cciss.c | 21 +-
drivers/char/Kconfig | 12 +-
drivers/char/agp/agp.h | 6 +-
drivers/char/agp/alpha-agp.c | 4 +-
drivers/char/agp/amd-k7-agp.c | 4 +-
drivers/char/agp/amd64-agp.c | 4 +-
drivers/char/agp/ati-agp.c | 8 +-
drivers/char/agp/backend.c | 16 +-
drivers/char/agp/compat_ioctl.c | 2 +-
drivers/char/agp/efficeon-agp.c | 6 +-
drivers/char/agp/frontend.c | 12 +-
drivers/char/agp/generic.c | 35 +-
drivers/char/agp/hp-agp.c | 6 +-
drivers/char/agp/i460-agp.c | 2 +-
drivers/char/agp/intel-agp.c | 239 ++-
drivers/char/agp/nvidia-agp.c | 4 +-
drivers/char/agp/parisc-agp.c | 6 +-
drivers/char/agp/sgi-agp.c | 8 +-
drivers/char/agp/sworks-agp.c | 6 +-
drivers/char/agp/uninorth-agp.c | 10 +-
drivers/char/agp/via-agp.c | 13 +-
drivers/char/drm/ati_pcigart.c | 8 +-
drivers/char/drm/drm.h | 2 +-
drivers/char/drm/drm_drv.c | 7 +-
drivers/char/drm/drm_pciids.h | 17 +-
drivers/char/drm/i915_drv.h | 11 +-
drivers/char/drm/r300_cmdbuf.c | 117 ++-
drivers/char/drm/r300_reg.h | 242 +++-
drivers/char/drm/radeon_cp.c | 1148 +++----------
drivers/char/drm/radeon_drm.h | 8 +
drivers/char/drm/radeon_drv.h | 251 ++-
drivers/char/drm/radeon_irq.c | 2 +-
drivers/char/drm/radeon_microcode.h | 1844 +++++++++++++++++++++
drivers/char/drm/radeon_state.c | 17 +-
drivers/char/generic_nvram.c | 2 +-
drivers/char/hw_random/intel-rng.c | 2 +-
drivers/char/keyboard.c | 7 +-
drivers/char/pcmcia/ipwireless/hardware.c | 20 +-
drivers/char/vt.c | 15 +-
drivers/cpufreq/cpufreq.c | 6 +-
drivers/cpuidle/cpuidle.c | 40 +-
drivers/firewire/Kconfig | 32 +-
drivers/firewire/fw-cdev.c | 9 +-
drivers/firewire/fw-ohci.c | 110 +-
drivers/firewire/fw-transaction.c | 52 +-
drivers/firmware/edd.c | 2 +-
drivers/hwmon/abituguru3.c | 18 +-
drivers/hwmon/adt7473.c | 3 +
drivers/hwmon/hdaps.c | 1 +
drivers/hwmon/lm75.c | 20 +-
drivers/hwmon/lm85.c | 25 +-
drivers/ide/Kconfig | 8 +-
drivers/ide/arm/Makefile | 1 -
drivers/ide/arm/bast-ide.c | 89 -
drivers/ide/arm/ide_arm.c | 1 +
drivers/ide/arm/palm_bk3710.c | 25 +-
drivers/ide/ide-generic.c | 10 +-
drivers/ide/ide-pnp.c | 1 +
drivers/ide/ide-probe.c | 6 +-
drivers/ide/ide-proc.c | 1 -
drivers/ide/ide-taskfile.c | 6 +-
drivers/ide/legacy/buddha.c | 2 +
drivers/ide/legacy/falconide.c | 2 +
drivers/ide/legacy/gayle.c | 6 +
drivers/ide/legacy/ide-cs.c | 44 +-
drivers/ide/legacy/macide.c | 2 +
drivers/ide/legacy/q40ide.c | 2 +
drivers/ide/pci/cmd640.c | 2 +
drivers/ide/pci/delkin_cb.c | 28 +-
drivers/ide/pci/opti621.c | 221 +--
drivers/ide/pci/sis5513.c | 5 +
drivers/ide/ppc/mpc8xx.c | 4 +
drivers/ide/ppc/pmac.c | 60 +-
drivers/ieee1394/Kconfig | 118 +-
drivers/infiniband/core/umem.c | 2 +-
drivers/infiniband/core/uverbs_main.c | 2 +-
drivers/infiniband/hw/amso1100/c2_rnic.c | 3 +-
drivers/infiniband/hw/ehca/ehca_reqs.c | 6 +-
drivers/infiniband/hw/ipath/ipath_kernel.h | 5 +
drivers/infiniband/hw/ipath/ipath_mad.c | 4 +
drivers/infiniband/hw/ipath/ipath_sdma.c | 12 +-
drivers/infiniband/hw/ipath/ipath_verbs.c | 3 +-
drivers/infiniband/hw/nes/nes_verbs.c | 4 +-
drivers/input/misc/Kconfig | 1 -
drivers/input/mouse/appletouch.c | 49 +-
drivers/input/serio/i8042-x86ia64io.h | 7 +
drivers/input/serio/i8042.c | 8 +-
drivers/isdn/hardware/eicon/divasmain.c | 1 -
drivers/isdn/hardware/eicon/divasproc.c | 4 +-
drivers/isdn/hysdn/hysdn_procconf.c | 29 +-
drivers/isdn/sc/ioctl.c | 1 +
drivers/macintosh/mediabay.c | 7 +-
drivers/macintosh/smu.c | 5 +-
drivers/macintosh/therm_adt746x.c | 13 +-
drivers/md/md.c | 2 +-
drivers/md/raid5.c | 10 +-
drivers/media/Makefile | 7 +-
drivers/media/common/tuners/Kconfig | 1 +
drivers/media/common/tuners/mxl5005s.c | 4 +-
drivers/media/common/tuners/tda18271-common.c | 4 +-
drivers/media/common/tuners/tda827x.c | 4 +-
drivers/media/common/tuners/tea5761.c | 2 +-
drivers/media/common/tuners/tuner-i2c.h | 8 +
drivers/media/common/tuners/tuner-simple.c | 6 +-
drivers/media/common/tuners/tuner-xc2028.c | 87 +-
drivers/media/dvb/b2c2/flexcop-usb.c | 2 +-
drivers/media/dvb/cinergyT2/cinergyT2.c | 46 +-
drivers/media/dvb/dvb-core/dvb_net.c | 12 +-
drivers/media/dvb/dvb-usb/Kconfig | 2 +-
drivers/media/dvb/dvb-usb/dib0700_devices.c | 21 +-
drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | 2 +-
drivers/media/dvb/dvb-usb/gp8psk.c | 10 +-
drivers/media/dvb/dvb-usb/m920x.c | 7 +-
drivers/media/dvb/frontends/dib0070.h | 15 +-
drivers/media/dvb/frontends/dib7000p.h | 15 +-
drivers/media/dvb/frontends/or51132.c | 6 +-
drivers/media/dvb/ttpci/av7110.c | 9 +-
drivers/media/dvb/ttpci/av7110_av.c | 34 +-
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 2 +-
drivers/media/dvb/ttusb-dec/Kconfig | 2 +-
drivers/media/dvb/ttusb-dec/ttusb_dec.c | 25 +-
drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 10 +-
drivers/media/video/au0828/Kconfig | 2 +-
drivers/media/video/au0828/au0828-dvb.c | 6 -
drivers/media/video/bt8xx/bttv-cards.c | 5 +-
drivers/media/video/bt8xx/bttv-risc.c | 8 +-
drivers/media/video/btcx-risc.c | 2 +-
drivers/media/video/btcx-risc.h | 4 +-
drivers/media/video/cx18/cx18-av-core.c | 81 +-
drivers/media/video/cx18/cx18-cards.c | 4 +-
drivers/media/video/cx18/cx18-controls.c | 6 +-
drivers/media/video/cx18/cx18-driver.c | 26 +-
drivers/media/video/cx18/cx18-driver.h | 9 +-
drivers/media/video/cx18/cx18-fileops.c | 13 +-
drivers/media/video/cx18/cx18-gpio.c | 33 +-
drivers/media/video/cx18/cx18-ioctl.c | 12 +-
drivers/media/video/cx18/cx18-irq.c | 12 +-
drivers/media/video/cx18/cx18-mailbox.c | 8 +-
drivers/media/video/cx18/cx18-streams.c | 37 +-
drivers/media/video/cx23885/cx23885-core.c | 8 +-
drivers/media/video/cx88/cx88-cards.c | 13 +-
drivers/media/video/cx88/cx88-core.c | 8 +-
drivers/media/video/em28xx/em28xx-video.c | 8 +-
drivers/media/video/ivtv/ivtv-driver.h | 10 +-
drivers/media/video/ivtv/ivtv-fileops.c | 2 +-
drivers/media/video/ivtv/ivtv-irq.c | 8 +-
drivers/media/video/ivtv/ivtv-queue.c | 2 +-
drivers/media/video/ivtv/ivtv-streams.c | 30 +-
drivers/media/video/ivtv/ivtv-version.h | 4 +-
drivers/media/video/ivtv/ivtv-yuv.c | 2 +-
drivers/media/video/ivtv/ivtv-yuv.h | 2 +-
drivers/media/video/saa7134/saa7134-empress.c | 3 +-
drivers/media/video/tuner-core.c | 40 +-
drivers/media/video/usbvideo/quickcam_messenger.c | 2 +-
drivers/media/video/zoran.h | 4 +-
drivers/media/video/zoran_device.c | 2 +-
drivers/media/video/zoran_driver.c | 10 +-
drivers/misc/fujitsu-laptop.c | 6 +
drivers/misc/thinkpad_acpi.c | 494 +++---
drivers/mmc/card/block.c | 2 +-
drivers/mmc/host/wbsd.c | 21 +-
drivers/mtd/devices/m25p80.c | 4 +-
drivers/mtd/maps/omap_nor.c | 2 +-
drivers/mtd/nand/pxa3xx_nand.c | 2 +-
drivers/mtd/onenand/generic.c | 2 +-
drivers/mtd/redboot.c | 2 +-
drivers/net/7990.c | 6 +-
drivers/net/Kconfig | 2 +-
drivers/net/atlx/atl1.c | 18 -
drivers/net/bnx2.c | 9 +-
drivers/net/bnx2.h | 1 -
drivers/net/bnx2x.c | 5 +-
drivers/net/bnx2x.h | 3 +-
drivers/net/bnx2x_init.h | 3 +-
drivers/net/ehea/ehea_main.c | 19 +-
drivers/net/enc28j60.c | 87 +-
drivers/net/fec_mpc52xx.c | 2 +-
drivers/net/forcedeth.c | 20 +
drivers/net/hamradio/baycom_epp.c | 2 +-
drivers/net/ibm_newemac/Kconfig | 1 +
drivers/net/ipg.c | 4 +-
drivers/net/irda/Kconfig | 1 +
drivers/net/ixgbe/ixgbe_82598.c | 4 +-
drivers/net/netxen/netxen_nic.h | 18 +-
drivers/net/netxen/netxen_nic_ethtool.c | 6 +-
drivers/net/netxen/netxen_nic_hw.c | 112 +-
drivers/net/netxen/netxen_nic_init.c | 46 +-
drivers/net/netxen/netxen_nic_isr.c | 4 +-
drivers/net/netxen/netxen_nic_main.c | 133 +-
drivers/net/netxen/netxen_nic_niu.c | 22 +-
drivers/net/pppoe.c | 37 +-
drivers/net/pppol2tp.c | 20 +-
drivers/net/r6040.c | 2 +-
drivers/net/sfc/falcon.c | 4 +-
drivers/net/sky2.c | 3 +
drivers/net/smc911x.c | 24 +-
drivers/net/smc91x.c | 17 +-
drivers/net/smc91x.h | 8 +-
drivers/net/tg3.c | 33 +-
drivers/net/tulip/tulip_core.c | 2 +-
drivers/net/tun.c | 15 +
drivers/net/usb/kaweth.c | 2 +-
drivers/net/virtio_net.c | 52 +-
drivers/net/wireless/b43/b43.h | 1 -
drivers/net/wireless/b43/dma.c | 65 +-
drivers/net/wireless/b43/main.c | 16 +-
drivers/net/wireless/hostap/hostap_main.c | 8 +-
drivers/net/wireless/ipw2200.c | 176 +--
drivers/net/wireless/ipw2200.h | 6 +-
drivers/net/wireless/iwlwifi/iwl-3945-led.c | 5 +-
drivers/net/wireless/libertas/cmd.c | 5 +-
drivers/net/wireless/libertas/main.c | 2 +-
drivers/net/wireless/rt2x00/Kconfig | 19 +-
drivers/net/wireless/rt2x00/rt2x00pci.c | 3 +-
drivers/net/wireless/rt2x00/rt2x00usb.c | 6 +
drivers/net/wireless/rt2x00/rt73usb.c | 1 +
drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
drivers/of/of_i2c.c | 1 -
drivers/pci/pci-driver.c | 2 +-
drivers/pci/pci-sysfs.c | 85 +-
drivers/pnp/pnpacpi/rsparser.c | 46 +-
drivers/pnp/system.c | 2 +-
drivers/power/power_supply_sysfs.c | 2 +-
drivers/rtc/Kconfig | 19 +
drivers/rtc/Makefile | 2 +
drivers/rtc/rtc-at32ap700x.c | 7 +-
drivers/rtc/rtc-cmos.c | 31 +-
drivers/rtc/rtc-ds1374.c | 2 +-
drivers/rtc/rtc-fm3130.c | 501 ++++++
drivers/rtc/rtc-ppc.c | 69 +
drivers/s390/char/sclp_vt220.c | 1 +
drivers/s390/char/tape_3590.c | 2 +-
drivers/s390/cio/blacklist.c | 6 +-
drivers/s390/cio/cio.c | 20 +-
drivers/s390/net/qeth_core_main.c | 49 +-
drivers/s390/net/qeth_core_offl.c | 6 +-
drivers/s390/net/qeth_core_sys.c | 12 -
drivers/s390/net/qeth_l2_main.c | 41 +-
drivers/s390/net/qeth_l3_main.c | 75 +-
drivers/s390/net/qeth_l3_sys.c | 24 -
drivers/s390/s390mach.c | 1 +
drivers/scsi/dpt/dptsig.h | 3 +-
drivers/scsi/hosts.c | 9 +-
drivers/scsi/sr.c | 3 +
drivers/serial/atmel_serial.c | 2 +-
drivers/serial/bfin_5xx.c | 80 +-
drivers/serial/sb1250-duart.c | 2 +-
drivers/serial/ucc_uart.c | 2 +-
drivers/spi/spidev.c | 64 +-
drivers/ssb/main.c | 12 +-
drivers/usb/core/hub.c | 46 +-
drivers/usb/core/quirks.c | 3 +
drivers/usb/host/Kconfig | 8 +-
drivers/usb/host/isp1760-hcd.c | 8 +-
drivers/usb/misc/Kconfig | 1 +
drivers/usb/misc/isight_firmware.c | 23 +-
drivers/video/cirrusfb.c | 6 +-
drivers/video/console/fbcon.c | 4 +-
drivers/video/fsl-diu-fb.c | 4 +-
drivers/video/hgafb.c | 26 +-
drivers/video/leo.c | 58 +-
drivers/video/modedb.c | 2 +
drivers/video/pxafb.c | 6 +-
drivers/virtio/virtio.c | 2 +-
drivers/watchdog/Makefile | 1 +
drivers/watchdog/hpwdt.c | 182 ++-
fs/Kconfig.binfmt | 2 +-
fs/afs/callback.c | 2 +-
fs/afs/inode.c | 2 +-
fs/afs/super.c | 2 +-
fs/aio.c | 4 -
fs/binfmt_elf.c | 3 -
fs/binfmt_elf_fdpic.c | 2 +-
fs/binfmt_flat.c | 8 +-
fs/block_dev.c | 8 +-
fs/cifs/CHANGES | 5 +
fs/cifs/asn1.c | 14 +
fs/cifs/cifsfs.c | 21 +-
fs/cifs/cifsglob.h | 3 +-
fs/cifs/cifspdu.h | 23 +-
fs/cifs/cifssmb.c | 6 +-
fs/cifs/connect.c | 5 +
fs/cifs/dir.c | 4 +-
fs/cifs/file.c | 7 -
fs/cifs/inode.c | 148 +-
fs/cifs/misc.c | 3 +-
fs/cifs/readdir.c | 77 +-
fs/ecryptfs/ecryptfs_kernel.h | 2 -
fs/ecryptfs/read_write.c | 22 -
fs/exec.c | 8 +-
fs/ext3/resize.c | 3 +-
fs/ext4/balloc.c | 71 +-
fs/ext4/mballoc.c | 8 +-
fs/ext4/resize.c | 6 +-
fs/ext4/super.c | 36 +-
fs/fat/file.c | 44 +-
fs/fuse/inode.c | 4 +-
fs/jbd2/commit.c | 1 +
fs/jbd2/recovery.c | 12 +-
fs/libfs.c | 18 +
fs/ocfs2/cluster/nodemanager.c | 74 +-
fs/ocfs2/cluster/nodemanager.h | 4 -
fs/ocfs2/stack_o2cb.c | 41 +-
fs/ocfs2/stack_user.c | 3 +-
fs/ocfs2/stackglue.c | 119 ++-
fs/ocfs2/stackglue.h | 19 +-
fs/proc/array.c | 2 +-
fs/proc/base.c | 33 +-
fs/proc/proc_misc.c | 6 +-
fs/proc/task_mmu.c | 111 +-
fs/udf/udfdecl.h | 2 +-
include/acpi/processor.h | 1 +
include/asm-alpha/core_mcpcia.h | 2 +-
include/asm-alpha/core_t2.h | 14 +-
include/asm-alpha/io.h | 6 +-
include/asm-alpha/mmu_context.h | 6 +-
include/asm-alpha/percpu.h | 72 +-
include/asm-alpha/system.h | 10 +-
include/asm-alpha/vga.h | 6 +-
include/asm-arm/arch-at91/io.h | 2 -
include/asm-arm/arch-pxa/mfp-pxa27x.h | 1 +
include/asm-arm/arch-pxa/pxa2xx-gpio.h | 9 +
include/asm-arm/arch-pxa/regs-lcd.h | 5 +-
include/asm-arm/pgtable-nommu.h | 1 -
include/asm-arm/spinlock.h | 2 +-
include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 8 +-
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 8 +-
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 8 +-
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 12 +-
include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 8 +-
include/asm-frv/checksum.h | 2 +-
include/asm-h8300/cacheflush.h | 2 +-
include/asm-ia64/sn/simulator.h | 7 +-
include/asm-m32r/uaccess.h | 2 +-
include/asm-m68k/bitops.h | 45 +-
include/asm-mips/cpu-info.h | 4 +-
include/asm-mips/gic.h | 4 +-
include/asm-mips/lasat/serial.h | 4 +-
include/asm-mips/mach-au1x00/au1000.h | 1 +
include/asm-mips/mach-au1x00/au1xxx_dbdma.h | 1 +
include/asm-mips/mipsregs.h | 3 +
include/asm-mips/pgtable-bits.h | 2 -
include/asm-mips/pgtable.h | 3 +-
include/asm-mips/rtlx.h | 2 +-
include/asm-parisc/checksum.h | 2 +-
include/asm-powerpc/kvm_ppc.h | 1 +
include/asm-powerpc/mediabay.h | 12 +-
include/asm-powerpc/spu.h | 1 -
include/asm-powerpc/spu_csa.h | 2 +-
include/asm-powerpc/system.h | 2 +-
include/asm-s390/system.h | 8 +-
include/asm-um/mmu_context.h | 12 +-
include/asm-v850/clinkage.h | 2 +-
include/asm-x86/geode.h | 4 +-
include/asm-x86/page_32.h | 3 +-
include/linux/Kbuild | 3 +
include/linux/a.out.h | 8 -
include/linux/agp_backend.h | 16 +-
include/linux/agpgart.h | 4 +-
include/linux/bitrev.h | 1 +
include/linux/bootmem.h | 2 +-
include/linux/capability.h | 29 +-
include/linux/cpuidle.h | 1 +
include/linux/fs.h | 5 +-
include/linux/ide.h | 2 +-
include/linux/if_tunnel.h | 2 +-
include/linux/ioport.h | 6 +-
include/linux/ipv6.h | 4 +-
include/linux/jbd2.h | 3 +
include/linux/kvm_host.h | 2 +-
include/linux/math64.h | 21 +
include/linux/memory_hotplug.h | 16 +-
include/linux/mm.h | 17 +-
include/linux/msdos_fs.h | 12 +-
include/linux/msg.h | 4 +-
include/linux/mtd/nand.h | 2 +-
include/linux/page-flags.h | 24 +
include/linux/pci.h | 1 +
include/linux/pci_ids.h | 1 +
include/linux/proc_fs.h | 4 +-
include/linux/rtnetlink.h | 1 +
include/linux/sched.h | 13 +
include/linux/slab.h | 11 +
include/linux/ssb/ssb_driver_gige.h | 2 +-
include/linux/tcp.h | 7 -
include/linux/time.h | 16 +-
include/linux/tty.h | 2 +-
include/linux/videodev2.h | 6 +-
include/linux/virtio_net.h | 2 +-
include/media/v4l2-dev.h | 1 -
include/net/inet_sock.h | 10 +
include/net/ipv6.h | 6 +
include/net/net_namespace.h | 11 +
include/net/netfilter/nf_conntrack_extend.h | 1 +
include/net/request_sock.h | 4 +-
include/net/tcp.h | 2 -
include/rdma/ib_verbs.h | 1 -
ipc/msg.c | 13 +-
ipc/shm.c | 18 +-
kernel/capability.c | 111 +-
kernel/cpuset.c | 20 +-
kernel/kprobes.c | 15 +-
kernel/rcupreempt.c | 2 -
kernel/sched.c | 56 +-
kernel/sched_rt.c | 63 +-
kernel/sched_stats.h | 6 +
kernel/softlockup.c | 15 +-
lib/bitrev.c | 3 +-
lib/div64.c | 10 +
lib/radix-tree.c | 120 +-
mm/bootmem.c | 6 +-
mm/hugetlb.c | 2 +-
mm/memory.c | 17 +-
mm/migrate.c | 10 +
mm/mmap.c | 8 +-
mm/nommu.c | 17 +-
mm/page_alloc.c | 34 +-
mm/pagewalk.c | 42 +-
mm/slab.c | 5 +-
mm/vmscan.c | 2 +-
net/atm/br2684.c | 78 +-
net/core/dev.c | 38 +-
net/core/net_namespace.c | 3 +
net/dccp/ackvec.c | 29 +-
net/dccp/ccids/ccid3.c | 14 +-
net/dccp/ccids/lib/tfrc.c | 8 -
net/dccp/ccids/lib/tfrc.h | 25 +-
net/dccp/ccids/lib/tfrc_equation.c | 8 +-
net/dccp/ipv4.c | 3 +-
net/dccp/ipv6.c | 1 -
net/dccp/minisocks.c | 8 +-
net/dccp/options.c | 4 +-
net/dccp/output.c | 2 +
net/dccp/probe.c | 2 +-
net/ipv4/fib_semantics.c | 5 +-
net/ipv4/inet_connection_sock.c | 11 +-
net/ipv4/netfilter/nf_nat_core.c | 3 +-
net/ipv4/netfilter/nf_nat_snmp_basic.c | 14 +
net/ipv4/raw.c | 2 +-
net/ipv4/syncookies.c | 3 +-
net/ipv4/tcp.c | 18 +-
net/ipv4/tcp_input.c | 45 -
net/ipv4/tcp_ipv4.c | 14 +-
net/ipv4/tcp_minisocks.c | 32 +-
net/ipv4/tcp_timer.c | 5 -
net/ipv4/xfrm4_mode_tunnel.c | 2 +-
net/ipv6/af_inet6.c | 2 +-
net/ipv6/datagram.c | 5 +
net/ipv6/ip6_input.c | 9 +
net/ipv6/ipv6_sockglue.c | 23 +-
net/ipv6/raw.c | 4 +-
net/ipv6/route.c | 8 +-
net/ipv6/sit.c | 44 +-
net/ipv6/syncookies.c | 1 -
net/ipv6/tcp_ipv6.c | 1 -
net/key/af_key.c | 3 +
net/mac80211/ieee80211_i.h | 2 +-
net/mac80211/main.c | 1 +
net/mac80211/mlme.c | 18 +-
net/mac80211/tx.c | 13 +-
net/mac80211/wext.c | 18 +-
net/mac80211/wme.c | 2 +-
net/netfilter/nf_conntrack_core.c | 3 +-
net/netfilter/nf_conntrack_extend.c | 9 +-
net/netfilter/nf_conntrack_h323_main.c | 22 +-
net/netfilter/nf_log.c | 4 -
net/netlink/genetlink.c | 15 +-
net/sched/sch_htb.c | 23 +-
net/sctp/associola.c | 13 +-
net/sctp/protocol.c | 15 +-
net/sctp/socket.c | 4 +-
net/unix/af_unix.c | 79 +-
scripts/checkpatch.pl | 284 ++--
scripts/mod/modpost.c | 25 +-
security/device_cgroup.c | 36 +-
security/dummy.c | 24 +-
security/keys/internal.h | 1 -
sound/pci/emu10k1/emu10k1_main.c | 15 +-
sound/pci/hda/patch_realtek.c | 1 +
sound/pci/oxygen/oxygen_mixer.c | 12 +-
virt/kvm/ioapic.c | 21 +-
752 files changed, 14491 insertions(+), 8457 deletions(-)
New commits:
commit 481c5346d0981940ee63037eb53e4e37b0735c10
Author: Christoph Lameter <clameter at sgi.com>
Date: Sat Jun 21 16:46:35 2008 -0700
Slab: Fix memory leak in fallback_alloc()
The zonelist patches caused the loop that checks for available
objects in permitted zones to not terminate immediately. One object
per zone per allocation may be allocated and then abandoned.
Break the loop when we have successfully allocated one object.
Signed-off-by: Christoph Lameter <clameter at sgi.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 62a8efe632be1815b544845db643f1fcd9afcfb0
Merge: bec95aab8c056ab490fe7fa54da822938562443d 2856922c158605514ec5974a03097eaec91f4c0d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Jun 21 16:43:56 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:
Ext4: Fix online resize block group descriptor corruption
commit bec95aab8c056ab490fe7fa54da822938562443d
Merge: 71c2742f5e6348d76ee62085cf0a13e5eff0f00e bcccc3a28e9cbb44549cde326852c26203a53a56
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Jun 21 12:31:02 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: (lm75) sensor reading bugfix
hwmon: (abituguru3) update driver detection
hwmon: (w83791d) new maintainer
hwmon: (abituguru3) Identify Abit AW8D board as such
hwmon: Update the sysfs interface documentation
hwmon: (adt7473) Initialize max_duty_at_overheat before use
hwmon: (lm85) Fix function RANGE_TO_REG()
commit 71c2742f5e6348d76ee62085cf0a13e5eff0f00e
Author: Bernhard Walle <bwalle at suse.de>
Date: Sat Jun 21 19:01:02 2008 +0200
Add return value to reserve_bootmem_node()
This patch changes the function reserve_bootmem_node() from void to int,
returning -ENOMEM if the allocation fails.
This fixes a build problem on x86 with CONFIG_KEXEC=y and
CONFIG_NEED_MULTIPLE_NODES=y
Signed-off-by: Bernhard Walle <bwalle at suse.de>
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a19214430d27a3af6f1672ec26f3c893ef899ede
Merge: b732d9680b7a2968823851f1163507ad9c45c8cb b9f75f45a6b46a0ab4eb0857d437a0845871f314
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Jun 21 08:44:08 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:
netns: Don't receive new packets in a dead network namespace.
sctp: Make sure N * sizeof(union sctp_addr) does not overflow.
pppoe: warning fix
ipv6: Drop packets for loopback address from outside of the box.
ipv6: Remove options header when setsockopt's optlen is 0
mac80211: detect driver tx bugs
commit b9f75f45a6b46a0ab4eb0857d437a0845871f314
Author: Eric W. Biederman <ebiederm at xmission.com>
Date: Fri Jun 20 22:16:51 2008 -0700
netns: Don't receive new packets in a dead network namespace.
Alexey Dobriyan <adobriyan at gmail.com> writes:
> Subject: ICMP sockets destruction vs ICMP packets oops
> After icmp_sk_exit() nuked ICMP sockets, we get an interrupt.
> icmp_reply() wants ICMP socket.
>
> Steps to reproduce:
>
> launch shell in new netns
> move real NIC to netns
> setup routing
> ping -i 0
> exit from shell
>
> BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
> IP: [<ffffffff803fce17>] icmp_sk+0x17/0x30
> PGD 17f3cd067 PUD 17f3ce067 PMD 0
> Oops: 0000 [1] PREEMPT SMP DEBUG_PAGEALLOC
> CPU 0
> Modules linked in: usblp usbcore
> Pid: 0, comm: swapper Not tainted 2.6.26-rc6-netns-ct #4
> RIP: 0010:[<ffffffff803fce17>] [<ffffffff803fce17>] icmp_sk+0x17/0x30
> RSP: 0018:ffffffff8057fc30 EFLAGS: 00010286
> RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff81017c7db900
> RDX: 0000000000000034 RSI: ffff81017c7db900 RDI: ffff81017dc41800
> RBP: ffffffff8057fc40 R08: 0000000000000001 R09: 000000000000a815
> R10: 0000000000000000 R11: 0000000000000001 R12: ffffffff8057fd28
> R13: ffffffff8057fd00 R14: ffff81017c7db938 R15: ffff81017dc41800
> FS: 0000000000000000(0000) GS:ffffffff80525000(0000) knlGS:0000000000000000
> CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
> CR2: 0000000000000000 CR3: 000000017fcda000 CR4: 00000000000006e0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
> Process swapper (pid: 0, threadinfo ffffffff8053a000, task ffffffff804fa4a0)
> Stack: 0000000000000000 ffff81017c7db900 ffffffff8057fcf0 ffffffff803fcfe4
> ffffffff804faa38 0000000000000246 0000000000005a40 0000000000000246
> 000000000001ffff ffff81017dd68dc0 0000000000005a40 0000000055342436
> Call Trace:
> <IRQ> [<ffffffff803fcfe4>] icmp_reply+0x44/0x1e0
> [<ffffffff803d3a0a>] ? ip_route_input+0x23a/0x1360
> [<ffffffff803fd645>] icmp_echo+0x65/0x70
> [<ffffffff803fd300>] icmp_rcv+0x180/0x1b0
> [<ffffffff803d6d84>] ip_local_deliver+0xf4/0x1f0
> [<ffffffff803d71bb>] ip_rcv+0x33b/0x650
> [<ffffffff803bb16a>] netif_receive_skb+0x27a/0x340
> [<ffffffff803be57d>] process_backlog+0x9d/0x100
> [<ffffffff803bdd4d>] net_rx_action+0x18d/0x250
> [<ffffffff80237be5>] __do_softirq+0x75/0x100
> [<ffffffff8020c97c>] call_softirq+0x1c/0x30
> [<ffffffff8020f085>] do_softirq+0x65/0xa0
> [<ffffffff80237af7>] irq_exit+0x97/0xa0
> [<ffffffff8020f198>] do_IRQ+0xa8/0x130
> [<ffffffff80212ee0>] ? mwait_idle+0x0/0x60
> [<ffffffff8020bc46>] ret_from_intr+0x0/0xf
> <EOI> [<ffffffff80212f2c>] ? mwait_idle+0x4c/0x60
> [<ffffffff80212f23>] ? mwait_idle+0x43/0x60
> [<ffffffff8020a217>] ? cpu_idle+0x57/0xa0
> [<ffffffff8040f380>] ? rest_init+0x70/0x80
> Code: 10 5b 41 5c 41 5d 41 5e c9 c3 66 2e 0f 1f 84 00 00 00 00 00 55 48 89 e5 53
> 48 83 ec 08 48 8b 9f 78 01 00 00 e8 2b c7 f1 ff 89 c0 <48> 8b 04 c3 48 83 c4 08
> 5b c9 c3 66 66 66 66 66 2e 0f 1f 84 00
> RIP [<ffffffff803fce17>] icmp_sk+0x17/0x30
> RSP <ffffffff8057fc30>
> CR2: 0000000000000000
> ---[ end trace ea161157b76b33e8 ]---
> Kernel panic - not syncing: Aiee, killing interrupt handler!
Receiving packets while we are cleaning up a network namespace is a
racy proposition. It is possible when the packet arrives that we have
removed some but not all of the state we need to fully process it. We
have the choice of either playing wack-a-mole with the cleanup routines
or simply dropping packets when we don't have a network namespace to
handle them.
Since the check looks inexpensive in netif_receive_skb let's just
drop the incoming packets.
Signed-off-by: Eric W. Biederman <ebiederm at xmission.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 735ce972fbc8a65fb17788debd7bbe7b4383cc62
Author: David S. Miller <davem at davemloft.net>
Date: Fri Jun 20 22:04:34 2008 -0700
sctp: Make sure N * sizeof(union sctp_addr) does not overflow.
As noticed by Gabriel Campana, the kmalloc() length arg
passed in by sctp_getsockopt_local_addrs_old() can overflow
if ->addr_num is large enough.
Therefore, enforce an appropriate limit.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 2645a3c3761ac25498db2e627271016c849c68e1
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Fri Jun 20 21:58:02 2008 -0700
pppoe: warning fix
Fix warning:
drivers/net/pppoe.c: In function 'pppoe_recvmsg':
drivers/net/pppoe.c:945: warning: comparison of distinct pointer types lacks a cast
because skb->len is unsigned int and total_len is size_t
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b732d9680b7a2968823851f1163507ad9c45c8cb
Merge: a744e0160ac5804b763449aa34d3991dc21af0be e0c6d97c65e0784aade7e97b9411f245a6c543e7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 17:10:04 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] SN2: security hole in sn2_ptc_proc_write
commit a744e0160ac5804b763449aa34d3991dc21af0be
Author: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Date: Sat Jun 21 03:28:54 2008 +0400
alpha: resurrect Cypress IDE quirk
Which was removed in the hope that generic legacy IDE quirk in
drivers/pci/probe.c is sufficient for Cypress IDE.
It isn't, as this controller has non-standard BAR layout:
secondary channel registers are in the BAR0-1 of the second
PCI function - not in the BAR2-3 of the same function, as the
generic quirk routine assumes.
Signed-off-by: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d559d4a24a3fed75bd890abcc1f95cd8d8dad6e1
Author: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Date: Sat Jun 21 03:28:31 2008 +0400
alpha: fix compile failures with gcc-4.3 (bug #10438)
Vast majority of these build failures are gcc-4.3 warnings
about static functions and objects being referenced from
non-static (read: "extern inline") functions, in conjunction
with our -Werror.
We cannot just convert "extern inline" to "static inline",
as people keep suggesting all the time, because "extern inline"
logic is crucial for generic kernel build.
So
- just make sure that all callees of critical "extern inline"
functions are also "extern inline";
- use "static inline", wherever it's possible.
traps.c: work around gcc-4.3 being too smart about array
bounds-checking.
TODO: add "gnu_inline" attribute to all our "extern inline"
functions to ensure desired behaviour with future compilers.
Signed-off-by: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ede426923b25414f5ec9c00fefe6727d9721dd13
Author: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Date: Sat Jun 21 03:26:21 2008 +0400
alpha: link failure fix
With built-in scsi disk driver, the final link fails with a following
error:
`.exit.text' referenced in section `.rodata' of drivers/built-in.o:
defined in discarded section `.exit.text' of drivers/built-in.o
This happens with -Os (CONFIG_CC_OPTIMIZE_FOR_SIZE=y) with all gcc-4
versions, and also with -O2 and gcc-4.3.
The problem is in sd.c:sd_major() being inlined into __exit function
exit_sd(), and the compiler generating a jump table in .rodata section
for the 'switch' statement in sd_major(). So we have references to
discarded section.
Fixed with a big hammer in the form of -fno-jump-tables.
Note that jump tables vs. discarded sections is a generic problem,
other architectures are just lucky not to suffer from it. But with
a slightly more complex switch/case statement it can be reproduced
on x86 as well. So maybe at some point we should consider
-fno-jump-tables as a generic compile option...
Signed-off-by: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9267b4b3880d00dc2dab90f1d817c856939114f7
Author: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Date: Sat Jun 21 03:25:39 2008 +0400
alpha: fix module load failures on smp (bug #10926)
To calculate addresses of locally defined variables, GCC uses 32-bit
displacement from the GP. Which doesn't work for per cpu variables in
modules, as an offset to the kernel per cpu area is way above 4G.
The workaround is to force allocation of a GOT entry for per cpu variable
using ldq instruction with a 'literal' relocation.
I had to use custom asm/percpu.h, as a required argument magic doesn't
work with asm-generic/percpu.h macros.
Signed-off-by: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d70ac829b7f42d7ef4f879635c6a772b0b4ed0a2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 16:19:44 2008 -0700
Linux 2.6.26-rc7
commit 06d5e334a4f8a1f33ebfcdc89c077f4fc85bcffb
Merge: d5545fa0056ff2982f8a6419bd9a6ba2674deefd ac1623625c5818bbdf5c68973098ba386ba7a004
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:46:47 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:
BAST: Remove old IDE driver
pcmcia ide kingston compactflash's have a new manufacturer id
pcmcia: add another pata/ide ID
pcmcia: add an pata/ide ID
ide: increase timeout in wait_drive_not_busy()
palm_bk3710: fix resource management
commit d5545fa0056ff2982f8a6419bd9a6ba2674deefd
Merge: 77a189c28b44035ff1b6841df32c43af8a9e8399 9499fe2b340d19ef55c349de794db9d917e7403f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:41:10 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: Kconfig menu touch-up
firewire: Kconfig menu touch-up
firewire: deadline for PHY config transmission
firewire: fw-ohci: unify printk prefixes
firewire: fill_bus_reset_event needs lock protection
firewire: fw-ohci: write selfIDBufferPtr before LinkControl.rcvSelfID
firewire: fw-ohci: disable PHY packet reception into AR context
firewire: fw-ohci: use of uninitialized data in AR handler
firewire: don't panic on invalid AR request buffer
commit 77a189c28b44035ff1b6841df32c43af8a9e8399
Merge: 9aef85cc58f54f01bbbafdb3c87af4465f4257c0 5a87f7f5e523030aa6fe732ec338fd53c9a11c42
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:39:12 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:
ACPI: no AC status notification
ACPI Exception (video-1721): UNKNOWN_STATUS_CODE, Cant attach device
commit 9aef85cc58f54f01bbbafdb3c87af4465f4257c0
Merge: fdfe6d3d000775b50fb1adbc278ba0a34c3007c7 858a3685bcf3ac199128e4aa85eaae2fb9d191b5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:38:18 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: (21 commits)
drm: only trust core drm ioctls - driver ioctls are a mess.
drm/i915: add support for Intel series 4 chipsets.
drm/radeon: add hier-z registers for r300 and r500 chipsets
drm/radeon: use DSTCACHE_CTLSTAT rather than RB2D_DSTCACHE_CTLSTAT
drm/radeon: switch IGP gart to use radeon_write_agp_base()
drm/radeon: Restore sw interrupt on resume
drm/r500: add support for AGP based cards.
drm/radeon: fix texture uploads with large 3d textures (bug 13980)
drm/radeon: add initial r500 support.
drm/radeon: init pipe setup in kernel code.
drm/radeon: fixup radeon_do_engine_reset
drm/radeon: fix pixcache and purge/cache flushing registers
drm/radeon: write AGP_BASE_2 on chips that support it.
drm/radeon: merge IGP chip setup and fixup RS400 vs RS480 support
drm/radeon: IGP clean up register and magic numbers.
drm/rs690: set base 2 to 0.
drm/rs690: set all of gart base address.
radeon: add production microcode from AMD
drm: pcigart use proper pci map interfaces.
drm: the sg alloc ioctl should write back the handle to userspace
...
commit fdfe6d3d000775b50fb1adbc278ba0a34c3007c7
Merge: 1f1e2ce8a55bac60ff165d353c6b882e750c9092 7d15ddf79ec35ce79093832c80b86c0888eb5bce
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:37:55 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]: fixup chipset flush for new Intel G4x.
agp: brown paper bag patch - put back the two lines it took out.
commit 1f1e2ce8a55bac60ff165d353c6b882e750c9092
Merge: e570dc2a503f8334b700e8483082c675394f53fd 9c106c119ebedf624fbd682fd2a4d52e3c8c1a67
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:37:13 2008 -0700
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
rcupreempt: remove export of rcu_batches_completed_bh
cpuset: limit the input of cpuset.sched_relax_domain_level
commit e570dc2a503f8334b700e8483082c675394f53fd
Merge: b1ae8d3a00530c035ef97fa4d97f4bee9be75c43 d4abc238c9f4df8b3216f3e883f5d0a07b7ac75a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:36:55 2008 -0700
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched, delay accounting: fix incorrect delay time when constantly waiting on runqueue
sched: CPU hotplug events must not destroy scheduler domains created by the cpusets
sched: rt-group: fix RR buglet
sched: rt-group: heirarchy aware throttle
sched: rt-group: fix hierarchy
sched: NULL pointer dereference while setting sched_rt_period_us
sched: fix defined-but-unused warning
commit b1ae8d3a00530c035ef97fa4d97f4bee9be75c43
Merge: 55017923f699471f68c1469d5f3ff141dd416ab4 ffe6e1da86d21d7855495b5a772c93f050258f6e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:36:38 2008 -0700
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, geode: add a VSA2 ID for General Software
x86: use BOOTMEM_EXCLUSIVE on 32-bit
x86, 32-bit: fix boot failure on TSC-less processors
x86: fix NULL pointer deref in __switch_to
x86: set PAE PHYSICAL_MASK_SHIFT to 44 bits.
commit 55017923f699471f68c1469d5f3ff141dd416ab4
Merge: b4eea67a129423fe423c5d8d26a0aaa9d68ed600 f30ac0ce34f32bb998ac87e37b251374de03e603
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:34:43 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:
Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue.
Blackfin arch: fix typo error in bf548 serial header file
commit b4eea67a129423fe423c5d8d26a0aaa9d68ed600
Merge: 1f6ef2342972dc7fd623f360f84006e2304eb935 9a3b103c27a7e3199b917bc3ca219530132afdfc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:31: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:
ahci: sis can't do PMP
ata_piix: add TECRA M4 to broken suspend list
LIBATA: Add HAVE_PATA_PLATFORM to select PATA_PLATFORM driver
sata_mv: warn on PIO with multiple DRQs
sata_mv: enable async_notify for 60x1 Rev.C0 and higher
libata: don't check whether to use DMA or not for no data commands
ahci: jmb361 has only one port
commit 1f6ef2342972dc7fd623f360f84006e2304eb935
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 12:19:28 2008 -0700
[watchdog] hpwdt: fix use of inline assembly
The inline assembly in drivers/watchdog/hpwdt.c was incredibly broken,
and included all the function prologue and epilogue stuff, even though
it was itself then inside a C function where the compiler would add its
own prologue and epilogue on top of it all.
This then just _happened_ to work if you had exactly the right compiler
version and exactly the right compiler flags, so that gcc just happened
to not create any prologue at all (the gcc-generated epilogue wouldn't
matter, since it would never be reached).
But the more proper way to fix it is to simply not do this. Move the
inline asm to the top level, with no surrounding function at all (the
better alternative would be to remove the prologue and make it actually
use proper description of the arguments to the inline asm, but that's a
bigger change than the one I'm willing to make right now).
Tested-by: S.ÃaÄlar Onur <caglar at pardus.org.tr>
Acked-by: Thomas Mingarelli <Thomas.Mingarelli at hp.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e0c6d97c65e0784aade7e97b9411f245a6c543e7
Author: Cliff Wickman <cpw at sgi.com>
Date: Fri Jun 20 12:02:00 2008 -0700
[IA64] SN2: security hole in sn2_ptc_proc_write
Security hole in sn2_ptc_proc_write
It is possible to overrun a buffer with a write to this /proc file.
Signed-off-by: Cliff Wickman <cpw at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit ac1623625c5818bbdf5c68973098ba386ba7a004
Author: Ben Dooks <ben-linux at fluff.org>
Date: Fri Jun 20 20:53:35 2008 +0200
BAST: Remove old IDE driver
Remove the old BAST IDE driver, as we are now using the platform-pata
support.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Jeff Garzik <jgarzik at pobox.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit a49c06bfe48c43b4fea4d3789807d8393828ca8a
Author: Christophe Niclaes <cniclaes at develtech.com>
Date: Fri Jun 20 20:53:34 2008 +0200
pcmcia ide kingston compactflash's have a new manufacturer id
Up to now, Kingston compactflash cards (ab)used the Toshiba Manufacturer's ID,
In their new CF cards, they use a new one. Let's the ide subsystem
recognize CF cards with the new id.
Signed-off-by: Christophe Niclaes <cniclaes at develtech.com>
Acked-by: Philippe De Muyter <phdm at macqel.be>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Cc: Dominik Brodowski <linux at dominikbrodowski.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit a17bf220231a5061a29a27a99a273246eb3b156e
Author: Kristoffer Ericson <kristoffer_e1 at hotmail.com>
Date: Fri Jun 20 20:53:34 2008 +0200
pcmcia: add another pata/ide ID
Addition of Transcend 1GB 45x id so that it is properly detected.
[bart: fix typo in ide-cs's ID spotted by Alan Cox]
Signed-off-by: William Peters <w1ll14 at gmail.com>
Signed-off-by: Kristoffer Ericson <Kristoffer_e1 at hotmail.com>
CC: Alan Cox <alan at lxorguk.ukuu.org.uk>
CC: linux-ide at vger.kernel.org
Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 74e23386b7818c7edb1252f6661806dd34042db1
Author: Matt Reimer <mattjreimer at gmail.com>
Date: Fri Jun 20 20:53:34 2008 +0200
pcmcia: add an pata/ide ID
Add an id for:
product info: "M-Systems", "CF300", ""
manfid: 0x000a, 0x0000
function: 4 (fixed disk)
Signed-off-by: Matt Reimer <mreimer at vpop.net>
CC: Alan Cox <alan at lxorguk.ukuu.org.uk>
CC: linux-ide at vger.kernel.org
Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f54feafa6d47d0aa1a96adefdc763b708b02f94f
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Jun 20 20:53:33 2008 +0200
ide: increase timeout in wait_drive_not_busy()
Some ATAPI devices take longer than the current max timeout value to
become ready (i.e. TEAC DV-W28ECW takes 6 ms) so increase the timeout
value to 10 ms.
This fixes kernel.org bugzilla bug #10887:
http://bugzilla.kernel.org/show_bug.cgi?id=10887
Reported-by: Masanari Iida <standby24x7 at gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit ce42a54946db338e43be9a89c0f7927e02aa3a16
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Fri Jun 20 20:53:32 2008 +0200
palm_bk3710: fix resource management
The driver expected a *virtual* address in the IDE platform device's memory
resource and didn't request the memory region for the register block. Fix this
taking into account the fact that DaVinci SoC devices are fixed-mapped to the
virtual memory early and we can get their virtual addresses using IO_ADDRESS()
macro, not having to call ioremap()...
While at it, also do some cosmetic changes...
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 89f5b7da2a6bad2e84670422ab8192382a5aeb9f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 20 11:18:25 2008 -0700
Reinstate ZERO_PAGE optimization in 'get_user_pages()' and fix XIP
KAMEZAWA Hiroyuki and Oleg Nesterov point out that since the commit
557ed1fa2620dc119adb86b34c614e152a629a80 ("remove ZERO_PAGE") removed
the ZERO_PAGE from the VM mappings, any users of get_user_pages() will
generally now populate the VM with real empty pages needlessly.
We used to get the ZERO_PAGE when we did the "handle_mm_fault()", but
since fault handling no longer uses ZERO_PAGE for new anonymous pages,
we now need to handle that special case in follow_page() instead.
In particular, the removal of ZERO_PAGE effectively removed the core
file writing optimization where we would skip writing pages that had not
been populated at all, and increased memory pressure a lot by allocating
all those useless newly zeroed pages.
This reinstates the optimization by making the unmapped PTE case the
same as for a non-existent page table, which already did this correctly.
While at it, this also fixes the XIP case for follow_page(), where the
caller could not differentiate between the case of a page that simply
could not be used (because it had no "struct page" associated with it)
and a page that just wasn't mapped.
We do that by simply returning an error pointer for pages that could not
be turned into a "struct page *". The error is arbitrarily picked to be
EFAULT, since that was what get_user_pages() already used for the
equivalent IO-mapped page case.
[ Also removed an impossible test for pte_offset_map_lock() failing:
that's not how that function works ]
Acked-by: Oleg Nesterov <oleg at tv-sign.ru>
Acked-by: Nick Piggin <npiggin at suse.de>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2856922c158605514ec5974a03097eaec91f4c0d
Author: Frederic Bohe <frederic.bohe at bull.net>
Date: Fri Jun 20 11:48:48 2008 -0400
Ext4: Fix online resize block group descriptor corruption
This is the patch for the group descriptor table corruption during
online resize pointed out by Theodore Tso. The problem was caused by
the fact that the ext4 group descriptor can be either 32 or 64 bytes
long. Only the 64 bytes structure was taken into account.
Signed-off-by: Frederic Bohe <frederic.bohe at bull.net>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 5a87f7f5e523030aa6fe732ec338fd53c9a11c42
Merge: 7b09f27891476c668d058926b90539e4068fbda2 d385c2a85877f0cb785070094edf9a624c090d68
Author: Len Brown <len.brown at intel.com>
Date: Fri Jun 20 02:47:16 2008 -0400
Merge branch 'bugzilla-9761' into release
commit 7b09f27891476c668d058926b90539e4068fbda2
Merge: 9bedbcb207ed9a571b239231d99c8fd4a34ae24d f163ff5176a8e9c827d8ebe044710d67d40799c3
Author: Len Brown <len.brown at intel.com>
Date: Fri Jun 20 02:45:05 2008 -0400
Merge branch 'bugzilla-10695' into release
commit 858a3685bcf3ac199128e4aa85eaae2fb9d191b5
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Jun 20 15:42:38 2008 +1000
drm: only trust core drm ioctls - driver ioctls are a mess.
So driver ioctls need a full auditing before we can make this change.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit d3adbc0c582b767ba1561ffa38313e905cc917ea
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Fri Jun 20 12:12:56 2008 +1000
drm/i915: add support for Intel series 4 chipsets.
Signed-off-by: Zhenyu Wang <zhenyu.z.wang at intel.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 7d15ddf79ec35ce79093832c80b86c0888eb5bce
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Fri Jun 20 11:48:06 2008 +1000
[agp]: fixup chipset flush for new Intel G4x.
Signed-off-by: Zhenyu Wang <zhenyu.z.wang at intel.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit f630e43a215a3129d0c1173cae0bce6ea4855cf7
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Thu Jun 19 16:33:57 2008 -0700
ipv6: Drop packets for loopback address from outside of the box.
[ Based upon original report and patch by Karsten Keil. Karsten
has verified that this fixes the TAHI test case "ICMPv6 test
v6LC.5.1.2 Part F". -DaveM ]
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit aea7427f70cce5fa8f99ce447b213e9e3b49f24c
Author: Shan Wei <shanwei at cn.fujitsu.com>
Date: Thu Jun 19 16:29:39 2008 -0700
ipv6: Remove options header when setsockopt's optlen is 0
Remove the sticky Hop-by-Hop options header by calling setsockopt()
for IPV6_HOPOPTS with a zero option length, per RFC3542.
Routing header and Destination options header does the same as
Hop-by-Hop options header.
Signed-off-by: Shan Wei <shanwei at cn.fujitsu.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ffe6e1da86d21d7855495b5a772c93f050258f6e
Author: Jordan Crouse <jordan.crouse at amd.com>
Date: Wed Jun 18 11:34:38 2008 -0600
x86, geode: add a VSA2 ID for General Software
General Software writes their own VSA2 module for their version
of the Geode BIOS, which returns a different ID then the standard
VSA2. This was causing the framebuffer driver to break for most
GSW boards.
Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
Cc: tglx at linutronix.de
Cc: linux-geode at lists.infradead.org
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d4abc238c9f4df8b3216f3e883f5d0a07b7ac75a
Author: Bharath Ravi <bharathravi1 at gmail.com>
Date: Mon Jun 16 15:11:01 2008 +0530
sched, delay accounting: fix incorrect delay time when constantly waiting on runqueue
This patch corrects the incorrect value of per process run-queue wait
time reported by delay statistics. The anomaly was due to the following
reason. When a process leaves the CPU and immediately starts waiting for
CPU on the runqueue (which means it remains in the TASK_RUNNABLE state),
the time of re-entry into the run-queue is never recorded. Due to this,
the waiting time on the runqueue from this point of re-entry upto the
next time it hits the CPU is not accounted for. This is solved by
recording the time of re-entry of a process leaving the CPU in the
sched_info_depart() function IF the process will go back to waiting on
the run-queue. This IF condition is verified by checking whether the
process is still in the TASK_RUNNABLE state.
The patch was tested on 2.6.26-rc6 using two simple CPU hog programs.
The values noted prior to the fix did not account for the time spent on
the runqueue waiting. After the fix, the correct values were reported
back to user space.
Signed-off-by: Bharath Ravi <bharathravi1 at gmail.com>
Signed-off-by: Madhava K R <madhavakr at gmail.com>
Cc: dhaval at linux.vnet.ibm.com
Cc: vatsa at in.ibm.com
Cc: balbir at in.ibm.com
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit bcccc3a28e9cbb44549cde326852c26203a53a56
Author: David Brownell <david-b at pacbell.net>
Date: Sat May 3 19:19:16 2008 -0700
hwmon: (lm75) sensor reading bugfix
LM75 sensor reading bugfix: never save error status as valid
sensor output. This could be improved, but at least this
prevents certain rude failure modes.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit b3aeab0cdbd0fe5339a3a5918b59eebf148cbcd1
Author: Hans de Goede <j.w.r.degoede at hhs.nl>
Date: Fri May 23 16:10:41 2008 +0200
hwmon: (abituguru3) update driver detection
It has been reported that the abituguru3 driver fails to load after a BIOS
update. This patch fixes this by loosening the detection routine so that it
will work after the BIOS update too. To compensate for the now very loose
detection an additional check is added on the DMI Base Board vendor string to
make sure we only load on Abit motherboards, this is the same as the check in
the abituguru (1 / 2) driver.
Signed-of-by: Hans de Goede <j.w.r.degoede at hhs.nl>
Signed-off-by: Alistair John Strachan <alistair at devzero.co.uk>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 25845c22647fad2a0852cf6bf277d84e8a7a6b4a
Author: Marc Hulsman <m.hulsman at tudelft.nl>
Date: Sun Jun 8 10:59:41 2008 -0400
hwmon: (w83791d) new maintainer
Signed-off-by: Charles Spirakis <bezaur at gmail.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 1604e78b7d6e6087ae9bde6e7a6b41cda80d6557
Author: Hans de Goede <j.w.r.degoede at hhs.nl>
Date: Tue Feb 26 19:34:48 2008 +0100
hwmon: (abituguru3) Identify Abit AW8D board as such
This patch identifies the Abit AW8D board as such, and adds support for its
aux5 fan connector
Signed-off-by: Hans de Goede <j.w.r.degoede at hhs.nl>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 125ff8087fca28e922e7ad6e082efcf04fe2f0f4
Author: Jean Delvare <khali at linux-fr.org>
Date: Sat Feb 23 10:57:53 2008 +0100
hwmon: Update the sysfs interface documentation
* Document the characteristics of libsensors 3.0.0 and 3.0.1.
* The sysfs interface is no longer subject to changes.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit ed4ec814e45ae8b1596aea0a29b92f6c3614acaa
Author: Jean Delvare <khali at linux-fr.org>
Date: Sat Apr 26 16:34:26 2008 +0200
hwmon: (adt7473) Initialize max_duty_at_overheat before use
data->max_duty_at_overheat is not updated in adt7473_update_device,
so it might be used before it is initialized (if the user reads from
sysfs file max_duty_at_crit before writing to it.)
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Darrick J. Wong <djwong at us.ibm.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit d38b149794e7444a55e741446717147e7f0467f8
Author: Jean Delvare <khali at linux-fr.org>
Date: Thu Apr 3 10:40:39 2008 +0200
hwmon: (lm85) Fix function RANGE_TO_REG()
Function RANGE_TO_REG() is broken. For a requested range of 2000 (2
degrees C), it will return an index value of 15, i.e. 80.0 degrees C,
instead of the expected index value of 0. All other values are handled
properly, just 2000 isn't.
The bug was introduced back in November 2004 by this patch:
http://git.kernel.org/?p=linux/kernel/git/tglx/history.git;a=commit;h=1c28d80f1992240373099d863e4996cdd5d646d0
While this can be fixed easily with the current code, I'd rather
rewrite the whole function in a way which is more obviously correct.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: Justin Thiessen <jthiessen at penguincomputing.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit f30ac0ce34f32bb998ac87e37b251374de03e603
Author: Sonic Zhang <sonic.zhang at analog.com>
Date: Thu Jun 19 17:46:39 2008 +0800
Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue.
This allows other threads to run when the serial driver polls the CTS
PIN in a loop.
Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit ec64b6c8763c83899908fdd62746435c19211686
Author: Sonic Zhang <sonic.zhang at analog.com>
Date: Thu Jun 19 17:07:15 2008 +0800
Blackfin arch: fix typo error in bf548 serial header file
Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit d3942cff620bea073fc4e3c8ed878eb1e84615ce
Author: Bernhard Walle <bwalle at suse.de>
Date: Sun Jun 8 16:16:07 2008 +0200
x86: use BOOTMEM_EXCLUSIVE on 32-bit
This patch uses the BOOTMEM_EXCLUSIVE for crashkernel reservation also for
i386 and prints a error message on failure.
The patch is still for 2.6.26 since it is only bug fixing. The unification
of reserve_crashkernel() between i386 and x86_64 should be done for 2.6.27.
Signed-off-by: Bernhard Walle <bwalle at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Cc: <stable at kernel.org>
commit df17b1d990fc214f033c5588e58216ec941591e0
Author: Mikael Pettersson <mikpe at it.uu.se>
Date: Sun Jun 15 02:19:56 2008 +0200
x86, 32-bit: fix boot failure on TSC-less processors
Booting 2.6.26-rc6 on my 486 DX/4 fails with a "BUG: Int 6"
(invalid opcode) and a kernel halt immediately after the
kernel has been uncompressed. The BUG shows EIP pointing
to an rdtsc instruction in native_read_tsc(), invoked from
native_sched_clock().
(This error occurs so early that not even the serial console
can capture it.)
A bisection showed that this bug first occurs in 2.6.26-rc3-git7,
via commit 9ccc906c97e34fd91dc6aaf5b69b52d824386910:
>x86: distangle user disabled TSC from unstable
>
>tsc_enabled is set to 0 from the command line switch "notsc" and from
>the mark_tsc_unstable code. Seperate those functionalities and replace
>tsc_enable with tsc_disable. This makes also the native_sched_clock()
>decision when to use TSC understandable.
>
>Preparatory patch to solve the sched_clock() issue on 32 bit.
>
>Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
The core reason for this bug is that native_sched_clock() gets
called before tsc_init().
Before the commit above, tsc_32.c used a "tsc_enabled" variable
which defaulted to 0 == disabled, and which only got enabled late
in tsc_init(). Thus early calls to native_sched_clock() would skip
the TSC and use jiffies instead.
After the commit above, tsc_32.c uses a "tsc_disabled" variable
which defaults to 0, meaning that the TSC is Ok to use. Early calls
to native_sched_clock() now erroneously try to use the TSC on
!cpu_has_tsc processors, leading to invalid opcode exceptions.
My proposed fix is to initialise tsc_disabled to a "soft disabled"
state distinct from the hard disabled state set up by the "notsc"
kernel option. This fixes the native_sched_clock() problem. It also
allows tsc_init() to be simplified: instead of setting tsc_disabled = 1
on every error return, we just set tsc_disabled = 0 once when all
checks have succeeded.
I've verified that this lets my 486 boot again. I've also verified
that a Core2 machine still uses the TSC as clocksource after the patch.
Signed-off-by: Mikael Pettersson <mikpe at it.uu.se>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 75118a82e21cafb4a82b53bb85d1c7689787e046
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Fri Jun 13 15:47:12 2008 -0700
x86: fix NULL pointer deref in __switch_to
Patrick McHardy reported a crash:
> > I get this oops once a day, its apparently triggered by something
> > run by cron, but the process is a different one each time.
> >
> > Kernel is -git from yesterday shortly before the -rc6 release
> > (last commit is the usb-2.6 merge, the x86 patches are missing),
> > .config is attached.
> >
> > I'll retry with current -git, but the patches that have gone in
> > since I last updated don't look related.
> >
> > [62060.043009] BUG: unable to handle kernel NULL pointer dereference at
> > 000001ff
> > [62060.043009] IP: [<c0102a9b>] __switch_to+0x2f/0x118
> > [62060.043009] *pde = 00000000
> > [62060.043009] Oops: 0002 [#1] PREEMPT
Vegard Nossum analyzed it:
> This decodes to
>
> 0: 0f ae 00 fxsave (%eax)
>
> so it's related to the floating-point context. This is the exact
> location of the crash:
>
> $ addr2line -e arch/x86/kernel/process_32.o -i ab0
> include/asm/i387.h:232
> include/asm/i387.h:262
> arch/x86/kernel/process_32.c:595
>
> ...so it looks like prev_task->thread.xstate->fxsave has become NULL.
> Or maybe it never had any other value.
Somehow (as described below) TS_USEDFPU is set but the fpu is not
allocated or freed.
Another possible FPU pre-emption issue with the sleazy FPU optimization
which was benign before but not so anymore, with the dynamic FPU allocation
patch.
New task is getting exec'd and it is prempted at the below point.
flush_thread() {
...
/*
* Forget coprocessor state..
*/
clear_fpu(tsk);
<----- Preemption point
clear_used_math();
...
}
Now when it context switches in again, as the used_math() is still set
and fpu_counter can be > 5, we will do a math_state_restore() which sets
the task's TS_USEDFPU. After it continues from the above preemption point
it does clear_used_math() and much later free_thread_xstate().
Now, at the next context switch, it is quite possible that xstate is
null, used_math() is not set and TS_USEDFPU is still set. This will
trigger unlazy_fpu() causing kernel oops.
Fix this by clearing tsk's fpu_counter before clearing task's fpu.
Reported-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ad524d46f36bbc32033bb72ba42958f12bf49b06
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Fri Jun 6 10:21:39 2008 +0100
x86: set PAE PHYSICAL_MASK_SHIFT to 44 bits.
When a 64-bit x86 processor runs in 32-bit PAE mode, a pte can
potentially have the same number of physical address bits as the
64-bit host ("Enhanced Legacy PAE Paging"). This means, in theory,
we could have up to 52 bits of physical address in a pte.
The 32-bit kernel uses a 32-bit unsigned long to represent a pfn.
This means that it can only represent physical addresses up to 32+12=44
bits wide. Rather than widening pfns everywhere, just set 2^44 as the
Linux x86_32-PAE architectural limit for physical address size.
This is a bugfix for two cases:
1. running a 32-bit PAE kernel on a machine with
more than 64GB RAM.
2. running a 32-bit PAE Xen guest on a host machine with
more than 64GB RAM
In both cases, a pte could need to have more than 36 bits of physical,
and masking it to 36-bits will cause fairly severe havoc.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Cc: Jan Beulich <jbeulich at novell.com>
Cc: <stable at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9c106c119ebedf624fbd682fd2a4d52e3c8c1a67
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Tue May 27 12:23:29 2008 -0500
softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
The touch_nmi_watchdog() routine on x86 ultimately calls
touch_softlockup_watchdog(). The problem is that to touch the
softlockup watchdog, the cpu_clock code has to be called which could
involve multiple cpu locks and can lead to a hard hang if one of the
locks is held by a processor that is not going to return anytime soon
(such as could be the case with kgdb or perhaps even with some other
kind of exception).
This patch causes the public version of the
touch_softlockup_watchdog() to defer the cpu clock access to a later
point.
The test case for this problem is to use the following kernel config
options:
CONFIG_KGDB_TESTS=y
CONFIG_KGDB_TESTS_ON_BOOT=y
CONFIG_KGDB_TESTS_BOOT_STRING="V1F100I100000"
It should be noted that kgdb test suite and these options were not
available until 2.6.26-rc2, so it was necessary to patch the kgdb
test suite during the bisection.
I would consider this patch a regression fix because the problem first
appeared in commit 27ec4407790d075c325e1f4da0a19c56953cce23 when some
logic was added to try to periodically sync the clocks. It was
possible to work around this particular problem by simply not
performing the sync anytime the system was in a critical context.
This was ok until commit 3e51f33fcc7f55e6df25d15b55ed10c8b4da84cd,
which added config option CONFIG_HAVE_UNSTABLE_SCHED_CLOCK and some
multi-cpu locks to sync the clocks. It became clear that accessing
this code from an nmi was the source of the lockups. Avoiding the
access to the low level clock code from an code inside the NMI
processing also fixed the problem with the 27ec44... commit.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit afd38009cc3acd36d41f349a669ad5825d695b1f
Author: Steven Rostedt <rostedt at goodmis.org>
Date: Thu May 22 14:18:17 2008 -0400
rcupreempt: remove export of rcu_batches_completed_bh
In rcupreempt, rcu_batches_completed_bh is defined as a static inline in
the header file. This does not need to be exported, and not only that,
this breaks my PPC build.
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Cc: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
Cc: paulus at samba.org
Cc: linuxppc-dev at ozlabs.org
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 30e0e178193d4221abc9926b07a4c7661c7cc4a9
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue May 13 10:27:17 2008 +0800
cpuset: limit the input of cpuset.sched_relax_domain_level
We allow the inputs to be [-1 ... SD_LV_MAX), and return -EINVAL
for inputs outside this range.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Acked-by: Paul Menage <menage at google.com>
Acked-by: Paul Jackson <pj at sgi.com>
Acked-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit d819c49da624e3ee09b2844603d58265039eecdd
Merge: f18f982abf183e91f435990d337164c7a43d1e6d 9bedbcb207ed9a571b239231d99c8fd4a34ae24d
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu Jun 19 09:37:31 2008 +0200
Merge branch 'linus' into sched/urgent
commit f18f982abf183e91f435990d337164c7a43d1e6d
Author: Max Krasnyansky <maxk at qualcomm.com>
Date: Thu May 29 11:17:01 2008 -0700
sched: CPU hotplug events must not destroy scheduler domains created by the cpusets
First issue is not related to the cpusets. We're simply leaking doms_cur.
It's allocated in arch_init_sched_domains() which is called for every
hotplug event. So we just keep reallocation doms_cur without freeing it.
I introduced free_sched_domains() function that cleans things up.
Second issue is that sched domains created by the cpusets are
completely destroyed by the CPU hotplug events. For all CPU hotplug
events scheduler attaches all CPUs to the NULL domain and then puts
them all into the single domain thereby destroying domains created
by the cpusets (partition_sched_domains).
The solution is simple, when cpusets are enabled scheduler should not
create default domain and instead let cpusets do that. Which is
exactly what the patch does.
Signed-off-by: Max Krasnyansky <maxk at qualcomm.com>
Cc: pj at sgi.com
Cc: menage at google.com
Cc: rostedt at goodmis.org
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 15a8641eadb492ef7c5489faa25256967bdfd303
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Thu Jun 19 09:06:59 2008 +0200
sched: rt-group: fix RR buglet
In tick_task_rt() we first call update_curr_rt() which can dequeue a runqueue
due to it running out of runtime, and then we try to requeue it, of it also
having exhausted its RR quota. Obviously requeueing something that is no longer
on the runqueue will not have the expected result.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Tested-by: Daniel K. <dk at uw.no>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit ad2a3f13b7258a5daaaeb8cff9f835aac468b71d
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Thu Jun 19 09:06:57 2008 +0200
sched: rt-group: heirarchy aware throttle
The bandwidth throttle code dequeues a group when it runs out of quota, and
re-queues it once the period rolls over and the quota gets refreshed.
Sadly it failed to take the hierarchy into consideration. Share more of the
enqueue/dequeue code with regular task opterations.
Also, some operations like sched_setscheduler() can dequeue/enqueue tasks that
are in throttled runqueues, we should not inadvertly re-enqueue empty runqueues
so check for that.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Tested-by: Daniel K. <dk at uw.no>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7ea56616ba6b3d67a4892728182e38ae162ea3e7
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Thu Jun 19 09:06:56 2008 +0200
sched: rt-group: fix hierarchy
Don't re-set the entity's runqueue to the wrong rq after we've set it
to the right one.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Tested-by: Daniel K. <dk at uw.no>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 49307fd6f72bdd68cc2bd23e7da0bcfecf8087c9
Author: Dario Faggioli <raistlin at linux.it>
Date: Wed Jun 18 09:18:38 2008 +0200
sched: NULL pointer dereference while setting sched_rt_period_us
When CONFIG_RT_GROUP_SCHED and CONFIG_CGROUP_SCHED are enabled, with:
echo 10000 > /proc/sys/kernel/sched_rt_period_us
We get this:
BUG: unable to handle kernel NULL pointer dereference at 0000008c
[ 947.682233] IP: [<c0216b72>] __rt_schedulable+0x12/0x160
[ 947.683123] *pde = 00000000=20
[ 947.683782] Oops: 0000 [#1]
[ 947.684307] Modules linked in:
[ 947.684308]
[ 947.684308] Pid: 2359, comm: bash Not tainted (2.6.26-rc6 #8)
[ 947.684308] EIP: 0060:[<c0216b72>] EFLAGS: 00000246 CPU: 0
[ 947.684308] EIP is at __rt_schedulable+0x12/0x160
[ 947.684308] EAX: 00000000 EBX: 00000000 ECX: 00000000 EDX: 00000001
[ 947.684308] ESI: c0521db4 EDI: 00000001 EBP: c6cc9f00 ESP: c6cc9ed0
[ 947.684308] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
[ 947.684308] Process bash (pid: 2359, tiÃcc8000 taskÃa54f00=20 task.tiÃcc8000)
[ 947.684308] Stack: c0222790 00000000 080f8c08 c0521db4 c6cc9f00 00000001 00000000 00000000
[ 947.684308] c6cc9f9c 00000000 c0521db4 00000001 c6cc9f28 c0216d40 00000000 00000000
[ 947.684308] c6cc9f9c 000f4240 000e7ef0 ffffffff c0521db4 c79dfb60 c6cc9f58 c02af2cc
[ 947.684308] Call Trace:
[ 947.684308] [<c0222790>] ? do_proc_dointvec_conv+0x0/0x50
[ 947.684308] [<c0216d40>] ? sched_rt_handler+0x80/0x110
[ 947.684308] [<c02af2cc>] ? proc_sys_call_handler+0x9c/0xb0
[ 947.684308] [<c02af2fa>] ? proc_sys_write+0x1a/0x20
[ 947.684308] [<c0273c36>] ? vfs_write+0x96/0x160
[ 947.684308] [<c02af2e0>] ? proc_sys_write+0x0/0x20
[ 947.684308] [<c027423d>] ? sys_write+0x3d/0x70
[ 947.684308] [<c0202ef5>] ? sysenter_past_esp+0x6a/0x91
[ 947.684308] =======================
[ 947.684308] Code: 24 04 e8 62 b1 0e 00 89 c7 89 f8 8b 5d f4 8b 75
f8 8b 7d fc 89 ec 5d c3 90 55 89 e5 57 56 53 83 ec 24 89 45 ec 89 55 e4
89 4d e8 <8b> b8 8c 00 00 00 85 ff 0f 84 c9 00 00 00 8b 57 24 39 55 e8
8b
[ 947.684308] EIP: [<c0216b72>] __rt_schedulable+0x12/0x160 SS:ESP 0068:c6cc9ed0
We think the following patch solves the issue.
Signed-off-by: Dario Faggioli <raistlin at linux.it>
Signed-off-by: Michael Trimarchi <trimarchimichael at yahoo.it>
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9bedbcb207ed9a571b239231d99c8fd4a34ae24d
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jun 19 14:57:31 2008 +1000
agp: brown paper bag patch - put back two lines that got lost
Commit 62c96b9d0917894c164aa3e474a3ff3bca1554ae ("agp/intel: cleanup
some serious whitespace badness") didn't just fix whitespace. It also
lost two lines.
Noticed by Linus. No more whitespace diffs for me.
Signed-off-by: Dave Airlie <airlied at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0e480e5fc03c411d350478b2e8dc0906a37b6f07
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jun 19 14:57:31 2008 +1000
agp: brown paper bag patch - put back the two lines it took out.
no more whitespace diffs for me.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 3506ba7b082f9330657b3386c98246d5fda6c698
Merge: f9d1c6ca2bb1bbfde4a95d9e55ab3b0126825295 62c96b9d0917894c164aa3e474a3ff3bca1554ae
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 18 21:52:35 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/intel: cleanup some serious whitespace badness
[AGP] intel_agp: Add support for Intel 4 series chipsets
[AGP] intel_agp: extra stolen mem size available for IGD_GM chipset
agp: more boolean conversions.
drivers/char/agp - use bool
agp: two-stage page destruction issue
agp/via: fixup pci ids
commit 62c96b9d0917894c164aa3e474a3ff3bca1554ae
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jun 19 14:27:53 2008 +1000
agp/intel: cleanup some serious whitespace badness
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 25ce77abf8be3a96b3673e46722a9bd05f149584
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Thu Jun 19 14:17:58 2008 +1000
[AGP] intel_agp: Add support for Intel 4 series chipsets
Signed-off-by: Zhenyu Wang <zhenyu.z.wang at intel.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 598d14482380312939a3e3a4ae0657eb6b50a532
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Thu Jun 19 14:00:37 2008 +1000
[AGP] intel_agp: extra stolen mem size available for IGD_GM chipset
This adds missing stolen memory size detect for IGD_GM, be sure to
detect right size as current X intel driver (2.3.2) which has already
worked out.
Signed-off-by: Zhenyu Wang <zhenyu.z.wang at intel.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 21efa2bac91b8d12064617c5a35492ec982544eb
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jun 19 13:01:58 2008 +1000
drm/radeon: add hier-z registers for r300 and r500 chipsets
commit 5e35eff13f7dd0f5c1d82b3b4708b2f7a5f44113
Author: Alex Deucher <alex at botchco.com>
Date: Thu Jun 19 12:39:23 2008 +1000
drm/radeon: use DSTCACHE_CTLSTAT rather than RB2D_DSTCACHE_CTLSTAT
According to the hw guys, you should use DSTCACHE_CTLSTAT to flush
the 2D dst cache rather than RB2D_DSTCACHE_CTLSTAT.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 5cfb6956073a9e42d44a26790b7800980634d037
Author: Alex Deucher <alex at botchco.com>
Date: Thu Jun 19 12:38:29 2008 +1000
drm/radeon: switch IGP gart to use radeon_write_agp_base()
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 7ecabc53a29bb31689fa1852a926e021179a64a6
Author: Dennis Kasprzyk <onestone at opencompositing.org>
Date: Thu Jun 19 12:36:55 2008 +1000
drm/radeon: Restore sw interrupt on resume
Fixes performance drop after suspend/resume on some systems.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 70b13d510fc9d137e362b7db3ac5b14b50d78477
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jun 19 11:40:44 2008 +1000
drm/r500: add support for AGP based cards.
AGP registers weren't programmed properly for r500 cards.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 9156cf09f56150ed89f77eaa4c386a07789776a0
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date: Thu Jun 19 11:36:04 2008 +1000
drm/radeon: fix texture uploads with large 3d textures (bug 13980)
Texture uploads could hit the blitter coordinate limit, adjust the texture
offset when uploading the pieces. Make sure to check the end address of the
upload too.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit c0beb2a723d69934a53f51a9d664c5b1dbbf634b
Author: Dave Airlie <airlied at redhat.com>
Date: Wed May 28 13:52:28 2008 +1000
drm/radeon: add initial r500 support.
This contains all the command buffer processing for the r500 cards.
It doesn't yet contain vblank support.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 5b92c4045eaa42441b7ec249a406e4110ea400d4
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed May 28 11:57:40 2008 +1000
drm/radeon: init pipe setup in kernel code.
This inits the card pipes in the kernel and lets userspace getparam
the correct setup.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit d396db321bcaec54345e7e9e87cea8482d6ae3a8
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed May 28 11:54:06 2008 +1000
drm/radeon: fixup radeon_do_engine_reset
Cleanup do engine reset for different chip families.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 259434acccbc823ee8bc00b2d2689ccccd25e1fd
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed May 28 11:51:12 2008 +1000
drm/radeon: fix pixcache and purge/cache flushing registers
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit d7463eb41d88a39de2653fd41857c4ccddb8707b
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed May 28 11:46:36 2008 +1000
drm/radeon: write AGP_BASE_2 on chips that support it.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 45e519052e8f583a709edd442a23f59581d3fe42
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed May 28 13:28:59 2008 +1000
drm/radeon: merge IGP chip setup and fixup RS400 vs RS480 support
We only support RS480 (AMD based IGP) at the moment not
RS400 (Intel based IGP) ones.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 2735977b12cb0f113aae24afff04747b6d0f5bf1
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed May 28 12:54:16 2008 +1000
drm/radeon: IGP clean up register and magic numbers.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 3722bfc607d46275369865c02fe8694486d640b5
Author: Dave Airlie <airlied at linux.ie>
Date: Wed May 28 11:28:27 2008 +1000
drm/rs690: set base 2 to 0.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit fa0d71b967506031f7cb08ced6095d1c4f988594
Author: Dave Airlie <airlied at linux.ie>
Date: Wed May 28 11:27:01 2008 +1000
drm/rs690: set all of gart base address.
Docs state bits 4-11 maps to bits 32-39 of the 40-bit range
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 9f18409ea3d778a171a9505c0a849d846f352bd0
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed May 28 11:21:25 2008 +1000
radeon: add production microcode from AMD
This adds production microcode for r100->r500 from AMD.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 7ec700fcaf4f01ae72956df74a9e0d08938fd26e
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jun 19 11:27:23 2008 +1000
drm: pcigart use proper pci map interfaces.
Switch to using more correct pci dma mapping interfaces.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 9a3b103c27a7e3199b917bc3ca219530132afdfc
Author: Tejun Heo <tj at kernel.org>
Date: Wed Jun 18 20:56:58 2008 -0400
ahci: sis can't do PMP
From: Piter PUNK <piterpunk at slackware.com>
SiS AHCIs say they can do PMP but can't and fail detection if SRST w/
pmp==15 is used. Turn off PMP support.
tj: added patch description, adapted patch to #upstream-fixes and
renamed board_ahci_sis to board_ahci_nopmp.
Signed-off-by: Tejun Heo <tj at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9516b030b484fc99cf24213caf88df01f99248dd
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jun 19 10:42:17 2008 +1000
agp: more boolean conversions.
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 040dee53a724f54d47876674d50184873364f207
Author: Tejun Heo <htejun at gmail.com>
Date: Fri Jun 13 18:05:02 2008 +0900
ata_piix: add TECRA M4 to broken suspend list
TOSHIBA also used "TECRA M4" in additon to "Tecra M4", add it.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit cc18e0fea7907e7a96b7df71b81838d518bc074e
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Jun 16 12:16:26 2008 +0100
LIBATA: Add HAVE_PATA_PLATFORM to select PATA_PLATFORM driver
Add HAVE_PATA_PLATFORM to select the pata platform driver
to ensure that we do not end up with a long 'depends on' list
when other users of this driver turn up.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c6112bd86bc8f727bb732a47f2133e0ff12beda9
Author: Mark Lord <liml at rtr.ca>
Date: Wed Jun 18 12:13:02 2008 -0400
sata_mv: warn on PIO with multiple DRQs
Chip errata sometimes prevents reliable use of PIO commands which involve
more than a single DRQ (data request). In normal operation, libata should
not generate such PIO commands (uses DMA instead), but they could be sent
in via SG_IO from userspace.
A full workaround might be to break up such commands into sequences
of single DRQ ones, but that's just way too complex for something
that doesn't normally happen in real life.
So, allow the attempt (it often works, despite the errata),
but log the event for reference when somebody screams.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3bd0a70ee9cc30ae81b39cb5ecad0fa7bcb4675b
Author: Mark Lord <liml at rtr.ca>
Date: Wed Jun 18 12:11:16 2008 -0400
sata_mv: enable async_notify for 60x1 Rev.C0 and higher
The early chipsets cannot safely handle Async Notification (AN),
but 6041/6081 chip revision "C0" (and newer) can handle it.
So allow AN for "C0" and higher.
This enables use of hotplug on PMP ports for the 6041/6081 PCI Rev.9 chips.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 5895ef9a5b746e7cc9ebda50c87fbd11562da0a4
Author: Tejun Heo <tj at kernel.org>
Date: Tue Jun 17 12:36:26 2008 +0900
libata: don't check whether to use DMA or not for no data commands
There's no reason to check whether to use DMA or not for no data
commands. Don't do it. While at it, make local variable using_pio in
atapi_xlat() set iff ATAPI_PROT_PIO is going to be used and rename
ata_check_atapi_dma() to atapi_check_dma() for consistency.
Signed-off-by: Tejun Heo <tj at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d799e083a80b220f3681d7790f11e77d1704022b
Author: Tejun Heo <tj at kernel.org>
Date: Tue Jun 17 12:46:30 2008 +0900
ahci: jmb361 has only one port
JMB361 has only one port but reports it has two causing longish probe
failure on the second one. Quirk it.
Reported by Gajo Petrovic in bz 10911.
Signed-off-by: Tejun Heo <tj at kernel.org>
Cc: Gajo Petrovic <gajo01 at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c72580129209aaa509ace81c1f2ee1caa9c9774b
Author: Joe Perches <joe at perches.com>
Date: Wed Mar 26 14:10:02 2008 -0700
drivers/char/agp - use bool
Use boolean in AGP instead of having own TRUE/FALSE
--
Signed-off-by: Joe Perches <joe at perches.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit da503fa60b84d5945deb3ab74efdd0bec61df4a1
Author: Jan Beulich <jbeulich at novell.com>
Date: Wed Jun 18 09:28:00 2008 +0100
agp: two-stage page destruction issue
besides it apparently being useful only in 2.6.24 (the changes in 2.6.25
really mean that it could be converted back to a single-stage mechanism),
I'm seeing an issue in Xen Dom0 kernels, which is caused by the calling
of gart_to_virt() in the second stage invocations of the destroy function.
I think that besides this being a real issue with Xen (where
unmap_page_from_agp() is not just a page table attribute change), this
also is invalid from a theoretical perspective: One should not assume that
gart_to_virt() is still valid after unmapping a page. So minimally (keeping
the 2-stage mechanism) a patch like the one below would be needed.
Jan
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit dcd981a77b2b35d169656d4b9cee208096ed7ccf
Author: Greg KH <gregkh at suse.de>
Date: Thu Jun 19 09:52:26 2008 +1000
agp/via: fixup pci ids
add a new PCI ID and remove an old dodgy one, include the explaination
in the commented code so nobody readds later.
(davej also sent the pci id addition).
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit f9d1c6ca2bb1bbfde4a95d9e55ab3b0126825295
Merge: a8051fde6b71ac9a0e63c861c81c59ba776175f9 fb77bcef9f7be78e3e11543cb5abbcb1b1fac53e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 18 16:08:59 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/uverbs: Fix check of is_closed flag check in ib_uverbs_async_handler()
RDMA/nes: Fix off-by-one in nes_reg_user_mr() error path
commit ef3a62d272f033989e83eb1f26505f93f93e3e69
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Wed Jun 18 15:39:48 2008 -0700
mac80211: detect driver tx bugs
When a driver rejects a frame in it's ->tx() callback, it must also
stop queues, otherwise mac80211 can go into a loop here. Detect this
situation and abort the loop after five retries, warning about the
driver bug.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit fb77bcef9f7be78e3e11543cb5abbcb1b1fac53e
Author: Jack Morgenstein <jackm at dev.mellanox.co.il>
Date: Wed Jun 18 15:36:38 2008 -0700
IB/uverbs: Fix check of is_closed flag check in ib_uverbs_async_handler()
Commit 1ae5c187 ("IB/uverbs: Don't store struct file * for event
files") changed the way that closed files are handled in the uverbs
code. However, after the conversion, is_closed flag is checked
incorrectly in ib_uverbs_async_handler(). As a result, no async
events are ever passed to applications.
Found by: Ronni Zimmerman <ronniz 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 9499fe2b340d19ef55c349de794db9d917e7403f
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Mon Jun 16 01:39:28 2008 +0200
ieee1394: Kconfig menu touch-up
Rename and reorder some prompts and modify some help texts.
The result:
-------------------- IEEE 1394 (FireWire) support --------------------
*** Enable only one of the two stacks, unless you know what you are doing ***
New FireWire stack, EXPERIMENTAL
OHCI-1394 controllers
Storage devices (SBP-2 protocol)
Stable FireWire stack
OHCI-1394 controllers
PCILynx controller
Storage devices (SBP-2 protocol)
Enable replacement for physical DMA in SBP2
IP over 1394
raw1394 userspace interface
video1394 userspace interface
dv1394 userspace interface (deprecated)
Excessive debugging output
The old prompts for reference:
-------------------- IEEE 1394 (FireWire) support --------------------
IEEE 1394 (FireWire) support - alternative stack, EXPERIMENTAL
Support for OHCI FireWire host controllers
Support for storage devices (SBP-2 protocol driver)
IEEE 1394 (FireWire) support
*** Subsystem Options ***
Excessive debugging output
*** Controllers ***
Texas Instruments PCILynx support
OHCI-1394 support
*** Protocols ***
OHCI-1394 Video support
SBP-2 support (Harddisks etc.)
Enable replacement for physical DMA in SBP2
IP over 1394
OHCI-DV I/O support (deprecated)
Raw IEEE1394 I/O support
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit a7b64b8704b03c9972b114932fdf517e06153f11
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Jun 14 14:24:53 2008 +0200
firewire: Kconfig menu touch-up
Emphasize the recommendation to build only one stack.
Trim the prompts to better fit into short attention spans.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit ae1e53557911d7e60a637b2400173add958aae94
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Wed Jun 18 18:20:45 2008 +0200
firewire: deadline for PHY config transmission
If the low-level driver failed to initialize a card properly without
noticing it, fw-core was blocked indefinitely when trying to send a
PHY config packet. This hung up the events kernel thread, e.g. locked
up keyboard input.
https://bugzilla.redhat.com/show_bug.cgi?id=444694
https://bugzilla.redhat.com/show_bug.cgi?id=446763
This problem was introduced between 2.6.25 and 2.6.26-rc1 by commit
2a0a2590498be7b92e3e76409c9b8ee722e23c8f "firewire: wait until PHY
configuration packet was transmitted (fix bus reset loop)".
The solution is to wait with timeout. I tested it with 7 different
working controllers and 1 non-working controller. On the working ones,
the packet callback complete()s usually --- but not always --- before a
timeout of 10ms. Hence I chose a safer timeout of 100ms.
On the few tests with the non-working controller ALi M5271, PHY config
packet transmission always timed out so far. (Fw-ohci needs to be fixed
for this controller independently of this deadline fix. Often the core
doesn't even attempt to send a phy config because not even self ID
reception works.)
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 161b96e782ec995c55843101976d9c35b57aa109
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Jun 14 14:23:43 2008 +0200
firewire: fw-ohci: unify printk prefixes
The messages which can be enabled by fw-ohci's debug module parameter
are changed from KERN_DEBUG to KERN_NOTICE level and uniformly prefixed
with "firewire_ohci: ". This further simplifies communication with
users when we ask them to capture debug messages.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 5cb84067d646fa3889463129dad8b218806b4698
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Fri Jun 6 22:11:30 2008 +0200
firewire: fill_bus_reset_event needs lock protection
Callers of fill_bus_reset_event() have to take card->lock. Otherwise
access to node data may oops if node removal is in progress.
A lockless alternative would be
- event->local_node_id = card->local_node->node_id;
+ tmp = fw_node_get(card->local_node);
+ event->local_node_id = tmp->node_id;
+ fw_node_put(tmp);
and ditto with the other node pointers which fill_bus_reset_event()
accesses. But I went the locked route because one of the two callers
already holds the lock. As a bonus, we don't need the memory barrier
anymore because device->generation and device->node_id are written in
a card->lock protected section.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
commit affc9c24ade666f9903163c12686da567dbfe06f
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Jun 5 20:50:53 2008 +0200
firewire: fw-ohci: write selfIDBufferPtr before LinkControl.rcvSelfID
OHCI 1.1 clause 5.10 requires that selfIDBufferPtr is valid when a 1 is
written into LinkControl.rcvSelfID.
This driver bug has so far not been known to cause harm because most
chips obviously accept a later selfIDBufferPtr write, at least before
HCControl.linkEnable is written.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
commit e896ec4302f45fdaf2fc78aec0093eca5478fe28
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Jun 5 20:49:38 2008 +0200
firewire: fw-ohci: disable PHY packet reception into AR context
We want the rcvPhyPkt bit in LinkControl off before we start using the
chip. However, the spec says that the reset value of it is undefined.
Hence switch it explicitly off.
https://bugzilla.redhat.com/show_bug.cgi?id=244576#c48 shows that for
example the nForce2 integrated FireWire controller seems to have it on
by default.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson at redhat.com>
commit ccff962943df539c5860aa120eecc189d70a308b
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat May 31 19:36:06 2008 +0200
firewire: fw-ohci: use of uninitialized data in AR handler
header_length and payload_length are filled with random data if an
unknown tcode was read from the AR buffer (i.e. if the AR buffer
contained invalid data).
We still need a better strategy to recover from this, but at least
handle_ar_packet now doesn't return out of bound buffer addresses
anymore.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 0bf607c5b4edd13362e4add6ca1e81f8a9fbd47c
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat May 31 19:01:26 2008 +0200
firewire: don't panic on invalid AR request buffer
BUG() at this place is wrong. (Unless if the low level driver would
already do higher-level input validation of incoming request headers.)
Invalid incoming requests or bugs in the controller which corrupt the
AR-req buffer needlessly crashed the box because this is run in tasklet
context.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit a8051fde6b71ac9a0e63c861c81c59ba776175f9
Merge: 5dfd06215b951de70b3e610de47813811c822a44 fdf7be6f13b920f0d80c249c70f794a2f6d53992
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 18 12:55:00 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
Revert "[WATCHDOG] hpwdt: Fix NMI handling."
[WATCHDOG] hpwdt: Add CFLAGS to get driver working
Revert "[WATCHDOG] make watchdog/hpwdt.c:asminline_call() static"
commit 5dfd06215b951de70b3e610de47813811c822a44
Merge: f32c23f59a3af0c5bb9e198386f2e6cd22038e9f f93daa3f7ff4f0cc13acc7452a00feb1c586102a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 18 11:55:43 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] dpt_i2o: Add PROC_IA64 define
[SCSI] scsi_host regression: fix scsi host leak
[SCSI] sr: fix corrupt CD data after media change and delay
commit f32c23f59a3af0c5bb9e198386f2e6cd22038e9f
Merge: e899536470ec83f2792092640148f2488961731b 65ba6cdc837af9b77354d03987354196ac4eb308
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 18 11:55:19 2008 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Clear sub-page HPTE present bits when demoting page size
[POWERPC] 4xx: Clear new TLB cache attribute bits in Data Storage vector
commit e899536470ec83f2792092640148f2488961731b
Merge: d83b14c0db5b238975990c0abda51521120106e9 e4f3ec063421bdbcb93330e72aa3eeedb6a0d85a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 18 11:55:03 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:
udf: restore UDFFS_DEBUG to being undefined by default
commit d83b14c0db5b238975990c0abda51521120106e9
Merge: 952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061 6d1a3fb567a728d31474636e167c324702a0c38b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 18 11:48:40 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: (43 commits)
netlink: genl: fix circular locking
Revert "mac80211: Use skb_header_cloned() on TX path."
af_unix: fix 'poll for write'/ connected DGRAM sockets
tun: Proper handling of IPv6 header in tun driver when TUN_NO_PI is set
atl1: relax eeprom mac address error check
net/enc28j60: low power mode
net/enc28j60: section fix
sky2: 88E8040T pci device id
netxen: download firmware in pci probe
netxen: cleanup debug messages
netxen: remove global physical_port array
netxen: fix portnum for hp mezz cards
ibm_newemac: select CRC32 in Kconfig
xfrm: fix fragmentation for ipv4 xfrm tunnel
netfilter: nf_conntrack_h323: fix module unload crash
netfilter: nf_conntrack_h323: fix memory leak in module initialization error path
netfilter: nf_nat: fix RCU races
atm: [he] send idle cells instead of unassigned when in SDH mode
atm: [he] limit queries to the device's register space
atm: [br2864] fix routed vcmux support
...
commit fdf7be6f13b920f0d80c249c70f794a2f6d53992
Author: Wim Van Sebroeck <wim at iguana.be>
Date: Wed Jun 18 16:22:48 2008 +0000
Revert "[WATCHDOG] hpwdt: Fix NMI handling."
The old setup works better.
Signed-off-by: Thomas Mingarelli <Thomas.Mingarelli at hp.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 65ba6cdc837af9b77354d03987354196ac4eb308
Author: Paul Mackerras <paulus at samba.org>
Date: Wed Jun 18 16:40:35 2008 +1000
[POWERPC] Clear sub-page HPTE present bits when demoting page size
When we demote a slice from 64k to 4k, and we are about to insert an
HPTE for a 4k subpage and we notice that there is an existing 64k
HPTE, we first invalidate that HPTE before inserting the new 4k
subpage HPTE. Since the bits that encode which hash bucket the old
HPTE was in overlap with the bits that encode which of the 16 subpages
have HPTEs, we need to clear out the subpage HPTE-present bits before
starting to insert HPTEs for the 4k subpages. If we don't do that, we
can erroneously think that a subpage already has an HPTE when it
doesn't.
That in itself wouldn't be such a problem except that when we go to
update the HPTE that we think is present on machines with a
hypervisor, the hypervisor can tell us that the HPTE we think is there
is actually there even though it isn't, which can lead to a process
getting stuck in a loop, continually faulting. The reason for the
confusion is that the AVPN (abbreviated virtual page number) we are
looking for in the HPTE for a 4k subpage can actually match the AVPN
in a stale HPTE for another 64k page. For example, the HPTE for
the 4k subpage at 0x84000f000 will be in the same hash bucket and have
the same AVPN as the HPTE for the 64k page at 0x8400f0000.
This fixes the code to clear out the subpage HPTE-present bits.
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit b17879f71c2eb4a10f5a63918819d9d572b23a9a
Author: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Date: Wed Jun 18 08:34:39 2008 +1000
[POWERPC] 4xx: Clear new TLB cache attribute bits in Data Storage vector
A recent commit added support for the new 440x6 and 464 cores that have the
added WL1, IL1I, IL1D, IL2I, and ILD2 bits for the caching attributes in the
TLBs. The new bits were cleared in the finish_tlb_load function, however a
similar bit of code was missed in the DataStorage interrupt vector.
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 6d1a3fb567a728d31474636e167c324702a0c38b
Author: Patrick McHardy <kaber at trash.net>
Date: Wed Jun 18 02:07:07 2008 -0700
netlink: genl: fix circular locking
genetlink has a circular locking dependency when dumping the registered
families:
- dump start:
genl_rcv() : take genl_mutex
genl_rcv_msg() : call netlink_dump_start() while holding genl_mutex
netlink_dump_start(),
netlink_dump() : take nlk->cb_mutex
ctrl_dumpfamily() : try to detect this case and not take genl_mutex a
second time
- dump continuance:
netlink_rcv() : call netlink_dump
netlink_dump : take nlk->cb_mutex
ctrl_dumpfamily() : take genl_mutex
Register genl_lock as callback mutex with netlink to fix this. This slightly
widens an already existing module unload race, the genl ops used during the
dump might go away when the module is unloaded. Thomas Graf is working on a
seperate fix for this.
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3a5be7d4b079f3a9ce1e8ce4a93ba15ae6d00111
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jun 18 01:19:51 2008 -0700
Revert "mac80211: Use skb_header_cloned() on TX path."
This reverts commit 608961a5eca8d3c6bd07172febc27b5559408c5d.
The problem is that the mac80211 stack not only needs to be able to
muck with the link-level headers, it also might need to mangle all of
the packet data if doing sw wireless encryption.
This fixes kernel bugzilla #10903. Thanks to Didier Raboud (for the
bugzilla report), Andrew Prince (for bisecting), Johannes Berg (for
bringing this bisection analysis to my attention), and Ilpo (for
trying to analyze this purely from the TCP side).
In 2.6.27 we can take another stab at this, by using something like
skb_cow_data() when the TX path of mac80211 ends up with a non-NULL
tx->key. The ESP protocol code in the IPSEC stack can be used as a
model for implementation.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 3c73419c09a5ef73d56472dbfdade9e311496e9b
Author: Rainer Weikusat <rweikusat at mssgmbh.com>
Date: Tue Jun 17 22:28:05 2008 -0700
af_unix: fix 'poll for write'/ connected DGRAM sockets
The unix_dgram_sendmsg routine implements a (somewhat crude)
form of receiver-imposed flow control by comparing the length of the
receive queue of the 'peer socket' with the max_ack_backlog value
stored in the corresponding sock structure, either blocking
the thread which caused the send-routine to be called or returning
EAGAIN. This routine is used by both SOCK_DGRAM and SOCK_SEQPACKET
sockets. The poll-implementation for these socket types is
datagram_poll from core/datagram.c. A socket is deemed to be writeable
by this routine when the memory presently consumed by datagrams
owned by it is less than the configured socket send buffer size. This
is always wrong for connected PF_UNIX non-stream sockets when the
abovementioned receive queue is currently considered to be full.
'poll' will then return, indicating that the socket is writeable, but
a subsequent write result in EAGAIN, effectively causing an
(usual) application to 'poll for writeability by repeated send request
with O_NONBLOCK set' until it has consumed its time quantum.
The change below uses a suitably modified variant of the datagram_poll
routines for both type of PF_UNIX sockets, which tests if the
recv-queue of the peer a socket is connected to is presently
considered to be 'full' as part of the 'is this socket
writeable'-checking code. The socket being polled is additionally
put onto the peer_wait wait queue associated with its peer, because the
unix_dgram_sendmsg routine does a wake up on this queue after a
datagram was received and the 'other wakeup call' is done implicitly
as part of skb destruction, meaning, a process blocked in poll
because of a full peer receive queue could otherwise sleep forever
if no datagram owned by its socket was already sitting on this queue.
Among this change is a small (inline) helper routine named
'unix_recvq_full', which consolidates the actual testing code (in three
different places) into a single location.
Signed-off-by: Rainer Weikusat <rweikusat at mssgmbh.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4552e1198a08198ce0b42e856845b5394c82c59c
Merge: f09f7ee20c867818bacf79426cf491b2749e7eff 58c7821c4264a7ddd6f0c31c5caaf393b3897f10
Author: David S. Miller <davem at davemloft.net>
Date: Tue Jun 17 21:32:08 2008 -0700
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit f09f7ee20c867818bacf79426cf491b2749e7eff
Author: Ang Way Chuang <wcang at nav6.org>
Date: Tue Jun 17 21:10:33 2008 -0700
tun: Proper handling of IPv6 header in tun driver when TUN_NO_PI is set
By default, tun.c running in TUN_TUN_DEV mode will set the protocol of
packet to IPv4 if TUN_NO_PI is set. My program failed to work when I
assumed that the driver will check the first nibble of packet,
determine IP version and set the appropriate protocol.
Signed-off-by: Ang Way Chuang <wcang at nav6.org>
Acked-by: Max Krasnyansky <maxk at qualcomm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 58c7821c4264a7ddd6f0c31c5caaf393b3897f10
Author: Radu Cristescu <advantis at gmx.net>
Date: Thu Jun 12 17:04:54 2008 -0500
atl1: relax eeprom mac address error check
The atl1 driver tries to determine the MAC address thusly:
- If an EEPROM exists, read the MAC address from EEPROM and
validate it.
- If an EEPROM doesn't exist, try to read a MAC address from
SPI flash.
- If that fails, try to read a MAC address directly from the
MAC Station Address register.
- If that fails, assign a random MAC address provided by the
kernel.
We now have a report of a system fitted with an EEPROM containing all
zeros where we expect the MAC address to be, and we currently handle
this as an error condition. Turns out, on this system the BIOS writes
a valid MAC address to the NIC's MAC Station Address register, but we
never try to read it because we return an error when we find the all-
zeros address in EEPROM.
This patch relaxes the error check and continues looking for a MAC
address even if it finds an illegal one in EEPROM.
Signed-off-by: Radu Cristescu <advantis at gmx.net>
Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7dac6f8df607929e51f4fd598d80bd009c45a9f8
Author: David Brownell <david-b at pacbell.net>
Date: Thu Jun 12 21:38:06 2008 -0700
net/enc28j60: low power mode
Keep enc28j60 chips in low-power mode when they're not in use.
At typically 120 mA, these chips run hot even when idle; this
low power mode cuts that power usage by a factor of around 100.
This version provides a generic routine to poll a register until
its masked value equals some value ... e.g. bit set or cleared.
It's basically what the previous wait_phy_ready() did, but this
version is generalized to support the handshaking needed to
enter and exit low power mode.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Claudio Lanconelli <lanconelli.claudio at eptar.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 6fd65882f5e99972ba96f7cc92086ebac041cdf8
Author: David Brownell <david-b at pacbell.net>
Date: Thu Jun 12 21:36:24 2008 -0700
net/enc28j60: section fix
Minor bugfixes to the enc28j60 driver ... wrong section marking,
indentation, and bogus use of spi_bus_type.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Claudio Lanconelli <lanconelli.claudio at eptar.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a3b4fcedee5cf1d1342b85f1318c0fe1ff1727a9
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Sat Jun 14 10:32:15 2008 -0700
sky2: 88E8040T pci device id
Missed one pci id for 88E8040T.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 439b454edf551f5a6eb49de6b868015724d275ab
Author: Dhananjay Phadke <dhananjay at netxen.com>
Date: Sun Jun 15 22:59:46 2008 -0700
netxen: download firmware in pci probe
Downloading firmware in pci probe allows recovery in case of
firmware failure by reloading the driver.
Also reduced delays in firmware load.
Signed-off-by: Dhananjay Phadke <dhananjay at netxen.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit dcd56fdbaeae1008044687b973c4a3e852e8a726
Author: Dhananjay Phadke <dhananjay at netxen.com>
Date: Sun Jun 15 22:59:45 2008 -0700
netxen: cleanup debug messages
o Remove unnecessary debug prints and functions.
o Explicitly specify pci class (0x020000) to avoid enabling
management function.
Signed-off-by: Dhananjay Phadke <dhananjay at netxen.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3276fbad8385d8e86d85fad4d86dae669a045c65
Author: Dhananjay Phadke <dhananjay at netxen.com>
Date: Sun Jun 15 22:59:44 2008 -0700
netxen: remove global physical_port array
Store physical port number in netxen_adapter structure.
Signed-off-by: Dhananjay Phadke <dhananjay at netxen.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit dc515f2e0b356981ea0c4581ff0e587aea8b624a
Author: Dhananjay Phadke <dhananjay at netxen.com>
Date: Sun Jun 15 22:59:43 2008 -0700
netxen: fix portnum for hp mezz cards
This fixes a the issue where logical port number is set incorrectly
for HP blade mezz cards.
Signed-off-by: Dhananjay Phadke <dhananjay at netxen.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8b8091fbf4d8791ad70b146ba2c892c62c2cdc6b
Author: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Date: Tue Jun 17 19:27:55 2008 -0400
ibm_newemac: select CRC32 in Kconfig
The ibm_newemac driver requires ether_crc to be defined. Apparently it is
possible to generate a .config without CONFIG_CRC32 set which causes the
following link errors if IBM_NEW_EMAC is selected:
LD .tmp_vmlinux1
drivers/built-in.o: In function `emac_hash_mc':
core.c:(.text+0x2f524): undefined reference to `crc32_le'
core.c:(.text+0x2f528): undefined reference to `bitrev32'
make: *** [.tmp_vmlinux1] Error 1
This patch has IBM_NEW_EMAC select CRC32 so we don't hit this error.
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061
Merge: f948d56435fc1f7506f08866302ecd6e60b533dd 90d95ef617a535a8832bdcb8dee07bf591e5dd82
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Jun 17 18:10:40 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: appletouch - implement reset-resume logic
Input: i8042 - retry failed CTR writes when resuming
Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table
Input: pcspkr - remove negative dependency on snd-pcsp
Manually fixed up trivial conflict in drivers/usb/core/quirks.c
commit f948d56435fc1f7506f08866302ecd6e60b533dd
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Tue Jun 17 18:05:40 2008 +0200
fuse: fix thinko in max I/O size calucation
Use max not min to enforce a lower limit on the max I/O size.
This bug was introduced by "fuse: fix max i/o size calculation" (commit
e5d9a0df07484d6d191756878c974e4307fb24ce).
Thanks to Brian Wang for noticing.
Reported-by: Brian Wang <ywang221 at hotmail.com>
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Acked-by: Szabolcs Szakacsits <szaka at ntfs-3g.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cd50e89244087432a70598e432ff199a009b0e73
Author: Eduard - Gabriel Munteanu <eduard.munteanu at linux360.ro>
Date: Sun Jun 15 18:05:01 2008 +0300
Unignore vmlinux.lds.h from Git.
Added !vmlinux.lds.h to .gitignore because it would otherwise be ignored.
Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu at linux360.ro>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 42a886af728c089df8da1b0017b0e7e6c81b5335
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Jun 17 17:47:50 2008 -0700
x86-64: Fix "bytes left to copy" return value for copy_from_user()
Most users by far do not care about the exact return value (they only
really care about whether the copy succeeded in its entirety or not),
but a few special core routines actually care deeply about exactly how
many bytes were copied from user space.
And the unrolled versions of the x86-64 user copy routines would
sometimes report that it had copied more bytes than it actually had.
Very few uses actually have partial copies to begin with, but to make
this bug even harder to trigger, most x86 CPU's use the "rep string"
instructions for normal user copies, and that version didn't have this
issue.
To make it even harder to hit, the one user of this that really cared
about the return value (and used the uncached version of the copy that
doesn't use the "rep string" instructions) was the generic write
routine, which pre-populated its source, once more hiding the problem by
avoiding the exception case that triggers the bug.
In other words, very special thanks to Bron Gondwana who not only
triggered this, but created a test-program to show it, and bisected the
behavior down to commit 08291429cfa6258c4cd95d8833beb40f828b194e ("mm:
fix pagecache write deadlocks") which changed the access pattern just
enough that you can now trigger it with 'writev()' with multiple
iovec's.
That commit itself was not the cause of the bug, it just allowed all the
stars to align just right that you could trigger the problem.
[ Side note: this is just the minimal fix to make the copy routines
(with __copy_from_user_inatomic_nocache as the particular version that
was involved in showing this) have the right return values.
We really should improve on the exceptional case further - to make the
copy do a byte-accurate copy up to the exact page limit that causes it
to fail. As it is, the callers have to do extra work to handle the
limit case gracefully. ]
Reported-by: Bron Gondwana <brong at fastmail.fm>
Cc: Nick Piggin <npiggin at suse.de>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Andi Kleen <andi at firstfloor.org>
Cc: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
(which didn't have this problem), and since
most users that do the carethis was very hard to trigger, but
commit fe833fca2eac6b3d3ad5e35f44ad4638362f1da8
Author: Steffen Klassert <steffen.klassert at secunet.com>
Date: Tue Jun 17 16:37:13 2008 -0700
xfrm: fix fragmentation for ipv4 xfrm tunnel
When generating the ip header for the transformed packet we just copy
the frag_off field of the ip header from the original packet to the ip
header of the new generated packet. If we receive a packet as a chain
of fragments, all but the last of the new generated packets have the
IP_MF flag set. We have to mask the frag_off field to only keep the
IP_DF flag from the original packet. This got lost with git commit
36cf9acf93e8561d9faec24849e57688a81eb9c5 ("[IPSEC]: Separate
inner/outer mode processing on output")
Signed-off-by: Steffen Klassert <steffen.klassert at secunet.com>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a56b8f81580761c65e4d8d0c04ac1cb7a788bdf1
Author: Patrick McHardy <kaber at trash.net>
Date: Tue Jun 17 15:52:32 2008 -0700
netfilter: nf_conntrack_h323: fix module unload crash
The H.245 helper is not registered/unregistered, but assigned to
connections manually from the Q.931 helper. This means on unload
existing expectations and connections using the helper are not
cleaned up, leading to the following oops on module unload:
CPU 0 Unable to handle kernel paging request at virtual address c00a6828, epc == 802224dc, ra == 801d4e7c
Oops[#1]:
Cpu 0
$ 0 : 00000000 00000000 00000004 c00a67f0
$ 4 : 802a5ad0 81657e00 00000000 00000000
$ 8 : 00000008 801461c8 00000000 80570050
$12 : 819b0280 819b04b0 00000006 00000000
$16 : 802a5a60 80000000 80b46000 80321010
$20 : 00000000 00000004 802a5ad0 00000001
$24 : 00000000 802257a8
$28 : 802a4000 802a59e8 00000004 801d4e7c
Hi : 0000000b
Lo : 00506320
epc : 802224dc ip_conntrack_help+0x38/0x74 Tainted: P
ra : 801d4e7c nf_iterate+0xbc/0x130
Status: 1000f403 KERNEL EXL IE
Cause : 00800008
BadVA : c00a6828
PrId : 00019374
Modules linked in: ip_nat_pptp ip_conntrack_pptp ath_pktlog wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_xauth ath_pci ath_dev ath_dfs ath_rate_atheros wlan ath_hal ip_nat_tftp ip_conntrack_tftp ip_nat_ftp ip_conntrack_ftp pppoe ppp_async ppp_deflate ppp_mppe pppox ppp_generic slhc
Process swapper (pid: 0, threadinfo=802a4000, task=802a6000)
Stack : 801e7d98 00000004 802a5a60 80000000 801d4e7c 801d4e7c 802a5ad0 00000004
00000000 00000000 801e7d98 00000000 00000004 802a5ad0 00000000 00000010
801e7d98 80b46000 802a5a60 80320000 80000000 801d4f8c 802a5b00 00000002
80063834 00000000 80b46000 802a5a60 801e7d98 80000000 802ba854 00000000
81a02180 80b7e260 81a021b0 819b0000 819b0000 80570056 00000000 00000001
...
Call Trace:
[<801e7d98>] ip_finish_output+0x0/0x23c
[<801d4e7c>] nf_iterate+0xbc/0x130
[<801d4e7c>] nf_iterate+0xbc/0x130
[<801e7d98>] ip_finish_output+0x0/0x23c
[<801e7d98>] ip_finish_output+0x0/0x23c
[<801d4f8c>] nf_hook_slow+0x9c/0x1a4
One way to fix this would be to split helper cleanup from the unregistration
function and invoke it for the H.245 helper, but since ctnetlink needs to be
able to find the helper for synchonization purposes, a better fix is to
register it normally and make sure its not assigned to connections during
helper lookup. The missing l3num initialization is enough for this, this
patch changes it to use AF_UNSPEC to make it more explicit though.
Reported-by: liannan <liannan at twsz.com>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8a548868db62422113104ebc658065e3fe976951
Author: Patrick McHardy <kaber at trash.net>
Date: Tue Jun 17 15:52:07 2008 -0700
netfilter: nf_conntrack_h323: fix memory leak in module initialization error path
Properly free h323_buffer when helper registration fails.
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 68b80f11380889996aa7eadba29dbbb5c29a5864
Author: Patrick McHardy <kaber at trash.net>
Date: Tue Jun 17 15:51:47 2008 -0700
netfilter: nf_nat: fix RCU races
Fix three ct_extend/NAT extension related races:
- When cleaning up the extension area and removing it from the bysource hash,
the nat->ct pointer must not be set to NULL since it may still be used in
a RCU read side
- When replacing a NAT extension area in the bysource hash, the nat->ct
pointer must be assigned before performing the replacement
- When reallocating extension storage in ct_extend, the old memory must
not be freed immediately since it may still be used by a RCU read side
Possibly fixes https://bugzilla.redhat.com/show_bug.cgi?id=449315
and/or http://bugzilla.kernel.org/show_bug.cgi?id=10875
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4dc7347a3b4a76705b7fd00b271847dd10cf5a32
Author: Thomas Mingarelli <Thomas.Mingarelli at hp.com>
Date: Thu Jun 12 20:20:32 2008 +0000
[WATCHDOG] hpwdt: Add CFLAGS to get driver working
To get this driver working we need the CFLAGS_hpwdt.o += -O in the Makefile.
Signed-off-by: Thomas Mingarelli <Thomas.Mingarelli at hp.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 58c2709c2b551704f289cb3442a41d2a0cf40b6e
Author: Thomas Mingarelli <Thomas.Mingarelli at hp.com>
Date: Thu Jun 12 20:20:32 2008 +0000
Revert "[WATCHDOG] make watchdog/hpwdt.c:asminline_call() static"
The driver needs the asmlinkage tag and the CFLAGS line in the Makefile.
Without it the driver doesn't work.
Signed-off-by: Thomas Mingarelli <Thomas.Mingarelli at hp.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 90d95ef617a535a8832bdcb8dee07bf591e5dd82
Author: Oliver Neukum <oliver at neukum.org>
Date: Tue Jun 17 11:56:55 2008 -0400
Input: appletouch - implement reset-resume logic
On some boxes the touchpad needs to be reinitialized after resume to make
it function again. This fixes bugzilla #10825.
Signed-off-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 2f6a77d56523c14651236bc401a99b0e2aca2fdd
Author: Jiri Kosina <jkosina at suse.cz>
Date: Tue Jun 17 11:47:27 2008 -0400
Input: i8042 - retry failed CTR writes when resuming
There are systems that fail in i8042_resume() with
i8042: Can't write CTR to resume
as i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR) fails even though the
controller claimed itself to be ready before.
One retry after failing write fixes the problems on the failing systems.
Reported-by: Helmut Schaa <hschaa at novell.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 95e904c7da715aa2dbfb595da66b63de37a0bb04
Author: Rabin Vincent <rabin at rab.in>
Date: Sun May 11 05:55:33 2008 +0530
sched: fix defined-but-unused warning
Fix this warning, which appears with !CONFIG_SMP:
kernel/sched.c:1216: warning: `init_hrtick' defined but not used
Signed-off-by: Rabin Vincent <rabin at rab.in>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 65c3e4715b1b934f8dcc002d9f46b4371ca7a9b1
Author: Chas Williams <chas at cmf.nrl.navy.mil>
Date: Mon Jun 16 17:21:27 2008 -0700
atm: [he] send idle cells instead of unassigned when in SDH mode
Signed-off-by: Chas Williams <chas at cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 28e84ab3abafb0f9c9573993626abe6ca3fa8eb1
Author: Robert T. Johnson <rtjohnso at eecs.berkeley.edu>
Date: Mon Jun 16 17:20:52 2008 -0700
atm: [he] limit queries to the device's register space
From: "Robert T. Johnson" <rtjohnso at eecs.berkeley.edu>
Signed-off-by: Chas Williams <chas at cmf.nrl.navy.mil>
commit 7e903c2ae36efb526eacab3b25d00e90424bd8a8
Author: Eric Kinzie <ekinzie at cmf.nrl.navy.mil>
Date: Mon Jun 16 17:18:18 2008 -0700
atm: [br2864] fix routed vcmux support
From: Eric Kinzie <ekinzie at cmf.nrl.navy.mil>
Signed-off-by: Chas Williams <chas at cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 059e3779b59527150e1d1942026ec149192cbf77
Author: Chas Williams <chas at cmf.nrl.navy.mil>
Date: Mon Jun 16 17:17:31 2008 -0700
atm: [he] only support suni driver on multimode interfaces
Signed-off-by: Chas Williams <chas at cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit d6c1d704ab5d2e13bebb096e415156a9c54a3d32
Author: Jorge Boncompte [DTI2] <jorge at dti2.net>
Date: Mon Jun 16 17:16:35 2008 -0700
atm: [iphase] doesn't call phy->start due to a bogus #ifndef
This causes the suni driver to oops if you try to use sonetdiag to get
the statistics. Also add the corresponding phy->stop call to fix another
oops if you try to remove the module.
Signed-off-by: Jorge Boncompte [DTI2] <jorge at dti2.net>
Signed-off-by: Chas Williams <chas at cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c0ed0b60f2c36acfebb53384a3b24d13b3a09309
Author: Jorge Boncompte [DTI2] <jorge at dti2.net>
Date: Mon Jun 16 17:16:04 2008 -0700
atm: [iphase] set drvdata before enabling interrupts
Signed-off-by: Jorge Boncompte [DTI2] <jorge at dti2.net>
Signed-off-by: Chas Williams <chas at cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 27141666b69f535a4d63d7bc6d9e84ee5032f82a
Author: Jorge Boncompte [DTI2] <jorge at dti2.net>
Date: Mon Jun 16 17:15:33 2008 -0700
atm: [br2684] Fix oops due to skb->dev being NULL
It happens that if a packet arrives in a VC between the call to open it on
the hardware and the call to change the backend to br2684, br2684_regvcc
processes the packet and oopses dereferencing skb->dev because it is
NULL before the call to br2684_push().
Signed-off-by: Jorge Boncompte [DTI2] <jorge at dti2.net>
Signed-off-by: Chas Williams <chas at cmf.nrl.navy.mil>
commit a9d246dbb07cf0bd32bbfc5d184ed738bf2af4f8
Author: Rami Rosen <ramirose at gmail.com>
Date: Mon Jun 16 17:07:16 2008 -0700
ipv4: Remove unused definitions in net/ipv4/tcp_ipv4.c.
1) Remove ICMP_MIN_LENGTH, as it is unused.
2) Remove unneeded tcp_v4_send_check() declaration.
Signed-off-by: Rami Rosen <ramirose at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 68be802cd5ad040fe8cfa33ce3031405df2d9117
Author: Eric Dumazet <dada1 at cosmosbay.com>
Date: Mon Jun 16 17:03:32 2008 -0700
raw: Restore /proc/net/raw correct behavior
I just noticed "cat /proc/net/raw" was buggy, missing '\n' separators.
I believe this was introduced by commit 8cd850efa4948d57a2ed836911cfd1ab299e89c6
([RAW]: Cleanup IPv4 raw_seq_show.)
This trivial patch restores correct behavior, and applies to current
Linus tree (should also be applied to stable tree as well.)
Signed-off-by: Eric Dumazet <dada1 at cosmosbay.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 6de329e26caed7bbbf51229c80f3948549d3c010
Author: Ben Hutchings <bhutchings at solarflare.com>
Date: Mon Jun 16 17:02:28 2008 -0700
net: Fix test for VLAN TX checksum offload capability
Selected device feature bits can be propagated to VLAN devices, so we
can make use of TX checksum offload and TSO on VLAN-tagged packets.
However, if the physical device does not do VLAN tag insertion or
generic checksum offload then the test for TX checksum offload in
dev_queue_xmit() will see a protocol of htons(ETH_P_8021Q) and yield
false.
This splits the checksum offload test into two functions:
- can_checksum_protocol() tests a given protocol against a feature bitmask
- dev_can_checksum() first tests the skb protocol against the device
features; if that fails and the protocol is htons(ETH_P_8021Q) then
it tests the encapsulated protocol against the effective device
features for VLANs
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Acked-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 319fa2a24f652dc35e613360c4532b8d2a771add
Author: Vlad Yasevich <vladislav.yasevich at hp.com>
Date: Mon Jun 16 17:00:29 2008 -0700
sctp: Correclty set changeover_active for SFR-CACC
Right now, any time we set a primary transport we set
the changeover_active flag. As a result, we invoke SFR-CACC
even when there has been no changeover events.
Only set changeover_active, when there is a true changeover
event, i.e. we had a primary path and we are changing to
another transport.
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 80896a3584bbff9ff9ad4dde735517c4de68d736
Author: Wei Yongjun <yjwei at cn.fujitsu.com>
Date: Mon Jun 16 16:59:55 2008 -0700
sctp: Correctly cleanup procfs entries upon failure.
This patch remove the proc fs entry which has been created if fail to
set up proc fs entry for the SCTP protocol.
Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Acked-by: Neil Horman <nhorman at tuxdriver.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 93653e0448196344d7699ccad395eaebd30359d1
Author: David S. Miller <davem at davemloft.net>
Date: Mon Jun 16 16:57:40 2008 -0700
tcp: Revert reset of deferred accept changes in 2.6.26
Ingo's system is still seeing strange behavior, and he
reports that is goes away if the rest of the deferred
accept changes are reverted too.
Therefore this reverts e4c78840284f3f51b1896cf3936d60a6033c4d2c
("[TCP]: TCP_DEFER_ACCEPT updates - dont retxmt synack") and
539fae89bebd16ebeafd57a87169bc56eb530d76 ("[TCP]: TCP_DEFER_ACCEPT
updates - defer timeout conflicts with max_thresh").
Just like the other revert, these ideas can be revisited for
2.6.27
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 2b4743bd6be9fedaa560f8c6dc3997e9ec21b99b
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Mon Jun 16 16:48:20 2008 -0700
ipv6 sit: Avoid extra need for compat layer in PRL management.
We've introduced extra need of compat layer for ip_tunnel_prl{}
for PRL (Potential Router List) management. Though compat_ioctl
is still missing in ipv4/ipv6, let's make the interface more
straight-forward and eliminate extra need for nasty compat layer
anyway since the interface is new for 2.6.26.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 47083fc0735f5145b72fc31236d07339dc52b908
Author: Jesper Dangaard Brouer <hawk at comx.dk>
Date: Mon Jun 16 16:39:32 2008 -0700
pkt_sched: Change HTB_HYSTERESIS to a runtime parameter htb_hysteresis.
Add a htb_hysteresis parameter to htb_sch.ko and by sysfs magic make
it runtime adjustable via
/sys/module/sch_htb/parameters/htb_hysteresis mode 640.
Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
Acked-by: Martin Devera <devik at cdi.cz>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f9ffcedddba5b2fc5ab16ef08bca55af8be2717e
Author: Jesper Dangaard Brouer <hawk at comx.dk>
Date: Mon Jun 16 16:38:33 2008 -0700
pkt_sched: HTB scheduler, change default hysteresis mode to off.
The HTB hysteresis mode reduce the CPU load, but at the
cost of scheduling accuracy.
On ADSL links (512 kbit/s upstream), this inaccuracy introduce
significant jitter, enought to disturbe VoIP. For details see my
masters thesis (http://www.adsl-optimizer.dk/thesis/), chapter 7,
section 7.3.1, pp 69-70.
Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
Acked-by: Martin Devera <devik at cdi.cz>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 27eaf66b05687a27aaca0c0b9014c2f5c23bd18c
Merge: c8988f968240069aeae16d8cf9f59096a085eb27 2c39450b39880e162b3eb339672314101f58ee1a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 16 13:17:33 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: Remove ->hangup() from stack glue operations.
ocfs2: Move the call of ocfs2_hb_ctl into the stack glue.
ocfs2: Move the hb_ctl_path sysctl into the stack glue.
commit c8988f968240069aeae16d8cf9f59096a085eb27
Merge: 10acaf0c8a481c1ea9ba9d550a292595d8279ee1 732a675a6303156d1a197dc780b0712bd4b49d46
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 16 11:52:43 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 CONFIG_IA64_SGI_UV build error
[IA64] Update check_sal_cache_flush to use platform_send_ipi()
[IA64] perfmon: fix async exit bug
commit 2c39450b39880e162b3eb339672314101f58ee1a
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri May 30 15:58:26 2008 -0700
ocfs2: Remove ->hangup() from stack glue operations.
The ->hangup() call was only used to execute ocfs2_hb_ctl. Now that
the generic stack glue code handles this, the underlying stack drivers
don't need to know about it.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 9f9a99f4eccc64650e932090cff0ebd07b81e334
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri May 30 15:43:58 2008 -0700
ocfs2: Move the call of ocfs2_hb_ctl into the stack glue.
Take o2hb_stop() out of the o2cb code and make it part of the generic
stack glue as ocfs2_leave_group(). This also allows us to remove the
ocfs2_get_hb_ctl_path() function - everything to do with hb_ctl is now
part of stackglue.c. o2cb no longer needs a ->hangup() function.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 3878f110f71a0971ff7acc15dd6db711b6ef37c6
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri May 30 15:30:49 2008 -0700
ocfs2: Move the hb_ctl_path sysctl into the stack glue.
ocfs2 needs to call out to the hb_ctl program at unmount for all cluster
stacks. The first step is to move the hb_ctl_path sysctl out of the
o2cb code and into the generic stack glue.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 10acaf0c8a481c1ea9ba9d550a292595d8279ee1
Merge: 649cf0ff4b998e3082c6d9d8673eaab71f3de656 313348db0bff8911b1219e6338342d0527072741
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 16 10:24:01 2008 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (21 commits)
[POWERPC] Turn on ATA_SFF so we get SATA_SVW back in defconfigs
[POWERPC] Remove ppc32's export of console_drivers
[POWERPC] Fix -Os kernel builds with newer gcc versions
[POWERPC] Fix bootwrapper builds with newer gcc versions
[POWERPC] Build fix for drivers/macintosh/mediabay.c
[POWERPC] Fix warning in pseries/eeh_driver.c
[POWERPC] Add missing of_node_put in drivers/macintosh/therm_adt746x.c
[POWERPC] Add missing of_node_put in drivers/macintosh/smu.c
[POWERPC] Add missing of_node_put in pseries/nvram.c
[POWERPC] Fix return value check logic in debugfs virq_mapping setup
[POWERPC] Fix rmb to order cacheable vs. noncacheable
powerpc/spufs: fix missed stop-and-signal event
powerpc/spufs: synchronize interaction between spu exception handling and time slicing
powerpc/spufs: remove class_0_dsisr from spu exception handling
powerpc/spufs: wait for stable spu status in spu_stopped()
[POWERPC] bootwrapper: add simpleImage* to list of boot targets
[POWERPC] 83xx: MPC837xRDB's VSC7385 ethernet switch isn't on the MDIO bus
[POWERPC] Updated Freescale PPC defconfigs
[POWERPC] 8610: Update defconfig for MPC8610 HPCD
[POWERPC] 85xx: MPC8548CDS - Fix size of PCIe IO space
...
commit 649cf0ff4b998e3082c6d9d8673eaab71f3de656
Merge: 626a16c16e13e4afaba382bfc0354a3555f5231c 9f9115d880ca550922434aee05ca18796c58eb99
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 16 10:23:21 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:
sound: oxygen: fix NULL pointer dereference when loading snd-oxygen
commit 626a16c16e13e4afaba382bfc0354a3555f5231c
Merge: e53d6a152793a38aa334d6f7a4850642ae45cedc dab8c6deaf1d654d09c3de8bd4c286d424df255a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 16 10:22:31 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:
[MIPS] Au1200: MMC resource size off by one
[MIPS] TANBAC: Update defconfig
[MIPS] Vr41xx: Initialize PCI io_map_base
[MIPS] Malta: Always compile MTD platform device registration code.
[MIPS] Malta: Fix build errors for 64-bit kernels
[MIPS] Lasat: sysctl fixup
[MIPS] Fix buggy use of kmap_coherent.
[MIPS] Lasat: bring back from the dead
[MIPS] vpe_id is required for VSMP and SMTC builds
[MIPS] Export smp_call_function and smp_call_function_single.
[MIPS] Bring the SWARM defconfig up to date
[MIPS] Sibyte: Build RTC support as an object
[MIPS] Fix the fix for divide by zero error in build_{clear,copy}_page
[MIPS] Fix build for PNX platforms.
[MIPS] Add RM200 with R5000 CPU to known ARC machines
[MIPS] Better load address for big endian SNI RM
[MIPS] SB1250: Initialize io_map_base
[MIPS] Alchemy: Add au1500 reserved interrupt
[MIPS] Export empty_zero_page for sake of the ext4 module.
commit e53d6a152793a38aa334d6f7a4850642ae45cedc
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Mon Jun 16 12:24:17 2008 +0100
Export <linux/a.out.h> to userspace again.
This seems to have been removed accidentally in commit
ed7b1889da256977574663689b598d88950bbd23 ("Unexport asm/page.h"), but
wasn't supposed to have been -- the original patch at
http://lkml.org/lkml/2007/10/30/144 just moved it from $(header-y) to
$(unifdef-y)
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Acked-by: Peter Korsgaard <jacmet at sunsite.dk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9a8ea36967afad617d9b0930b6fe7592b9ed9772
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Mon Jun 16 12:18:24 2008 +0100
Remove #ifdef CONFIG_ARCH_SUPPORTS_AOUT from <linux/a.out.h>
This file is only included where it makes sense now, so there's no need
for the CONFIG_ARCH_SUPPORTS_AOUT conditional -- and that conditional is
bad, because we want to export <linux/a.out.h> to userspace.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Acked-by: Peter Korsgaard <jacmet at sunsite.dk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a9e0f5293d4999f93b469af4e70382db800a8204
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Mon Jun 16 12:18:13 2008 +0100
Remove last traces of a.out support from ELF loader.
In commit d20894a23708c2af75966534f8e4dedb46d48db2 ("Remove a.out
interpreter support in ELF loader"), Andi removed support for a.out
interpreters from the ELF loader, which was only ever needed for the
transition from a.out to ELF.
This removes the last traces of that support, in particular the
inclusion of <linux/a.out.h>.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Acked-by: Peter Korsgaard <jacmet at sunsite.dk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 702773b16e83fcddc41e0019b8214d3c3cecedbe
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Mon Jun 16 12:11:54 2008 +0100
Include <asm/a.out.h> in fs/exec.c only for Alpha.
We only need it for the /sbin/loader hack for OSF/1 executables, and we
don't want to include it otherwise.
While we're at it, remove the redundant '&& CONFIG_ARCH_SUPPORTS_AOUT'
in the ifdef around that code. It's already dependent on __alpha__, and
CONFIG_ARCH_SUPPORTS_AOUT is hard-coded to 'y' there.
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Acked-by: Peter Korsgaard <jacmet at sunsite.dk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b052beb0432616aa4dac2b167e7809feae993991
Author: David Howells <dhowells at redhat.com>
Date: Mon Jun 16 13:36:29 2008 +0100
MN10300: Kill linux/a.out.h inclusions
Kill linux/a.out.h inclusions in the MN10300 arch code.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 732a675a6303156d1a197dc780b0712bd4b49d46
Author: Jack Steiner <steiner at sgi.com>
Date: Sat Jun 14 07:57:25 2008 -0500
[IA64] Fix CONFIG_IA64_SGI_UV build error
Fix build error in CONFIG_IA64_SGI_UV config. (GENERIC builds
are ok).
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit dab8c6deaf1d654d09c3de8bd4c286d424df255a
Author: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Date: Thu May 8 23:06:17 2008 +0400
[MIPS] Au1200: MMC resource size off by one
Au12x0 MMC platform device strangely claims 0x41 bytes for its
memory-mapped registers. Make it claim the whole 0x80000 instead according
to the memory map given in the datasheets.
Signed-off-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit b185194ef0691c8068c7d764aa8f78899d05512a
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Mon Jun 16 22:54:16 2008 +0900
[MIPS] TANBAC: Update defconfig
These boards need cca setup on CMDLINE.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit f1304b358a6c952e4cd1f92c8a6f183b1026c103
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Mon Jun 16 22:51:08 2008 +0900
[MIPS] Vr41xx: Initialize PCI io_map_base
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit b8157180ccd8bb3752f510c6c434b86394636093
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Mon Jun 16 00:23:39 2008 +0100
[MIPS] Malta: Always compile MTD platform device registration code.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 938b2b14172bd098972df2a5157bfabf161c90e5
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Thu May 29 22:05:07 2008 +0200
[MIPS] Malta: Fix build errors for 64-bit kernels
Fix 64-bit Malta by using CKSEG0ADDR and correct casts.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 1f34f2e4262bae8a1aa6d8fd6306b07074d33718
Author: Thomas Horsten <thomas at horsten.com>
Date: Sun Jun 15 02:17:11 2008 +0100
[MIPS] Lasat: sysctl fixup
LASAT's sysctl interface was broken, it failed a check during boot because
a single entry had a sysctl number and the rest were unnumbered. When I
fixed it I noticed that the whole sysctl file needed a spring clean, it was
using mutexes where it wasn't needed (it's only needed to protect during
writes to the EEPROM), so I moved that stuff out and generally cleaned the
whole thing up.
So now, LASAT's sysctl/proc interface is working again.
Signed-off-by: Thomas Horsten <thomas at horsten.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit c9c5023d83df5dc7d58830a63fd0e082120f00e3
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Sat Jun 14 22:22:08 2008 +0100
[MIPS] Fix buggy use of kmap_coherent.
Assuming the call of kmap_coherent in local_r4k_flush_cache_page doesn't
need fixing this was skipped in fcae549295bcae801ac48fc1c2030ab8cc487020.
Turns out it needed the same change after all.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 0c3bd83b0974238a5808d342663c6407512564d0
Author: Thomas Horsten <thomas at horsten.com>
Date: Sat Jun 14 02:32:42 2008 +0100
[MIPS] Lasat: bring back from the dead
After the common MIPS CPU interrupt controller (for irq0-7) was introduced
the Lasat boards didn't get their interrupts right, so nothing worked. The
old routines need to be offset by the new 8 hardware interrupts common to
all MIPS CPU's.
Signed-off-by: Thomas Horsten <thomas at horsten.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit d6c3048cad3c9eb312c070e11fdbea56498255ed
Author: Chris Dearman <chris at mips.com>
Date: Fri May 16 17:29:54 2008 -0700
[MIPS] vpe_id is required for VSMP and SMTC builds
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit a9ad02bdbb0193203a477bbd0e833adf9fb29ac4
Author: Zenon Fortuna <zenon at mips.com>
Date: Fri May 16 17:29:48 2008 -0700
[MIPS] Export smp_call_function and smp_call_function_single.
Signed-off-by: Chris Dearman <chris at mips.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 461a082f870c7fc6a0a245e2f93c9f0e3afbeddd
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date: Fri Jun 13 00:10:00 2008 +0100
[MIPS] Bring the SWARM defconfig up to date
The SWARM defconfig file has not been regenerated for over a year now.
Here is a patch to bring the file up to date. Additionally some important
and sometimes confusing changes happened meanwhile. Here is the list of
notable corresponding updates to the configuration:
1. CPU_SB1_PASS_2_2 is now selected rather than CPU_SB1_PASS_1. The
latter requires a non-standard -msb1-pass1-workarounds option to be
supported by GCC and I am told is quite rare anyway.
[Ralf: Afaik -msb1-pass1-workarounds is available only in Monta Vista's
special Sibyte gcc 3.0 variant and gcc 3.0 is too old to build a modern
kernel anyway.]
2. PHYLIB and BROADCOM_PHY are both built in and NETDEV_1000 enabled as
required by SB1250_MAC.
3. USB and USB_OHCI_HCD are enabled as there is an OHCI chip onboard.
4. TMPFS is enabled, because I use it. ;-)
Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 63a4881a7dd45038f46caa7c3c08b88b01cf9473
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date: Fri Jun 13 00:14:10 2008 +0100
[MIPS] Sibyte: Build RTC support as an object
Build the SWARM platform library is as an object rather than an archive
so that files which only contain symbols used by initcalls and do not
provide any symbols that would pull them from an archive still work.
Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 7bd0fea2c590d94995c2ee0b32e786c1c62621fa
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Fri May 30 13:07:21 2008 +0900
[MIPS] Fix the fix for divide by zero error in build_{clear,copy}_page
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 89052bd7b393434f7c573ce6a3b88c5f143586d2
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Thu Jun 12 17:26:02 2008 +0100
[MIPS] Fix build for PNX platforms.
Build error was caused by commit 351336929ccf222ae38ff0cb7a8dd5fd5c6236a0.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 330117ff2723566e8eb7ad43223081b557f1540e
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Tue May 27 01:15:20 2008 +0200
[MIPS] Add RM200 with R5000 CPU to known ARC machines
RM200 with R5ks have a little bit different arcname.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 0e27d7931157fa89cc9afb7735095a0d81ce8fec
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Tue May 27 01:15:16 2008 +0200
[MIPS] Better load address for big endian SNI RM
Use better load address for big endian kernels to avoid clashes with
PROM / SASH.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit d0f9cbd4b29c3d208d6b31519cbb940d98d61e7d
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date: Mon Jun 9 17:20:03 2008 +0100
[MIPS] SB1250: Initialize io_map_base
Correctly initialize io_map_base for the SB1250 PCI controller as required
for proper iomap support. Based on a proposal from Daniel Jacobowitz.
Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 6b7d0b2fb6da3f6182f2bd162bf02ed4aed1813f
Author: bruno randolf <br1 at einfach.org>
Date: Fri Jun 6 16:42:03 2008 +0200
[MIPS] Alchemy: Add au1500 reserved interrupt
In the conversion done in the commits
95c4eb3ef4484ca85da5c98780d358cffd546b90
9d360ab4a7568a8d177280f651a8a772ae52b9b9
[MIPS] Alchemy: Renumber interrupts so irq_cpu can work.
one reserved interrupt on au1500 was missed. this broke the au1000 ethernet
driver.
Signed-off-by: Bruno Randolf <br1 at einfach.org>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 497d2adcbf50bccec6c56620d61d77429d23993a
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Fri Jun 6 14:23:06 2008 +0100
[MIPS] Export empty_zero_page for sake of the ext4 module.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 9f9115d880ca550922434aee05ca18796c58eb99
Author: Clemens Ladisch <clemens at ladisch.de>
Date: Mon Jun 16 14:13:52 2008 +0200
sound: oxygen: fix NULL pointer dereference when loading snd-oxygen
Check that model->control_filter is set before trying to call it.
Signed-off-by: Clemens Ladisch <clemens at ladisch.de>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit e4f3ec063421bdbcb93330e72aa3eeedb6a0d85a
Author: Paul Collins <paul at burly.ondioline.org>
Date: Sat Jun 14 14:14:59 2008 +1200
udf: restore UDFFS_DEBUG to being undefined by default
Commit 706047a79725b585cf272fdefc234b31b6545c72, "udf: Fix compilation
warnings when UDF debug is on" inadvertently (I assume) enabled
debugging messages by default for UDF. This patch disables them again.
Signed-off-by: Paul Collins <paul at ondioline.org>
Signed-off-by: Jan Kara <jack at suse.cz>
commit 313348db0bff8911b1219e6338342d0527072741
Author: Paul Mackerras <paulus at samba.org>
Date: Mon Jun 16 21:14:12 2008 +1000
[POWERPC] Turn on ATA_SFF so we get SATA_SVW back in defconfigs
This enables CONFIG_ATA_SFF in the defconfigs that are intended to
work on a G5 powermac, i.e. g5_defconfig and ppc64_defconfig. Since
the support for the SATA cell in the K2 chipset is provided by the
sata_svw.c driver, and that depends on CONFIG_ATA_SFF, we need to turn
that and CONFIG_SATA_SVW back on so we can get to the hard disk on G5s.
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 4a96db3c780f30432653f99cbff193ba3e474e0b
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Mon Jun 16 10:50:13 2008 +1000
[POWERPC] Remove ppc32's export of console_drivers
There are no in-tree uses of the export any more and in linux-next there
is a change that exports it globally which causes warnings:
WARNING: vmlinux: 'console_drivers' exported twice. Previous export was in vmlinux
and in one case (mpc85xx_defconfig) a build error:
kernel/built-in.o: In function `__crc_console_drivers':
(*ABS*+0x1eb0e6f5): multiple definition of `__crc_console_drivers'
So remove the export now. Also, there is no longer any need to include
linux/console.h.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit da3de6df33f5f42ff9dc40093fbc884f524c9a49
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Fri Jun 13 07:20:58 2008 +1000
[POWERPC] Fix -Os kernel builds with newer gcc versions
GCC 4.4.x looks to be adding support for generating out-of-line register
saves/restores based on:
http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
This breaks the kernel if we enable CONFIG_CC_OPTIMIZE_FOR_SIZE. To fix
this we add the use the save/restore code from gcc and simplified it down
for our needs (integer only).
Additionally, we have to link this code into each module. The other
solution was to add EXPORT_SYMBOL() which meant going through the
trampoline which seemed nonsensical for these out-of-line routines.
Finally, we add some checks to prom_init_check.sh to ignore the
out-of-line save/restore functions.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 143580ecfb7999147e546cc3814023e233e95fa5
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Fri Jun 13 07:19:06 2008 +1000
[POWERPC] Fix bootwrapper builds with newer gcc versions
GCC 4.4.x looks to be adding support for generating out-of-line register
saves/restores based on:
http://gcc.gnu.org/ml/gcc-patches/2008-04/msg01678.html
This breaks the bootwrapper as we'd need to link with libgcc to get the
implementation of the register save/restores.
To workaround this issue, we just stole the save/restore code from gcc
and simplified it down for our needs (integer only).
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 305c73687157d677bee6f2a5dbee438d844a028c
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Jun 11 03:47:45 2008 +1000
[POWERPC] Build fix for drivers/macintosh/mediabay.c
This fixes the following build error with CONFIG_BLK_DEV_IDE_PMAC=n:
<-- snip -->
...
CC drivers/macintosh/mediabay.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c: In function 'check_media_bay':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c:428: error: 'struct media_bay_info' has no member named 'cd_index'
make[3]: *** [drivers/macintosh/mediabay.o] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 8e01520c06c65a1a376059199fc24d4f3d606991
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Jun 10 09:26:10 2008 +1000
[POWERPC] Fix warning in pseries/eeh_driver.c
Fix this:
/usr/src/devel/arch/powerpc/platforms/pseries/eeh_driver.c: In function 'print_device_node_tree':
/usr/src/devel/arch/powerpc/platforms/pseries/eeh_driver.c:55: warning: ISO C90 forbids mixed declarations and code
also make that function look like it's part of Linux.
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 958a65f205fdc5ce5461d79376073b89acc51b31
Author: Julia Lawall <julia at diku.dk>
Date: Mon Jun 9 22:21:51 2008 +1000
[POWERPC] Add missing of_node_put in drivers/macintosh/therm_adt746x.c
of_node_put is needed before discarding a value received from
of_find_node_by_name, eg in error handling code.
The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
struct device_node *n;
struct device_node *n1;
statement S;
identifier f;
expression E;
constant C;
@@
n = of_find_node_by_name(...)
...
if (!n) S
... when != of_node_put(n)
when != n1 = f(n,...)
when != E = n
when any
when strict
(
+ of_node_put(n);
return -C;
|
of_node_put(n);
|
n1 = f(n,...)
|
E = n
|
return ...;
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Acked-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 8b9dba2ce28f64246198704b23f133bed5429e62
Author: Julia Lawall <julia at diku.dk>
Date: Mon Jun 9 22:20:42 2008 +1000
[POWERPC] Add missing of_node_put in drivers/macintosh/smu.c
of_node_put is needed before discarding a value received from
of_find_node_by_type, eg in error handling code.
The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
struct device_node *n;
struct device_node *n1;
struct device_node *n2;
statement S;
identifier f1,f2;
expression E1,E2;
constant C;
@@
n = of_find_node_by_type(...)
...
if (!n) S
... when != of_node_put(n)
when != n1 = f1(n,...)
when != E1 = n
when any
when strict
(
+ of_node_put(n);
return -C;
|
of_node_put(n);
|
n2 = f2(n,...)
|
E2 = n
|
return ...;
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Acked-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit bad5232ba266ae2c666c17be236152fb2d8ada3b
Author: Julia Lawall <julia at diku.dk>
Date: Mon Jun 9 22:20:04 2008 +1000
[POWERPC] Add missing of_node_put in pseries/nvram.c
of_node_put is needed before discarding a value received from
of_find_node_by_type, eg in error handling code.
The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
struct device_node *n;
struct device_node *n1;
struct device_node *n2;
statement S;
identifier f1,f2;
expression E1,E2;
constant C;
@@
n = of_find_node_by_type(...)
...
if (!n) S
... when != of_node_put(n)
when != n1 = f1(n,...)
when != E1 = n
when any
when strict
(
+ of_node_put(n);
return -C;
|
of_node_put(n);
|
n2 = f2(n,...)
|
E2 = n
|
return ...;
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Acked-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 476ff8a0e3b17fc23994255aa9fd917d599d2ec7
Author: Emil Medve <Emilian.Medve at Freescale.com>
Date: Fri May 23 05:49:22 2008 +1000
[POWERPC] Fix return value check logic in debugfs virq_mapping setup
debugfs_create_file() returns a non-NULL (non-zero) value in case of
success, not a NULL value.
This fixes this non-critical boot-time debugging error message:
[ 1.316386] calling irq_debugfs_init+0x0/0x50
[ 1.316399] initcall irq_debugfs_init+0x0/0x50 returned -12 after 0 msecs
[ 1.316411] initcall irq_debugfs_init+0x0/0x50 returned with error code -12
Signed-off-by: Emil Medve <Emilian.Medve at Freescale.com>
Acked-by: Michael Ellerman <michael at ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 598056d5af8fef1dbe8f96f5c2b641a528184e5a
Author: Nick Piggin <npiggin at suse.de>
Date: Thu May 22 00:10:56 2008 +1000
[POWERPC] Fix rmb to order cacheable vs. noncacheable
lwsync is explicitly defined not to have any effect on the ordering of
accesses to device memory, so it cannot be used for rmb(). sync appears
to be the only barrier which fits the bill.
Signed-off-by: Nick Piggin <npiggin at suse.de>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit a9653cf540d407fb75deb3db65a1be6c81d53ee0
Merge: e80ac32767d0f781ac195c472d500a7451d3729a 066519068ad2fbe98c7f45552b1f592903a9c8c8
Author: Paul Mackerras <paulus at samba.org>
Date: Mon Jun 16 14:53:25 2008 +1000
Merge branch 'linux-2.6' into merge
commit e80ac32767d0f781ac195c472d500a7451d3729a
Merge: ecab9ab22a9a64d6412961e42a5a23c74c6b6220 028fda0a6c80c26f1d9f403b4490b9ddc74ffa3b
Author: Paul Mackerras <paulus at samba.org>
Date: Mon Jun 16 14:52:56 2008 +1000
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge
commit 028fda0a6c80c26f1d9f403b4490b9ddc74ffa3b
Author: Luke Browning <lukebrowning at us.ibm.com>
Date: Mon Jun 16 10:42:38 2008 +1000
powerpc/spufs: fix missed stop-and-signal event
There is a delay in the transition to the stopped state for class 2
interrupts. In some cases, the controlling thread detects the state of
the spu as running, and goes back to sleep resulting in a hung
application as the event is missed.
This change detects the stop condition and re-generates the wakeup event
after a context save.
Signed-off-by: Luke Browning <lukebrowning at us.ibm.com>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 2c911a14b74fa9cf815a936f310e4fa85bee77ce
Author: Luke Browning <lukebrowning at us.ibm.com>
Date: Fri Jun 13 14:17:35 2008 +1000
powerpc/spufs: synchronize interaction between spu exception handling and time slicing
Time slicing can occur at the same time as spu exception handling
resulting in the wakeup of the wrong thread.
This change uses the the spu's register_lock to enforce synchronization
between bind/unbind and spu exception handling so that they are
mutually exclusive.
Signed-off-by: Luke Browning <lukebrowning at us.ibm.com>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 1f64643aa5f5a17f1723f7ea0f17b7a3a8f632b3
Author: Luke Browning <lukebrowning at us.ibm.com>
Date: Thu Jun 5 17:30:25 2008 +0800
powerpc/spufs: remove class_0_dsisr from spu exception handling
According to the CBEA, the SPU dsisr is not updated for class 0
exceptions.
spu_stopped() is testing the dsisr that was passed to it from the class
0 exception handler, so we return a false positive here.
This patch cleans up the interrupt handler and erroneous tests in
spu_stopped. It also removes the fields from the csa since it is not
needed to process class 0 events.
Signed-off-by: Luke Browning <lukebrowning at us.ibm.com>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit d84050f48ebba73994b93ccf61cea2364dac8d75
Author: Luke Browning <lukebrowning at us.ibm.com>
Date: Thu May 29 17:46:10 2008 -0300
powerpc/spufs: wait for stable spu status in spu_stopped()
If the spu is stopping (ie, the SPU_STATUS_RUNNING bit is still set),
re-read the register to get the final stopped value.
Signed-off-by: Luke Browning <lukebrowning at us.ibm.com>
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit ecab9ab22a9a64d6412961e42a5a23c74c6b6220
Merge: 8d6bcd6e219f183aba4fb62bb7065a4db772ac49 f17c63231c9c2bfc5717af1890ad17312a1c2c1c
Author: Paul Mackerras <paulus at samba.org>
Date: Mon Jun 16 14:30:47 2008 +1000
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
commit 066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge: b92dea67cc66970cda6b5b11895d08e35b4618e7 0cbccbc30a60ff60dbeb203154f1f527c632de9b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Jun 15 16:53:20 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-generic: don't probe all legacy ISA IDE ports by default
ide-cs: fix releasing I/O resources
ide-cs: fix probing and add warm-plug support
ide-pmac: remove bogus comment about pmac_ide_setup_device()
ide-pmac: add ->cable_detect method
ide-pmac: bugfix for media-bay support rework
opti621: add PIO 4 support
opti621: use pre-calculated PIO timings
opti621: program devices timings separately in ->set_pio_mode
opti621: use PCI clock value provided by controller
opti621: remove DMA support
opti621: disable read prefetch
commit b92dea67cc66970cda6b5b11895d08e35b4618e7
Author: Mark McLoughlin <markmc at redhat.com>
Date: Sun Jun 15 23:20:50 2008 +1000
virtio: Complete feature negotation before updating status
lguest (in rusty's use-tun-ringfd patch) assumes that the
guest has updated its feature bits before setting its status
to VIRTIO_CONFIG_S_DRIVER_OK.
That's pretty reasonable, so let's make it so.
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0cbccbc30a60ff60dbeb203154f1f527c632de9b
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:24 2008 +0200
ide-generic: don't probe all legacy ISA IDE ports by default
We can't probe all legacy ISA IDE ports by default as the resources may be
occupied by other ISA devices. Add "probe_mask" module parameter and probe
only first two ISA IDE ports by default leaving the decision about probing
the rest to the user (systems with ISA ide2-6 should be very, very rare).
This fixes a regression caused by:
commit 343a3451e20314d5959b59b992e33fbaadfe52bf
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Jun 10 20:56:36 2008 +0200
ide-generic: add missing hwif->chipset setup
...
Reported-by: Mikael Pettersson <mikpe at it.uu.se>
Bisected-by: Mikael Pettersson <mikpe at it.uu.se>
Tested-by: Mikael Pettersson <mikpe at it.uu.se>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit fbc69fd9b76158daaa83e5372e44fdd81df20f92
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:23 2008 +0200
ide-cs: fix releasing I/O resources
hwif content is already freed after ide_release() call so cache
hwif->io_ports.{data,ctl}_addr in local variables in ide_detach().
This fixes post-2.6.25 regression.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 792a1a98560a2a1619491eed8b18fccb09b312a7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:23 2008 +0200
ide-cs: fix probing and add warm-plug support
* Fix probing by using ide_port_scan() and moving "retry loop"
from ide_config() to idecs_register().
* Don't fail probe if there are no devices attached to a port.
* Remove (now redundant) error message from ide_config().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 5b16464ac32a92c2332030d11ec445bddeb141fa
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:23 2008 +0200
ide-pmac: remove bogus comment about pmac_ide_setup_device()
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 07a6c66da53f646a39103290bfbd85be18892895
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:23 2008 +0200
ide-pmac: add ->cable_detect method
Add ->cable_detect method and remove no longer needed pmif->cable_80 flag
(there is also no need to mask ->udma_mask now).
This fixes:
- forced ignoring of cable detection (needed for some CF devices & debug)
- cable detection for warm-plug
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit c1a8e39819bd6797ee2b82b88517268d39921b03
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:23 2008 +0200
ide-pmac: bugfix for media-bay support rework
Fix bug introduced by:
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)
...
[ Yeah, I suck. ]
bay->cd_index shouldn't be changed if IDE devices are not present
or retry operations won't happen.
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 80a65fc5ee04497e6c28bdaefc44d375b19c4a79
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:22 2008 +0200
opti621: add PIO 4 support
* Add PIO 4 support.
While at it:
* Use a single struct ide_port_info instance for OPTi621 and OPTi621X.
Based on a bugreport from Juergen Kosel & inspired by pata_opti.c code.
Tested-by: Juergen Kosel <juergen.kosel at gmx.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 810253d44bc92b44b66cd9944b579de54c0cd3ff
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:22 2008 +0200
opti621: use pre-calculated PIO timings
* Use pre-calculated PIO timings in ->set_pio_mode.
* Remove no longer needed compute_clocks(), cmpt_clk(), struct pio_clocks_s,
PIO_* defines and OPTI621_DEBUG define.
There should be no functional changes caused by this patch.
Based on a bugreport from Juergen Kosel & inspired by pata_opti.c code.
Tested-by: Juergen Kosel <juergen.kosel at gmx.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 6c987183fcc3c6cb9eb77fd0b3e8ca1ac98a4813
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:22 2008 +0200
opti621: program devices timings separately in ->set_pio_mode
* Set drive->drive_data to 'pio + XFER_PIO_0' instead of 'pio',
then simplify selecting maximum adress setup timing.
* Remove no longer needed compute_pios() and opti621_port_init_devs().
* Program devices timings separately in ->set_pio_mode.
Based on a bugreport from Juergen Kosel & inspired by pata_opti.c code.
Tested-by: Juergen Kosel <juergen.kosel at gmx.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 21bd33a656a60daadc475ce330272f4410ae27b7
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:22 2008 +0200
opti621: use PCI clock value provided by controller
Use PCI clock value provided by controller instead of depending on
a default (or user supplied) value.
Based on a bugreport from Juergen Kosel & inspired by pata_opti.c code.
Tested-by: Juergen Kosel <juergen.kosel at gmx.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f361037631ba547ea88adf8d2359d810c1b2605a
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:21 2008 +0200
opti621: remove DMA support
These controllers don't support DMA.
Based on a bugreport from Juergen Kosel & inspired by pata_opti.c code.
Tested-by: Juergen Kosel <juergen.kosel at gmx.de>
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 62128b2ca812c1266f4ff7bac068bf0b626c6179
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Sun Jun 15 21:00:21 2008 +0200
opti621: disable read prefetch
This fixes 2.6.25 regression (kernel.org bugzilla bug #10723) caused by:
commit 912fb29a36a7269ac1c4a4df45bc0ac1d2637972
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Fri Oct 19 00:30:11 2007 +0200
opti621: always tune PIO
...
Based on a bugreport from Juergen Kosel & inspired by pata_opti.c code.
Bisected-by: Juergen Kosel <juergen.kosel at gmx.de>
Tested-by: Juergen Kosel <juergen.kosel at gmx.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f93daa3f7ff4f0cc13acc7452a00feb1c586102a
Author: Jeff Mahoney <jeffm at suse.com>
Date: Fri Jun 13 10:38:00 2008 -0400
[SCSI] dpt_i2o: Add PROC_IA64 define
This fixes the following compile failure:
drivers/scsi/dpt_i2o.c:83: error: 'PROC_IA64' undeclared here (not in a function)
Mark Salyzyn <Mark_Salyzyn at adaptec.com> indicated that IA64 must report
itself as PROC_INTEL, so I've changed the comment for PROC_INTEL.
Signed-off-by: Jeff Mahoney <jeffm at suse.com>
Acked-by: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 3ed7897242b7efe977f3a8d06d4e5a4ebe28b10e
Author: Mike Christie <michaelc at cs.wisc.edu>
Date: Wed Jun 11 19:21:00 2008 -0500
[SCSI] scsi_host regression: fix scsi host leak
commit 9c7701088a61cc0cf8a6e1c68d1e74e3cc2ee0b7
Author: Dave Young <hidave.darkstar at gmail.com>
Date: Tue Jan 22 14:01:34 2008 +0800
scsi: use class iteration api
Isn't a correct replacement for the original hand rolled host
lookup. The problem is that class_find_child would get a reference to
the host's class device which is never released. Since the host class
device holds a reference to the host gendev, the host can never be
freed.
In 2.6.26 we started using class_find_device, and this function also
gets a reference to the device, so we end up with an extra ref
and the host will not get released.
This patch adds a put_device to balance the class_find_device() get. I
kept the scsi_host_get in scsi_host_lookup, because the target layer
is using scsi_host_lookup and it looks like it needs the SHOST_DEL
check.
Signed-off-by: Mike Christie <michaelc at cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 34a5d713056c325e5bf2b5361646585d5f550a72
Merge: 7775c9753b94fe429dc4323360d6502c95e0dd6e cb62eccd7d946f7fb92b8beb79988726ec92c227
Author: David S. Miller <davem at davemloft.net>
Date: Sat Jun 14 17:33:38 2008 -0700
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 0269c5c6d9a9de22715ecda589730547435cd3e8
Merge: 7775c9753b94fe429dc4323360d6502c95e0dd6e 81d5575a48f49f494289a1299a32e4e5e41fbf40
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Jun 14 13:32:56 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:
PCI: fixup write combine comment in pci_mmap_resource
x86: PAT export resource_wc in pci sysfs
x86, pci-dma.c: don't always add __GFP_NORETRY to gfp
suspend-vs-iommu: prevent suspend if we could not resume
x86: pci-dma.c: use __GFP_NO_OOM instead of __GFP_NORETRY
pci, x86: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
PCI: use dev_to_node in pci_call_probe
PCI: Correct last two HP entries in the bfsort whitelist
commit f163ff5176a8e9c827d8ebe044710d67d40799c3
Author: Len Brown <len.brown at intel.com>
Date: Sat Jun 14 01:26:37 2008 -0400
ACPI: no AC status notification
http://bugzilla.kernel.org/show_bug.cgi?id=10695
Signed-off-by: Len Brown <len.brown at intel.com>
commit d385c2a85877f0cb785070094edf9a624c090d68
Author: Zhang Rui <rui.zhang at intel.com>
Date: Sat Jun 14 01:01:18 2008 -0400
ACPI Exception (video-1721): UNKNOWN_STATUS_CODE, Cant attach device
The child of a video bus device is not alway a video device.
It should be a warn message rather than an exception here.
http://bugzilla.kernel.org/show_bug.cgi?id=9761
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit cb62eccd7d946f7fb92b8beb79988726ec92c227
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Thu Jun 12 20:47:17 2008 +0200
rt2x00: Add D-link DWA111 support
Add new rt73usb USB ID for D-Link DWA111
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 995ad6c5a415c9389d094d246ca1b305c1e31813
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Thu Jun 12 20:08:19 2008 +0300
mac80211: add missing new line in debug print HT_DEBUG
This patch adds '\n' in debug printk (wme.c HT DEBUG)
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 5c5f9664d5284d8542062fed39e1f19b80db7aa5
Author: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
Date: Thu Jun 12 09:47:16 2008 +0800
mac80211 : fix for iwconfig in ad-hoc mode
The patch checks interface status, if it is in IBSS_JOINED mode
show cell id it is associated with.
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e6340361f9c70e84312caed98c6e058ac6234e9b
Author: Michael Buesch <mb at bu3sch.de>
Date: Thu Jun 12 15:33:13 2008 +0200
ssb: Fix coherent DMA mask for PCI devices
This fixes setting the coherent DMA mask for PCI devices.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 6847aa5cce6e22c3625a243b02909ac46aafa110
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Jun 11 13:32:22 2008 -0700
rt2x00: LEDS build failure
Config symbols that select LEDS_CLASS need to depend on NEW_LEDS so that
undefined symbols are not used in the build.
The alternative is to select NEW_LEDS, which some drivers do.
This patch fixes the led_* symbols build errors.
(.text+0x174cdc): undefined reference to `input_unregister_device'
(.text+0x174d9f): undefined reference to `input_allocate_device'
(.text+0x174e2d): undefined reference to `input_register_device'
(.text+0x174e53): undefined reference to `input_free_device'
rt2x00rfkill.c:(.text+0x176dc4): undefined reference to `input_allocate_polled_device'
rt2x00rfkill.c:(.text+0x176e8b): undefined reference to `input_event'
rt2x00rfkill.c:(.text+0x176e9f): undefined reference to `input_event'
(.text+0x176eca): undefined reference to `input_unregister_polled_device'
(.text+0x176efc): undefined reference to `input_free_polled_device'
(.text+0x176f37): undefined reference to `input_free_polled_device'
(.text+0x176fd8): undefined reference to `input_register_polled_device'
(.text+0x1772c0): undefined reference to `led_classdev_resume'
(.text+0x1772d4): undefined reference to `led_classdev_resume'
(.text+0x1772e8): undefined reference to `led_classdev_resume'
(.text+0x17730a): undefined reference to `led_classdev_suspend'
(.text+0x17731e): undefined reference to `led_classdev_suspend'
(.text+0x17732f): undefined reference to `led_classdev_suspend'
rt2x00leds.c:(.text+0x177348): undefined reference to `led_classdev_unregister'
rt2x00leds.c:(.text+0x1773c0): undefined reference to `led_classdev_register'
rfkill-input.c:(.text+0x209e4c): undefined reference to `input_close_device'
rfkill-input.c:(.text+0x209e53): undefined reference to `input_unregister_handle'
rfkill-input.c:(.text+0x209ea1): undefined reference to `input_register_handle'
rfkill-input.c:(.text+0x209eae): undefined reference to `input_open_device'
rfkill-input.c:(.text+0x209ebb): undefined reference to `input_unregister_handle'
rfkill-input.c:(.init.text+0x17405): undefined reference to `input_register_handler'
rfkill-input.c:(.exit.text+0x194f): undefined reference to `input_unregister_handler'
make[1]: *** [vmlinux] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e76328e4a8260707fbc29c99773fb5ba4627096c
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Jun 11 12:57:58 2008 -0700
rt2x00: INPUT build failure
Config symbols that select RFKILL need to depend on INPUT so that
undefined symbols are not used in the build.
This patch fixes the input_* symbols build errors.
(.text+0x174cdc): undefined reference to `input_unregister_device'
(.text+0x174d9f): undefined reference to `input_allocate_device'
(.text+0x174e2d): undefined reference to `input_register_device'
(.text+0x174e53): undefined reference to `input_free_device'
rt2x00rfkill.c:(.text+0x176dc4): undefined reference to `input_allocate_polled_device'
rt2x00rfkill.c:(.text+0x176e8b): undefined reference to `input_event'
rt2x00rfkill.c:(.text+0x176e9f): undefined reference to `input_event'
(.text+0x176eca): undefined reference to `input_unregister_polled_device'
(.text+0x176efc): undefined reference to `input_free_polled_device'
(.text+0x176f37): undefined reference to `input_free_polled_device'
(.text+0x176fd8): undefined reference to `input_register_polled_device'
(.text+0x1772c0): undefined reference to `led_classdev_resume'
(.text+0x1772d4): undefined reference to `led_classdev_resume'
(.text+0x1772e8): undefined reference to `led_classdev_resume'
(.text+0x17730a): undefined reference to `led_classdev_suspend'
(.text+0x17731e): undefined reference to `led_classdev_suspend'
(.text+0x17732f): undefined reference to `led_classdev_suspend'
rt2x00leds.c:(.text+0x177348): undefined reference to `led_classdev_unregister'
rt2x00leds.c:(.text+0x1773c0): undefined reference to `led_classdev_register'
rfkill-input.c:(.text+0x209e4c): undefined reference to `input_close_device'
rfkill-input.c:(.text+0x209e53): undefined reference to `input_unregister_handle'
rfkill-input.c:(.text+0x209ea1): undefined reference to `input_register_handle'
rfkill-input.c:(.text+0x209eae): undefined reference to `input_open_device'
rfkill-input.c:(.text+0x209ebb): undefined reference to `input_unregister_handle'
rfkill-input.c:(.init.text+0x17405): undefined reference to `input_register_handler'
rfkill-input.c:(.exit.text+0x194f): undefined reference to `input_unregister_handler'
make[1]: *** [vmlinux] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 98a3b2fe435ae76170936c14f5c9e6a87548e3ef
Author: Michael Buesch <mb at bu3sch.de>
Date: Thu Jun 12 12:36:29 2008 +0200
b43: Fix noise calculation WARN_ON
This removes a WARN_ON that is responsible for the following koops:
http://www.kerneloops.org/searchweek.php?search=b43_generate_noise_sample
The comment in the patch describes why it's safe to simply remove
the check.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 028118a5f09a9c807e6b43e2231efdff9f224c74
Author: Michael Buesch <mb at bu3sch.de>
Date: Thu Jun 12 11:58:56 2008 +0200
b43: Fix possible NULL pointer dereference in DMA code
This fixes a possible NULL pointer dereference in an error path of the
DMA allocation error checking code. This is also necessary for a future
DMA API change that is on its way into the mainline kernel that adds
an additional dev parameter to dma_mapping_error().
This patch moves the whole struct b43_dmaring struct initialization
right before any DMA allocation operation.
Reported-by: Miles Lane <miles.lane at gmail.com>
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 051c256f672efa356a4cda1841132dbc86541090
Author: Gertjan van Wingerde <gwingerde at kpnplanet.nl>
Date: Tue Jun 3 20:29:47 2008 +0200
rt2x00: Restrict DMA to 32-bit addresses.
None of the rt2x00 PCI devices support 64-bit DMA addresses (they all
only accept 32-bit buffer addresses). Hence it makes no sense to try to
enable 64-bit DMA addresses. Only try to enable 32-bit DMA addresses.
Signed-off-by: Gertjan van Wingerde <gwingerde at kpnplanet.nl>
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit edfa78b2ba651782d70be6d1fef214e21a26d8cb
Author: Ivo van Doorn <IvDoorn at gmail.com>
Date: Tue Jun 3 20:29:50 2008 +0200
rt2x00: Don't kill guardian_urb when it wasn't created
This fixes a "BUG: unable to handle kernel paging request"
bug in rt73usb which was caused by killing the guardian_urb
while it had never been allocated for rt73usb.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 7775c9753b94fe429dc4323360d6502c95e0dd6e
Merge: fa8d84b78be10d0c455dd716f40152bb7003bd5b 42a5a8a60a093c359987fd884aec99b9d7f4c084
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 13 09:47:07 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: update my email address
parisc: fix miscompilation of ip_fast_csum with gcc >= 4.3
parisc: fix off by one in setup_sigcontext32
parisc: export empty_zero_page
parisc: export copy_user_page_asm
parisc: move head.S to head.text section
Revert "parisc: fix trivial section name warnings"
commit 42a5a8a60a093c359987fd884aec99b9d7f4c084
Author: Kyle McMartin <kyle at minerva.i.cabal.ca>
Date: Fri Jun 6 17:16:17 2008 -0400
parisc: update my email address
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit e374d17cd74ec5967f81e2b0c67ec3219a2bbbcc
Author: Kyle McMartin <kyle at minerva.i.cabal.ca>
Date: Sat May 31 12:15:42 2008 -0400
parisc: fix miscompilation of ip_fast_csum with gcc >= 4.3
ip_fast_csum needs an asm "memory" clobber, otherwise the aggressive
optimizations in gcc-4.3 cause it to be miscompiled.
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit f4441b62d46e7033e907dfd6a8bb0b75b5519e88
Author: Kyle McMartin <kyle at minerva.i.cabal.ca>
Date: Tue May 27 01:56:29 2008 -0400
parisc: fix off by one in setup_sigcontext32
Thankfully, the values were irrelevant... Spotted by
newer gcc.
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit 22febf1f372496d74534be32b6b5edcee7fb7cc5
Author: Kyle McMartin <kyle at minerva.i.cabal.ca>
Date: Mon May 26 01:54:35 2008 -0400
parisc: export empty_zero_page
Needed by ext4 when built as a module.
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit db51d92b90193cf69b2bcc2874fd0b267fd3e710
Author: Kyle McMartin <kyle at minerva.i.cabal.ca>
Date: Mon May 26 01:49:01 2008 -0400
parisc: export copy_user_page_asm
Needed by fuse (via copy_highpage).
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit 1138a72cd96857d1d5928c0c8c83d8b8995eeb38
Author: Kyle McMartin <kyle at minerva.i.cabal.ca>
Date: Thu May 22 14:38:26 2008 -0400
parisc: move head.S to head.text section
And explicitly list it in vmlinux.lds...
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit dfcf753bd3fb09f336659d07b1c48db7e62772e0
Author: Kyle McMartin <kyle at minerva.i.cabal.ca>
Date: Thu May 22 14:36:31 2008 -0400
Revert "parisc: fix trivial section name warnings"
This reverts commit bd3bb8c15b9a80dbddfb7905b237a4a11a4725b4.
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit fa8d84b78be10d0c455dd716f40152bb7003bd5b
Merge: 51558576ead54c1047e4d41440626e4f9aa015ea bd17243a84632465f5403bc9eb8b4831bd67e582
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 13 07:40:57 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:
ahci: Workaround HW bug for SB600/700 SATA controller PMP support
ahci: workarounds for mcp65
commit 51558576ead54c1047e4d41440626e4f9aa015ea
Merge: d36e311070ee3a378a54142a168ff5cfedba33d5 ec0a196626bd12e0ba108d7daa6d95a4fb25c2c5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 13 07:34:47 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:
tcp: Revert 'process defer accept as established' changes.
ipv6: Fix duplicate initialization of rawv6_prot.destroy
bnx2x: Updating the Maintainer
net: Eliminate flush_scheduled_work() calls while RTNL is held.
drivers/net/r6040.c: correct bad use of round_jiffies()
fec_mpc52xx: MPC52xx_MESSAGES_DEFAULT: 2nd NETIF_MSG_IFDOWN => IFUP
ipg: fix receivemode IPG_RM_RECEIVEMULTICAST{,HASH} in ipg_nic_set_multicast_list()
netfilter: nf_conntrack: fix ctnetlink related crash in nf_nat_setup_info()
netfilter: Make nflog quiet when no one listen in userspace.
ipv6: Fail with appropriate error code when setting not-applicable sockopt.
ipv6: Check IPV6_MULTICAST_LOOP option value.
ipv6: Check the hop limit setting in ancillary data.
ipv6 route: Fix route lifetime in netlink message.
ipv6 mcast: Check address family of gf_group in getsockopt(MS_FILTER).
dccp: Bug in initial acknowledgment number assignment
dccp ccid-3: X truncated due to type conversion
dccp ccid-3: TFRC reverse-lookup Bug-Fix
dccp ccid-2: Bug-Fix - Ack Vectors need to be ignored on request sockets
dccp: Fix sparse warnings
dccp ccid-3: Bug-Fix - Zero RTT is possible
commit d36e311070ee3a378a54142a168ff5cfedba33d5
Merge: 61d6cc54896811086b51fa78d440311974a09b3a 738eca74d1bd3e51180de179b7b74d4e34c4e5a3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 13 07:34:01 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: get leo framebuffer working
commit bd17243a84632465f5403bc9eb8b4831bd67e582
Author: Shane Huang <shane.huang at amd.com>
Date: Tue Jun 10 15:52:04 2008 +0800
ahci: Workaround HW bug for SB600/700 SATA controller PMP support
There is one bug in ATI SATA PMP of SB600 and SB700 old revision, which leads
to soft reset failure. This patch can fix the bug.
Signed-off-by: Shane Huang <shane.huang at amd.com>
Acked-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit e297d99e103f951a71fcb1534f1ff3480dd3a851
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Jun 10 00:13:04 2008 +0900
ahci: workarounds for mcp65
MCP65 ahci can do NCQ but doesn't set the CAP bit and rev A0 and A1
can't do MSI but have MSI capability. Implement AHCI_HFLAG_YES_NCQ
and apply appropriate workarounds.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Peer Chen <pchen at nvidia.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b554305905d9bc2184b424aa67712119d5c9fb99
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Jun 13 15:06:31 2008 +1000
drm: the sg alloc ioctl should write back the handle to userspace
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 41ee2ff404ec76194315aeed57ac973b010abe1d
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Fri Jun 13 15:04:40 2008 +1000
drm: use drms ioctl cmd not what we get passed from userspace.
This enforces us to use the drm ioctl types so read/write works correctly and not believe
what userspace tells us.
It does this hopefully without breaking the drm api.
Fixes bug from thread: BUG: unable to handle kernel NULL pointer dereference (drm_getunique)
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 61d6cc54896811086b51fa78d440311974a09b3a
Merge: c6d8f400cc7610f04177f81168c19b8407cb48c3 3692fd0aaef489b063518b5999c702bada5b6e22
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 12 19:37:29 2008 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5091/1: Add missing bitfield include to regs-lcd.h
[ARM] 5090/1: Correct pxafb palette typo error
[ARM] 5077/1: spi: fix list scan success verification in PXA ssp driver
commit c6d8f400cc7610f04177f81168c19b8407cb48c3
Author: Sergey Lapin <slapin at ossfans.org>
Date: Thu Jun 12 15:21:55 2008 -0700
rtc: Ramtron FM3130 RTC support
Ramtron FM3130 is a chip with two separate devices inside, RTC clock and
FRAM. This driver provides only RTC functionality.
This chip is met in lots of custom boards with AT91SAMXXXX CPU I work
with, is cheap and in no way better or worse than any other RTC on market.
While it is mostly met on much smaller devices, I think it is great to
have it supported in Linux.
Signed-off-by: Sergey Lapin <slapin at ossfans.org>
Signed-off-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 e6d2bb2bacb43ff03b0f458108d71981d58e775a
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Thu Jun 12 15:21:55 2008 -0700
rtc: make HPET_RTC_IRQ track HPET_EMULATE_RTC
More Kconfig tweaks related to the legacy PC RTC code:
- Describe the legacy PC RTC driver as such ... it's never quite
been clear that this driver is for PC RTCs, and now it's fair
to call this the "legacy" driver.
- Force it to understand about HPET stealing its IRQs ... kernel
code does this always when HPET is in use, there should be no
option for users to goof up the config.
This seems to fix kernel bugzilla #10729.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Maxim Levitsky <maximlevitsky 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 1da2e3d679a8ea2d9e82040359a706da0bd3bef6
Author: Stas Sergeev <stsp at aknet.ru>
Date: Thu Jun 12 15:21:54 2008 -0700
provide rtc_cmos platform device
Recently (around 2.6.25) I've noticed that RTC no longer works for me. It
turned out this is because I use pnpacpi=off kernel option to work around
the parport_pc bugs. I always did so, but RTC used to work fine in the
past, and now it have regressed.
The patch fixes the problem by creating the platform device for the RTC
when PNP is disabled. This may also help running the PNP-enabled kernel
on an older PCs.
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Cc: David Brownell <david-b at pacbell.net>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: 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 643b52b9c0b4e959436b4b551ebf4060d06d5ae8
Author: Nick Piggin <nickpiggin at yahoo.com.au>
Date: Thu Jun 12 15:21:52 2008 -0700
radix-tree: fix small lockless radix-tree bug
We shrink a radix tree when its root node has only one child, in the left
most slot. The child becomes the new root node. To perform this
operation in a manner compatible with concurrent lockless lookups, we
atomically switch the root pointer from the parent to its child.
However a concurrent lockless lookup may now have loaded a pointer to the
parent (and is presently deciding what to do next). For this reason, we
also have to keep the parent node in a valid state after shrinking the
tree, until the next RCU grace period -- otherwise this lookup with the
parent pointer may not do the right thing. Notably, we need to keep the
child in the left most slot there in case that is requested by the lookup.
This is all pretty standard RCU stuff. It is worth repeating because in
my eagerness to obey the radix tree node constructor scheme, I had broken
it by zeroing the radix tree node before the grace period.
What could happen is that a lookup can load the parent pointer, then
decide it wants to follow the left most child slot, only to find the slot
contained NULL due to the concurrent shrinker having zeroed the parent
node before waiting for a grace period. The lookup would return a false
negative as a result.
Fix it by doing that clearing in the RCU callback. I would normally want
to rip out the constructor entirely, but radix tree nodes are one of those
places where they make sense (only few cachelines will be touched soon
after allocation).
This was never actually found in any lockless pagecache testing or by the
test harness, but by seeing the odd problem with my scalable vmap rewrite.
I have not tickled the test harness into reproducing it yet, but I'll
keep working at it.
Fortunately, it is not a problem anywhere lockless pagecache is used in
mainline kernels (pagecache probe is not a guarantee, and brd does not
have concurrent lookups and deletes).
Signed-off-by: Nick Piggin <npiggin at suse.de>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: "Paul E. McKenney" <paulmck 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 d2187ebd84c7dd13ef269e9600f4daebeb02816e
Author: Jiri Bohac <jbohac at suse.cz>
Date: Thu Jun 12 15:21:51 2008 -0700
console keyboard mapping broken by 04c71976
Several console keyboard maps are broken since
commit 04c71976500352d02f60616d2b960267d8c5fe24
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Tue Oct 16 23:27:04 2007 -0700
unicode diacritics support
because that changeset made k_self consider the value as a latin1
character when in Unicode mode, which is wrong; k_self should still take
the console map into account.
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 6c826818ff55eae7702b778b5f8bdf765af3b2af
Author: Paul Menage <menage at google.com>
Date: Thu Jun 12 15:21:49 2008 -0700
/proc/sysvipc/shm: fix 32-bit truncation of segment sizes
sysvipc_shm_proc_show() picks between format strings (based on the
expected maximum length of a SHM segment) in a way that prevents gcc from
performing format checks on the seq_printf() parameters. This hid two
format errors - shp->shm_segsz and shp->shm_nattach are both unsigned
long, but were being printed as unsigned int and signed int respectively.
This leads to 32-bit truncation of SHM segment sizes reported in
/proc/sysvipc/shm. (And for nattach, but that's less of a problem for
most users).
This patch makes the format string directly visible to gcc's format
specifier checker, and fixes the two broken format specifiers.
Signed-off-by: Paul Menage <menage at google.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Manfred Spraul <manfred at colorfullife.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 bcf8039ed45f56013c4afea5520bca7d909e5e61
Author: Dave Hansen <dave at linux.vnet.ibm.com>
Date: Thu Jun 12 15:21:48 2008 -0700
pagemap: fix large pages in pagemap
We were walking right into huge page areas in the pagemap walker, and
calling the pmds pmd_bad() and clearing them.
That leaked huge pages. Bad.
This patch at least works around that for now. It ignores huge pages in
the pagemap walker for the time being, and won't leak those pages.
Signed-off-by: Dave Hansen <dave at linux.vnet.ibm.com>
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 2165009bdf63f79716a36ad545df14c3cdf958b7
Author: Dave Hansen <dave at linux.vnet.ibm.com>
Date: Thu Jun 12 15:21:47 2008 -0700
pagemap: pass mm into pagewalkers
We need this at least for huge page detection for now, because powerpc
needs the vm_area_struct to be able to determine whether a virtual address
is referring to a huge page (its pmd_huge() doesn't work).
It might also come in handy for some of the other users.
Signed-off-by: Dave Hansen <dave at linux.vnet.ibm.com>
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 cfc53f65f56f9f33c0cf522124045ac5a64076b3
Author: Philippe De Muyter <phdm at macqel.be>
Date: Thu Jun 12 15:21:46 2008 -0700
driver/char/generic_nvram: fix banner
The generic nvram driver announces itself as
'Macintosh non-volatile memory driver'
instead of 'Generic non-volatile memory driver'. Fix that.
Signed-off-by: Philippe De Muyter <phdm at macqel.be>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Arjan van de Ven <arjan at linux.intel.com>
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 e59b6a5ab51f6192cbe20d4f031335fe6d0e73fd
Author: Philippe De Muyter <phdm at macqel.be>
Date: Thu Jun 12 15:21:45 2008 -0700
drivers/video/cirrusfb: fix RAM address printk
In the cirrusfb driver, the RAM address printk has a superfluous 'x' that
could be interpreted as "don't care", while it is actually a typo. Fix
that.
[akpm at linux-foundation.org: join the two printk strings to make it atomic]
Signed-off-by: Philippe De Muyter <phdm at macqel.be>
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 c97aee9ba43d60ff20d955065d29b6d3d8c950d5
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Thu Jun 12 15:21:45 2008 -0700
intel_rng: make device not found a warning
Since many distros load this driver by default (throw it against the wall
and see what sticks method). Change the error message severity level to
avoid alarming users. Isn't it annoying when users actually read the
error logs...
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Cc: Michael Buesch <mb at bu3sch.de>
Acked-by: Jan Beulich <jbeulich at novell.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 093a44e71aa29157fb1611b00507d67c954099d6
Author: Julia Lawall <julia at diku.dk>
Date: Thu Jun 12 15:21:43 2008 -0700
drivers/isdn/sc/ioctl.c: add missing kfree
spid has been allocated in this function and so should be freed before
leaving it, as in the other error handling cases.
The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
@r exists@
expression E,E1;
statement S;
position p1,p2,p3;
@@
E =@p1 \(kmalloc\|kcalloc\|kzalloc\)(...)
... when != E = E1
if (E == NULL || ...) S
... when != E = E1
if at p2 (...) {
... when != kfree(E)
}
... when != E = E1
kfree at p3(E);
@forall@
position r.p2;
expression r.E;
int E1 != 0;
@@
* if at p2 (...) {
... when != kfree(E)
when strict
return E1; }
Signed-off-by: Julia Lawall <julia at diku.dk>
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 cef33400d0349fb24b6f8b7dea79b66e3144fd8b
Author: Chuck Ebbert <cebbert at redhat.com>
Date: Thu Jun 12 15:21:42 2008 -0700
mmc: wbsd: initialize tasklets before requesting interrupt
With CONFIG_DEBUG_SHIRQ set we will get an interrupt as soon as we
allocate one. Tasklets may be scheduled in the interrupt handler but they
will be initialized after the handler returns, causing a BUG() in
kernel/softirq.c when they run.
Should fix this Fedora bug report:
https://bugzilla.redhat.com/show_bug.cgi?id=449817
Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
Acked-by: Pierre Ossman <drzeus at drzeus.cx>
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 30ec261e5f97986644c0982543bc1cee1b2782bf
Author: Eric Miao <eric.y.miao at gmail.com>
Date: Thu Jun 12 15:21:41 2008 -0700
MAINTAINERS: update maintainership of pxa2xx/pxa3xx
Signed-off-by: Eric Miao <eric.miao at marvell.com>
Acked-by: Russell King <rmk at arm.linux.org.uk>
Acked-by: Nicolas Pitre <nico at marvell.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f1ef9167ca4494a8c6d71d0031c73e9c8841eadd
Author: Jeff Dike <jdike at addtoit.com>
Date: Thu Jun 12 15:21:41 2008 -0700
uml: work around broken host PTRACE_SYSEMU
Fedora broke PTRACE_SYSEMU again, and UML crashes as a result when it
doesn't need to. This patch makes the PTRACE_SYSEMU check fail gracefully
and makes UML fall back to PTRACE_SYSCALL.
Signed-off-by: Jeff Dike <jdike 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 14c8a77e1bbd693446dad297d2ae2dd22f187e4f
Author: Jeff Dike <jdike at addtoit.com>
Date: Thu Jun 12 15:21:40 2008 -0700
uml: remove include of asm/user.h
I allowed an include of asm/user.h to sneak back in. This patch replaces
it with sys/user.h.
Signed-off-by: Jeff Dike <jdike 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 529a4f4ec90ffd9394fdfc22bea7a858ae343171
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Thu Jun 12 15:21:38 2008 -0700
rtc-at32ap700x: fix bug in at32_rtc_readalarm()
alarm->pending indicates whether there's an alarm that has actually been
triggered, not whether we're waiting for it. alarm->enabled indicates
that.
Also add missing locking around reading the RTC registers.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Signed-off-by: Alessandro Zummo <a.zummo at towertech.it>
Cc: Hans-Christian Egtvedt <hans-christian.egtvedt 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 6c38d8578545482fe45d6e6ea37be02a2e1bb289
Author: Philippe De Muyter <phdm at macqel.be>
Date: Thu Jun 12 15:21:36 2008 -0700
m68knommu: init coldfire timer TRR with n - 1, not n
The coldfire timer must be initialised to n - 1 if we want it to count n
cycles between each tick interrupt. This was already fixed, but has been
lost with the conversion to GENERIC_TIMER.
Signed-off-by: Philippe De Muyter <phdm at macqel.be>
Acked-by: Greg Ungerer <gerg at snapgear.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 67dddaad5d8b8c5ee5b96a7e2f6cb0faad703865
Author: Masami Hiramatsu <mhiramat at redhat.com>
Date: Thu Jun 12 15:21:35 2008 -0700
kprobes: fix error checking of batch registration
Fix error checking routine to catch an error which occurs in first
__register_*probe().
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: David Miller <davem at davemloft.net>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 24aac480e76c6f5d1391ac05c5e9c0eb9b0cd302
Author: Mike Miller <mike.miller at hp.com>
Date: Thu Jun 12 15:21:34 2008 -0700
cciss: add new hardware support
Add support for the next generation of HP Smart Array SAS/SATA
controllers. Shipping date is late Fall 2008.
Bump the driver version to 3.6.20 to reflect the new hardware support from
patch 1 of this set.
Signed-off-by: Mike Miller <mike.miller at hp.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
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 8cdbc2b9826b3543fecff2f6d6400fa77b21ffdd
Author: Andrew G. Morgan <morgan at kernel.org>
Date: Thu Jun 12 15:21:33 2008 -0700
capabilities: add (back) dummy support for KEEPCAPS
The dummy module is used by folk that run security conscious code(!?). A
feature of such code (for example, dhclient) is that it tries to operate
with minimum privilege (dropping unneeded capabilities). While the dummy
module doesn't restrict code execution based on capability state, the user
code expects the kernel to appear to support it. This patch adds back
faked support for the PR_SET_KEEPCAPS etc., calls - making the kernel
behave as before 2.6.26.
For details see: http://bugzilla.kernel.org/show_bug.cgi?id=10748
Signed-off-by: Andrew G. Morgan <morgan at kernel.org>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: James Morris <jmorris at namei.org>
Cc: Stephen Smalley <sds at tycho.nsa.gov>
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 57d3c64fd8130ebdacd85a36c9656ba5e221f3a3
Author: Ben Nizette <bn at niasdigital.com>
Date: Thu Jun 12 15:21:31 2008 -0700
proc_fs.h: move struct mm_struct forward-declaration
Move the forward-declaration of struct mm_struct a little way up
proc_fs.h. This fixes a bunch of "'struct mm_struct' declared inside
parameter list" warnings with CONFIG_PROC_FS=n
Signed-off-by: Ben Nizette <bn at niasdigital.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 551e172a20cf960f7caab4d31b252dc59538bfa4
Author: Paul Jackson <pj at sgi.com>
Date: Thu Jun 12 15:21:31 2008 -0700
cpusets: provide another web page URL in MAINTAINERS file
Add URL for another CPUSETS web page to the MAINTAINERS file.
This URL provides links to major LGPL user level C libraries supporting
cpuset usage and user level cpu and node masks.
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 630c270183133ac25bef8c8d726ac448df9b169a
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Thu Jun 12 15:21:29 2008 -0700
hgafb: resource management fix
Release ports which are requested during detection which are not freed if
there is no hga card. Otherwise there is a crash during cat /proc/ioports
command.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
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 69c5ddf58a03da3686691ad2f293bc79fd977c10
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Thu Jun 12 15:21:29 2008 -0700
m68k: Add ext2_find_{first,next}_bit() for ext4
Add ext2_find_{first,next}_bit(), which are needed for ext4. They're
derived out of the ext2_find_next_zero_bit found in the same file.
Compile tested with crosstools
[Reworked to preserve all symmetry with ext2_find_{first,next}_zero_bit()]
This fixes http://bugzilla.kernel.org/show_bug.cgi?id=10393
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: 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 2d518f84e5ecd1d71df0e6ac5176d212f68c27ce
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Thu Jun 12 15:21:28 2008 -0700
fat: relax the permission check of fat_setattr()
New chmod() allows only acceptable permission, and if not acceptable, it
returns -EPERM. Old one allows even if it can't store permission to on
disk inode. But it seems too strict for users.
E.g. https://bugzilla.redhat.com/show_bug.cgi?id=449080: With new one,
rsync couldn't create the temporary file.
So, this patch allows like old one, but now it doesn't change the
permission if it can't store, and it returns 0.
Also, this patch fixes missing check.
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 c700be3d1320d2be4f04c8a5330186b7df724438
Author: kosaki.motohiro at jp.fujitsu.com <kosaki.motohiro at jp.fujitsu.com>
Date: Thu Jun 12 15:21:27 2008 -0700
mm: fix incorrect variable type in do_try_to_free_pages()
"Smarter retry of costly-order allocations" patch series change behaver of
do_try_to_free_pages(). But unfortunately ret variable type was
unchanged.
Thus an overflow is possible.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Acked-by: Nishanth Aravamudan <nacc 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 df0bcab2c66ac876d5e80864fca5cce944a44540
Author: Amit Kucheria <amit.kucheria at ubuntu.com>
Date: Thu Jun 12 15:21:26 2008 -0700
agp: add support for Radeon Mobility 9000 chipset
Addresses https://bugs.edge.launchpad.net/ubuntu/+source/linux-source-2.6.22/+bug/178634
Signed-off-by: Amit Kucheria <amit.kucheria at ubuntu.com>
Signed-off-by: maximilian attems <max at stro.at>
Acked-by: Dave Airlie <airlied at linux.ie>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ec0a196626bd12e0ba108d7daa6d95a4fb25c2c5
Author: David S. Miller <davem at davemloft.net>
Date: Thu Jun 12 16:31:35 2008 -0700
tcp: Revert 'process defer accept as established' changes.
This reverts two changesets, ec3c0982a2dd1e671bad8e9d26c28dcba0039d87
("[TCP]: TCP_DEFER_ACCEPT updates - process as established") and
the follow-on bug fix 9ae27e0adbf471c7a6b80102e38e1d5a346b3b38
("tcp: Fix slab corruption with ipv6 and tcp6fuzz").
This change causes several problems, first reported by Ingo Molnar
as a distcc-over-loopback regression where connections were getting
stuck.
Ilpo Järvinen first spotted the locking problems. The new function
added by this code, tcp_defer_accept_check(), only has the
child socket locked, yet it is modifying state of the parent
listening socket.
Fixing that is non-trivial at best, because we can't simply just grab
the parent listening socket lock at this point, because it would
create an ABBA deadlock. The normal ordering is parent listening
socket --> child socket, but this code path would require the
reverse lock ordering.
Next is a problem noticed by Vitaliy Gusev, he noted:
----------------------------------------
>--- a/net/ipv4/tcp_timer.c
>+++ b/net/ipv4/tcp_timer.c
>@@ -481,6 +481,11 @@ static void tcp_keepalive_timer (unsigned long data)
> goto death;
> }
>
>+ if (tp->defer_tcp_accept.request && sk->sk_state == TCP_ESTABLISHED) {
>+ tcp_send_active_reset(sk, GFP_ATOMIC);
>+ goto death;
Here socket sk is not attached to listening socket's request queue. tcp_done()
will not call inet_csk_destroy_sock() (and tcp_v4_destroy_sock() which should
release this sk) as socket is not DEAD. Therefore socket sk will be lost for
freeing.
----------------------------------------
Finally, Alexey Kuznetsov argues that there might not even be any
real value or advantage to these new semantics even if we fix all
of the bugs:
----------------------------------------
Hiding from accept() sockets with only out-of-order data only
is the only thing which is impossible with old approach. Is this really
so valuable? My opinion: no, this is nothing but a new loophole
to consume memory without control.
----------------------------------------
So revert this thing for now.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f23d60de719e639690b2dc5c2d0e4243ff614b7a
Author: David S. Miller <davem at davemloft.net>
Date: Thu Jun 12 14:47:58 2008 -0700
ipv6: Fix duplicate initialization of rawv6_prot.destroy
In changeset 22dd485022f3d0b162ceb5e67d85de7c3806aa20
("raw: Raw socket leak.") code was added so that we
flush pending frames on raw sockets to avoid leaks.
The ipv4 part was fine, but the ipv6 part was not
done correctly. Unlike the ipv4 side, the ipv6 code
already has a .destroy method for rawv6_prot.
So now there were two assignments to this member, and
what the compiler does is use the last one, effectively
making the ipv6 parts of that changeset a NOP.
Fix this by removing the:
.destroy = inet6_destroy_sock,
line, and adding an inet6_destroy_sock() call to the
end of raw6_destroy().
Noticed by Al Viro.
Signed-off-by: David S. Miller <davem at davemloft.net>
Acked-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 24e3fcefb9cc61acce59ed54c00c4e4c32537de7
Author: Eilon Greenstein <eilong at broadcom.com>
Date: Thu Jun 12 14:30:28 2008 -0700
bnx2x: Updating the Maintainer
I would like to thank Eliezer Tamir for writing and maintaining the
driver for the past two years. I will take over maintaining the bnx2x
driver from now on.
Signed-off-by: Eilon Greenstein <eilong at broadcom.com>
Signed-off-by: Eliezer Tamir <eliezert at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5dd34572ad9a3be430632dd42e4af2ea370b397b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 12 14:22:24 2008 -0700
Linux 2.6.26-rc6
.. and a new name, courtesy of Alan.
commit 81d5575a48f49f494289a1299a32e4e5e41fbf40
Author: Jesse Barnes <jbarnes at hobbes.lan>
Date: Thu Jun 12 13:51:46 2008 -0700
PCI: fixup write combine comment in pci_mmap_resource
Now that we can actually do write combining properly, there's no need to have
the FIXME.
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 883eed1b3e25fb1d7d8f32c6550cc1ac44888838
Merge: 5e70b7f3c24468bb1635b295945edb48ecd9656a 45aec1ae72fc592f231e9e73ed9ed4d10cfbc0b5
Author: Jesse Barnes <jbarnes at hobbes.lan>
Date: Thu Jun 12 13:51:05 2008 -0700
Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip into for-linus
commit cbfa66b88d5720b81b75e72e7de8116d338e6b30
Merge: 1b3cba8e60c67c968d108ac55c77e32c1928dec3 f8a45704f5bd5f037c8e4a75172cab1476fc0447
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 12 12:55:32 2008 -0700
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
x86, lockdep: fix "WARNING: at kernel/lockdep.c:2658 check_flags+0x4c/0x128()"
x86: fix an incompatible pointer type warning on 64-bit compilations
x86: fix lockdep warning during suspend-to-ram
x86: fix unused variable 'loops' warning in arch/x86/boot/a20.c
Revert "x86: fix ioapic bug again"
x86: fix asm warning in head_32.S
x86: fix endless page faults in mount_block_root for Linux 2.6
geode: fix modular build
commit 1b3cba8e60c67c968d108ac55c77e32c1928dec3
Merge: 14a73f54798f39854e521fb596da7d50b7566bbd 7a232e0350940d2664f4de5cc3f0f443bae5062d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 12 12:55:18 2008 -0700
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: 64-bit: fix arithmetics overflow
sched: fair group: fix overflow(was: fix divide by zero)
sched: fix TASK_WAKEKILL vs SIGKILL race
commit 3692fd0aaef489b063518b5999c702bada5b6e22
Author: Stefan Schmidt <stefan at datenfreihafen.org>
Date: Thu Jun 12 07:07:22 2008 +0100
[ARM] 5091/1: Add missing bitfield include to regs-lcd.h
Macros like Fld() or FShft used in regs-lcd.h are defined in bitfield.h, but
the latter is not included.
Also fix one whitespace issue while being there.
Signed-off-by: Antonio Ospite <ao2 at openezx.org>
Signed-off-by: Stefan Schmidt <stefan at datenfreihafen.org>
Acked-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit f8a45704f5bd5f037c8e4a75172cab1476fc0447
Author: Kevin Winchester <kjwinchester at gmail.com>
Date: Thu May 29 21:14:35 2008 -0300
x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
Changed the call to find_e820_area_size to pass u64 instead of unsigned long.
Signed-off-by: Kevin Winchester <kjwinchester at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4461145ef1be92851c230f858f6b6f457c99670f
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Thu Jun 12 08:55:59 2008 +0200
x86, lockdep: fix "WARNING: at kernel/lockdep.c:2658 check_flags+0x4c/0x128()"
Alessandro Suardi reported:
> Recently upgraded my FC6 desktop to Fedora 9; with the
> latest nautilus RPM updates my VNC session went nuts
> with nautilus pegging the CPU for everything that breathed.
>
> I now reverted to an earlier nautilus package, but during
> the peak CPU period my kernel spat this:
>
> [314185.623294] ------------[ cut here ]------------
> [314185.623414] WARNING: at kernel/lockdep.c:2658 check_flags+0x4c/0x128()
> [314185.623514] Modules linked in: iptable_filter ip_tables x_tables
> sunrpc ipv6 fuse snd_via82xx snd_ac97_codec ac97_bus snd_mpu401_uart
> snd_rawmidi via686a hwmon parport_pc sg parport uhci_hcd ehci_hcd
> [314185.623924] Pid: 12314, comm: nautilus Not tainted 2.6.26-rc5-git2 #4
> [314185.624021] [<c0115b95>] warn_on_slowpath+0x41/0x7b
> [314185.624021] [<c010de70>] ? do_page_fault+0x2c1/0x5fd
> [314185.624021] [<c0128396>] ? up_read+0x16/0x28
> [314185.624021] [<c010de70>] ? do_page_fault+0x2c1/0x5fd
> [314185.624021] [<c012fa33>] ? __lock_acquire+0xbb4/0xbc3
> [314185.624021] [<c012d0a0>] check_flags+0x4c/0x128
> [314185.624021] [<c012fa73>] lock_acquire+0x31/0x7d
> [314185.624021] [<c0128cf6>] __atomic_notifier_call_chain+0x30/0x80
> [314185.624021] [<c0128cc6>] ? __atomic_notifier_call_chain+0x0/0x80
> [314185.624021] [<c0128d52>] atomic_notifier_call_chain+0xc/0xe
> [314185.624021] [<c0128d81>] notify_die+0x2d/0x2f
> [314185.624021] [<c01043b0>] do_int3+0x1f/0x4d
> [314185.624021] [<c02f2d3b>] int3+0x27/0x2c
> [314185.624021] =======================
> [314185.624021] ---[ end trace 1923f65a2d7bb246 ]---
> [314185.624021] possible reason: unannotated irqs-off.
> [314185.624021] irq event stamp: 488879
> [314185.624021] hardirqs last enabled at (488879): [<c0102d67>]
> restore_nocheck+0x12/0x15
> [314185.624021] hardirqs last disabled at (488878): [<c0102dca>]
> work_resched+0x19/0x30
> [314185.624021] softirqs last enabled at (488876): [<c011a1ba>]
> __do_softirq+0xa6/0xac
> [314185.624021] softirqs last disabled at (488865): [<c010476e>]
> do_softirq+0x57/0xa6
>
> I didn't seem to find it with some googling, so here it is.
>
> I was incidentally ltracing that process to try and find out
> what was gulping down that much CPU (sorry, no idea
> whether ltrace and the WARNING happened at the same
> time or which came first) and:
Yeah, this is extremely likely to be the source of the warning.
The warning should be harmless, however.
> Box is my trusty noname K7-800, 512MB RAM; if there's
> anything else useful I might be able to provide, just ask.
It would be interesting to see where the int3 comes from. Too bad,
lockdep doesn't provide the register dump. The stacktrace also doesn't
go further than the int3(), I wonder if this int3 came from userspace?
The ltrace readme says "software breakpoints, like gdb", so I guess
this is the case. Yep, seems like it.
This looks relevant:
| commit fb1dac909d94ff807cd833d340c6827c3a957159
| Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
| Date: Wed Jan 16 09:51:59 2008 +0100
|
| lockdep: more hardirq annotations for notify_die()
I'm attaching a similarly-looking patch for this case (DO_VM86_ERROR),
though I suspect it might be missing for the other cases
(DO_ERROR/DO_ERROR_INFO) as well.
Reported-by: Alessandro Suardi <alessandro.suardi at gmail.com>
Signed-off-by: Vegard Nossum <vegard.nossum at gmail.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit eb53e9f3ea859a6d59c37b500593b970aa8562e6
Author: David Howells <dhowells at redhat.com>
Date: Sat Jun 7 17:18:40 2008 +0100
x86: fix an incompatible pointer type warning on 64-bit compilations
Fix an incompatible pointer type warning on x86_64 compilations.
early_memtest() is passing a u64* to find_e820_area_size() which is expecting
an unsigned long. Change t_start and t_size to unsigned long as those are
also 64-bit types on x88_64.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e32e58a96de4ac35a03349db2ab69f263ded958f
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Fri Jun 6 10:14:08 2008 +0200
x86: fix lockdep warning during suspend-to-ram
Andrew Morton wrote:
> I've been seeing the below for a long time during suspend-to-ram on the Vaio.
>
>
> PM: Syncing filesystems ... done.
> PM: Preparing system for mem sleep
> Freezing user space processes ... <4>------------[ cut here ]------------
> WARNING: at kernel/lockdep.c:2658 check_flags+0x4c/0x127()
> Modules linked in: i915 drm ipw2200 sonypi ipv6 autofs4 hidp l2cap bluetooth sunrpc nf_conntrack_netbios_ns ipt_REJECT nf_conntrack_ipv4 xt_state nf_conntrack xt_tcpudp iptable_filter ip_tables x_tables acpi_cpufreq nvram ohci1394 ieee1394 ehci_hcd uhci_hcd sg joydev snd_hda_intel snd_seq_dummy sr_mod snd_seq_oss cdrom snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss ieee80211 pcspkr ieee80211_crypt snd_pcm i2c_i801 snd_timer i2c_core ide_pci_generic piix snd soundcore snd_page_alloc button ext3 jbd ide_disk ide_core [last unloaded: ipw2200]
> Pid: 3250, comm: zsh Not tainted 2.6.26-rc5 #1
> [<c011c5f5>] warn_on_slowpath+0x41/0x6d
> [<c01080e6>] ? native_sched_clock+0x82/0x96
> [<c013789c>] ? mark_held_locks+0x41/0x5c
> [<c0315688>] ? _spin_unlock_irqrestore+0x36/0x58
> [<c0137a29>] ? trace_hardirqs_on+0xe6/0x10d
> [<c0138637>] ? __lock_acquire+0xae3/0xb2b
> [<c0313413>] ? schedule+0x39b/0x3b4
> [<c0135596>] check_flags+0x4c/0x127
> [<c01386b9>] lock_acquire+0x3a/0x86
> [<c0315075>] _spin_lock+0x26/0x53
> [<c0140660>] ? refrigerator+0x13/0xc3
> [<c0140660>] refrigerator+0x13/0xc3
> [<c012684a>] get_signal_to_deliver+0x3c/0x31e
> [<c0102fe7>] do_notify_resume+0x91/0x6ee
> [<c01359fd>] ? lock_release_holdtime+0x50/0x56
> [<c0315688>] ? _spin_unlock_irqrestore+0x36/0x58
> [<c0235d24>] ? read_chan+0x0/0x58c
> [<c0137a29>] ? trace_hardirqs_on+0xe6/0x10d
> [<c0315694>] ? _spin_unlock_irqrestore+0x42/0x58
> [<c0230afa>] ? tty_ldisc_deref+0x5c/0x63
> [<c0233104>] ? tty_read+0x66/0x98
> [<c014b3f0>] ? audit_syscall_exit+0x2aa/0x2c5
> [<c0109430>] ? do_syscall_trace+0x6b/0x16f
> [<c0103a9c>] work_notifysig+0x13/0x1b
> =======================
> ---[ end trace 25b49fe59a25afa5 ]---
> possible reason: unannotated irqs-off.
> irq event stamp: 58919
> hardirqs last enabled at (58919): [<c0103afd>] syscall_exit_work+0x11/0x26
Joy - I so love entry.S
Best I can make of it:
syscall_exit_work
resume_userspace
DISABLE_INTERRUPTS
(no TRACE_IRQS_OFF)
work_pending
work_notifysig
do_notify_resume()
do_signal()
get_signal_to_deliver()
try_to_freeze()
refrigerator()
task_lock() -> check_flags() -> BANG
The normal path is:
syscall_exit_work
resume_userspace
DISABLE_INTERRUPTS
restore_all
TRACE_IRQS_IRET
iret
No idea why that would not warn..
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 52aaa12fbe786c90396f1b11ec39c924ccdd8fd5
Author: Manish Katiyar <mkatiyar at gmail.com>
Date: Thu Jun 5 19:14:15 2008 +0530
x86: fix unused variable 'loops' warning in arch/x86/boot/a20.c
Following patch fixes the below warning message :
arch/x86/boot/a20.c:118: warning: unused variable 'loops'
Signed-off-by : Manish Katiyar <mkatiyar at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 0b6a39f7ebcb1c82587ce35b401c513eed41ac5c
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Jun 9 13:29:43 2008 +0200
Revert "x86: fix ioapic bug again"
This reverts commit 6e908947b4995bc0e551a8257c586d5c3e428201.
Németh Márton reported:
| there is a problem in 2.6.26-rc3 which was not there in case of
| 2.6.25: the CPU wakes up ~90,000 times per sec instead of ~60 per sec.
|
| I also "git bisected" the problem, the result is:
|
| 6e908947b4995bc0e551a8257c586d5c3e428201 is first bad commit
| commit 6e908947b4995bc0e551a8257c586d5c3e428201
| Author: Ingo Molnar <mingo at elte.hu>
| Date: Fri Mar 21 14:32:36 2008 +0100
|
| x86: fix ioapic bug again
the original problem is fixed by Maciej W. Rozycki in the tip/x86/apic
branch (confirmed by Márton), but those changes are too intrusive for
v2.6.26 so we'll go for the less intrusive (repeated) revert now.
Reported-and-bisected-by: Németh Márton <nm127 at freemail.hu>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 86b2b70e156203149c3861455feec54bc4906e6d
Author: Joe Korty <joe.korty at ccur.com>
Date: Mon Jun 2 17:21:06 2008 -0400
x86: fix asm warning in head_32.S
On Mon, May 19, 2008 at 04:10:02PM -0700, Linus Torvalds wrote:
> It also causes these warnings on 32-bit PAE:
>
> AS arch/x86/kernel/head_32.o
> arch/x86/kernel/head_32.S: Assembler messages:
> arch/x86/kernel/head_32.S:225: Warning: left operand is a bignum; integer 0 assumed
> arch/x86/kernel/head_32.S:609: Warning: left operand is a bignum; integer 0 assumed
>
> and I do not see why (the end result seems to be identical).
Fix head_32.S gcc bignum warnings when CONFIG_PAE=y.
arch/x86/kernel/head_32.S: Assembler messages:
arch/x86/kernel/head_32.S:225: Warning: left operand is a bignum; integer 0 assumed
arch/x86/kernel/head_32.S:609: Warning: left operand is a bignum; integer 0 assumed
The assembler was stumbling over the 64-bit constant 0x100000000 in the
KPMDS #define.
Testing: a cmp(1) on head_32.o before and after shows the binary is unchanged.
Signed-off-by: Joe Korty <joe.korty at ccur.com
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Theodore Tso <tytso at mit.edu>
Cc: Gabriel C <nix.or.die at googlemail.com>
Cc: Keith Packard <keithp at keithp.com>
Cc: "Pallipadi Venkatesh" <venkatesh.pallipadi at intel.com>
Cc: Eric Anholt <eric at anholt.net>
Cc: "Siddha Suresh B" <suresh.b.siddha at intel.com>
Cc: bugme-daemon at bugzilla.kernel.org
Cc: airlied at linux.ie
Cc: "Barnes Jesse" <jesse.barnes at intel.com>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Cc: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b29c701deacd5d24453127c37ed77ef851c53b8b
Author: Henry Nestler <henry.nestler at gmail.com>
Date: Mon May 12 15:44:39 2008 +0200
x86: fix endless page faults in mount_block_root for Linux 2.6
Page faults in kernel address space between PAGE_OFFSET up to
VMALLOC_START should not try to map as vmalloc.
Fix rarely endless page faults inside mount_block_root for root
filesystem at boot time.
All 32bit kernels up to 2.6.25 can fail into this hole.
I can not present this under native linux kernel. I see, that the 64bit
has fixed the problem. I copied the same lines into 32bit part.
Recorded debugs are from coLinux kernel 2.6.22.18 (virtualisation):
http://www.henrynestler.com/colinux/testing/pfn-check-0.7.3/20080410-antinx/bug16-recursive-page-fault-endless.txt
The physicaly memory was trimmed down to 192MB to better catch the bug.
More memory gets the bug more rarely.
Details, how every x86 32bit system can fail:
Start from "mount_block_root",
http://lxr.linux.no/linux/init/do_mounts.c#L297
There the variable "fs_names" got one memory page with 4096 bytes.
Variable "p" walks through the existing file system types. The first
string is no problem.
But, with the second loop in mount_block_root the offset of "p" is not
at beginning of page, the offset is for example +9, if "reiserfs" is the
first in list.
Than calls do_mount_root, and lands in sys_mount.
Remember: Variable "type_page" contains now "fs_type+9" and not contains
a full page.
The sys_mount copies 4096 bytes with function "exact_copy_from_user()":
http://lxr.linux.no/linux/fs/namespace.c#L1540
Mostly exist pages after the buffer "fs_names+4096+9" and the page fault
handler was not called. No problem.
In the case, if the page after "fs_names+4096" is not mapped, the page
fault handler was called from http://lxr.linux.no/linux/fs/namespace.c#L1320
The do_page_fault gots an address 0xc03b4000.
It's kernel address, address >= TASK_SIZE, but not from vmalloc! It's
from "__getname()" alias "kmem_cache_alloc".
The "error_code" is 0. "vmalloc_fault" will be call:
http://lxr.linux.no/linux/arch/i386/mm/fault.c#L332
"vmalloc_fault" tryed to find the physical page for a non existing
virtual memory area. The macro "pte_present" in vmalloc_fault()
got a next page fault for 0xc0000ed0 at:
http://lxr.linux.no/linux/arch/i386/mm/fault.c#L282
No PTE exist for such virtual address. The page fault handler was trying
to sync the physical page for the PTE lockup.
This called vmalloc_fault() again for address 0xc000000, and that also
was not existing. The endless began...
In normal case the cpu would still loop with disabled interrrupts. Under
coLinux this was catched by a stack overflow inside printk debugs.
Signed-off-by: Henry Nestler <henry.nestler at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 3703f39965a197ebd91743fc38d0f640606b8da3
Author: Ingo Molnar <mingo at elte.hu>
Date: Wed Jun 4 18:13:37 2008 +0200
geode: fix modular build
-tip testing found this build bug:
MODPOST 331 modules
ERROR: "geode_mfgpt_toggle_event" [drivers/watchdog/geodewdt.ko] undefined!
ERROR: "geode_mfgpt_alloc_timer" [drivers/watchdog/geodewdt.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
with this config:
http://redhat.com/~mingo/misc/config-Wed_Jun__4_18_01_59_CEST_2008.bad
export those symbols.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 14a73f54798f39854e521fb596da7d50b7566bbd
Author: Carl Henrik Lunde <chlunde at ping.uio.no>
Date: Thu Jun 12 20:13:58 2008 +0200
block: disable IRQs until data is written to relay channel
As we may run relay_reserve from interrupt context we must always disable
IRQs. This is because a call to relay_reserve may expose previously written
data to use space.
Updated new message code and an old but related comment.
Signed-off-by: Carl Henrik Lunde <chlunde at ping.uio.no>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 95dcf8350dc889e735d03c0debe2f7b26d243185
Merge: 5a1603be58f11edb1b30cb1e40cfbdd4439289d0 4d7365d664e79710ac0e782a23443471ddf05bdd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 12 07:56:39 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:
kbuild: ignore powerpc specific symbols in modpost
commit 5a1603be58f11edb1b30cb1e40cfbdd4439289d0
Author: Paul Mundt <lethal at linux-sh.org>
Date: Thu Jun 12 16:29:55 2008 +0900
nommu: Correct kobjsize() page validity checks.
This implements a few changes on top of the recent kobjsize() refactoring
introduced by commit 6cfd53fc03670c7a544a56d441eb1a6cc800d72b.
As Christoph points out:
virt_to_head_page cannot return NULL. virt_to_page also
does not return NULL. pfn_valid() needs to be used to
figure out if a page is valid. Otherwise the page struct
reference that was returned may have PageReserved() set
to indicate that it is not a valid page.
As discussed further in the thread, virt_addr_valid() is the preferable
way to validate the object pointer in this case. In addition to fixing
up the reserved page case, it also has the benefit of encapsulating the
hack introduced by commit 4016a1390d07f15b267eecb20e76a48fd5c524ef on
the impacted platforms, allowing us to get rid of the extra checking in
kobjsize() for the platforms that don't perform this type of bizarre
memory_end abuse (every nommu platform that isn't blackfin). If blackfin
decides to get in line with every other platform and use PageReserved
for the DMA pages in question, kobjsize() will also continue to work
fine.
It also turns out that compound_order() will give us back 0-order for
non-head pages, so we can get rid of the PageCompound check and just
use compound_order() directly. Clean that up while we're at it.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
Reviewed-by: Christoph Lameter <clameter at sgi.com>
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f969c5672b16b857e5231ad3c78f08d8ef3305aa
Author: Jeff Mahoney <jeffm at suse.com>
Date: Thu Jun 12 02:05:26 2008 -0400
fsl-diu-db: compile fix
This patch fixes a compile failure in 2.6.26-rc5-git5.
The variable is expected to be called ofdev.
Signed-off-by: Jeff Mahoney <jeffm at suse.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dc10885d68ae5893038e009f82cbb14a05aa9dd0
Merge: 631025b4d87d5a9d7e04a1ed652d247191e223d4 9412e28649d0272df5e4af57bb378926fd4df580
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 12 07:47:44 2008 -0700
Merge branch 'core/iter-div' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/iter-div' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
always_inline timespec_add_ns
add an inlined version of iter_div_u64_rem
common implementation of iterative div/mod
commit 4d7365d664e79710ac0e782a23443471ddf05bdd
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Thu Jun 12 15:02:55 2008 +0200
kbuild: ignore powerpc specific symbols in modpost
Kumar Gala <galak at kernel.crashing.org> wrote:
We have a case in powerpc in which we want to link some library
routines with all module objects. The routines are intended for
handling out-of-line function call register save/restore so having
them as EXPORT_SYMBOL() is counter productive (we do also need to
link the same "library" code into the kernel).
Without this patch a powerpc build would error out and fail
to build modules with the added register save/restore module.
There were two obvious solutions:
1) To link the .o file before the modpost stage
2) To ignore the symbols in modpost
Option 1) was ruled out because we do not have any separate
linking stage for single file modules.
This patch implements option 2 - and do so only for powerpc.
The symbols we ignore are all undefined symbols named:
_restgpr_*, _savegpr_*, _rest32gpr_*, _save32gpr_*
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Kumar Gala <galak at kernel.crashing.org>
Cc: Paul Mackerras <paulus at samba.org>
commit 7a232e0350940d2664f4de5cc3f0f443bae5062d
Author: Lai Jiangshan <laijs at cn.fujitsu.com>
Date: Thu Jun 12 16:43:07 2008 +0800
sched: 64-bit: fix arithmetics overflow
(overflow means weight >= 2^32 here, because inv_weigh = 2^32/weight)
A weight of a cfs_rq is the sum of weights of which entities
are queued on this cfs_rq, so it will overflow when there are
too many entities.
Although, overflow occurs very rarely, but it break fairness when
it occurs. 64-bits systems have more memory than 32-bit systems
and 64-bit systems can create more process usually, so overflow may
occur more frequently.
This patch guarantees fairness when overflow happens on 64-bit systems.
Thanks to the optimization of compiler, it changes nothing on 32-bit.
Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 2e084786f6fe052274f1dfa7c675fe4a02cacd6e
Author: Lai Jiangshan <laijs at cn.fujitsu.com>
Date: Thu Jun 12 16:42:58 2008 +0800
sched: fair group: fix overflow(was: fix divide by zero)
I found a bug which can be reproduced by this way:(linux-2.6.26-rc5, x86-64)
(use 2^32, 2^33, ...., 2^63 as shares value)
# mkdir /dev/cpuctl
# mount -t cgroup -o cpu cpuctl /dev/cpuctl
# cd /dev/cpuctl
# mkdir sub
# echo 0x8000000000000000 > sub/cpu.shares
# echo $$ > sub/tasks
oops here! divide by zero.
This is because do_div() expects the 2th parameter to be 32 bits,
but unsigned long is 64 bits in x86_64.
Peter Zijstra pointed it out that the sane thing to do is limit the
shares value to something smaller instead of using an even more
expensive divide.
Also, I found another bug about "the shares value is too large":
pid1 and pid2 are set affinity to cpu#0
pid1 is attached to cg1 and pid2 is attached to cg2
if cg1/cpu.shares = 1024 cg2/cpu.shares = 2000000000
then pid2 got 100% usage of cpu, and pid1 0%
if cg1/cpu.shares = 1024 cg2/cpu.shares = 20000000000
then pid2 got 0% usage of cpu, and pid1 100%
And a weight of a cfs_rq is the sum of weights of which entities
are queued on this cfs_rq, so the shares value should be limited
to a smaller value.
I think that (1UL << 18) is a good limited value:
1) it's not too large, we can create a lot of group before overflow
2) it's several times the weight value for nice=-19 (not too small)
Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4bb073c0e32a0862bdb5215d11af19f6c0180c98
Author: David S. Miller <davem at davemloft.net>
Date: Thu Jun 12 02:22:02 2008 -0700
net: Eliminate flush_scheduled_work() calls while RTNL is held.
If the RTNL is held when we invoke flush_scheduled_work() we could
deadlock. One such case is linkwatch, it is a work struct which tries
to grab the RTNL semaphore.
The most common case are net driver ->stop() methods. The
simplest conversion is to instead use cancel_{delayed_}work_sync()
explicitly on the various work struct the driver uses.
This is an OK transformation because these work structs are doing
things like resetting the chip, restarting link negotiation, and so
forth. And if we're bringing down the device, we're about to turn the
chip off and reset it anways. So if we cancel a pending work event,
that's fine here.
Some drivers were working around this deadlock by using a msleep()
polling loop of some sort, and those cases are converted to instead
use cancel_{delayed_}work_sync() as well.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9412e28649d0272df5e4af57bb378926fd4df580
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Thu Jun 12 10:48:00 2008 +0200
always_inline timespec_add_ns
timespec_add_ns is used from the x86-64 vdso, which cannot call out to
other kernel code. Make sure that timespec_add_ns is always inlined
(and only uses always_inlined functions) to make sure there are no
unexpected calls.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d5e181f78ac753893eb930868a52a4488cd3de0a
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Thu Jun 12 10:47:58 2008 +0200
add an inlined version of iter_div_u64_rem
iter_div_u64_rem is used in the x86-64 vdso, which cannot call other
kernel code. For this case, provide the always_inlined version,
__iter_div_u64_rem.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f595ec964daf7f99668039d7303ddedd09a75142
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Thu Jun 12 10:47:56 2008 +0200
common implementation of iterative div/mod
We have a few instances of the open-coded iterative div/mod loop, used
when we don't expcet the dividend to be much bigger than the divisor.
Unfortunately modern gcc's have the tendency to strength "reduce" this
into a full mod operation, which isn't necessarily any faster, and
even if it were, doesn't exist if gcc implements it in libgcc.
The workaround is to put a dummy asm statement in the loop to prevent
gcc from performing the transformation.
This patch creates a single implementation of this loop, and uses it
to replace the open-coded versions I know about.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: john stultz <johnstul at us.ibm.com>
Cc: Segher Boessenkool <segher at kernel.crashing.org>
Cc: Christian Kujau <lists at nerdbynature.de>
Cc: Robert Hancock <hancockr at shaw.ca>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 45aec1ae72fc592f231e9e73ed9ed4d10cfbc0b5
Author: venkatesh.pallipadi at intel.com <venkatesh.pallipadi at intel.com>
Date: Tue Mar 18 17:00:22 2008 -0700
x86: PAT export resource_wc in pci sysfs
For the ranges with IORESOURCE_PREFETCH, export a new resource_wc interface in
pci /sysfs along with resource (which is uncached).
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Acked-by: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 7afb380db43ed137b7f67e0e3c3e5afd1ecde730
Merge: a4056573873dc9fc506ce9293c4d01670101a637 208aefa2451cc1f4d87622cb9b2ca4333afa8337
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jun 11 20:27:51 2008 -0700
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit 208aefa2451cc1f4d87622cb9b2ca4333afa8337
Author: Christophe Jaillet <christophe.jaillet at wanadoo.fr>
Date: Thu May 15 23:26:22 2008 +0200
drivers/net/r6040.c: correct bad use of round_jiffies()
Compared to other places in the kernel, I think that this driver misuses
the function round_jiffies.
Signed-off-by: Christophe Jaillet <christophe.jaillet at wanadoo.fr>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8b9835108f68938a5f7e74fd2c0fc65da2abad92
Author: Roel Kluin <roel.kluin at gmail.com>
Date: Mon Jun 9 16:33:51 2008 -0700
fec_mpc52xx: MPC52xx_MESSAGES_DEFAULT: 2nd NETIF_MSG_IFDOWN => IFUP
Duplicate NETIF_MSG_IFDOWN, 2nd should be NETIF_MSG_IFUP
Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
Acked-by: Sylvain Munaut <tnt at 246tNt.com>
Cc: Grant Likely <grant.likely at secretlab.ca>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0761248f08ccd94ddceb5454eb1ad96626b10611
Author: Roel Kluin <roel.kluin at gmail.com>
Date: Mon Jun 9 16:33:50 2008 -0700
ipg: fix receivemode IPG_RM_RECEIVEMULTICAST{,HASH} in ipg_nic_set_multicast_list()
The branches are dead code. even when dev->flag IFF_MULTICAST (defined
0x1000) is set, dev->flags & IFF_MULTICAST & [boolean] always evaluates to
0.
Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
Cc: Francois Romieu <romieu at fr.zoreil.com>
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 a4056573873dc9fc506ce9293c4d01670101a637
Merge: 5cb960a80531211379f8f05c575725d7630098fe 1717699cd5130009b7cd6756e883d8582c1fe706
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jun 11 18:11:16 2008 -0700
Merge branch 'net-2.6-misc-20080611a' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-fix
commit 5cb960a80531211379f8f05c575725d7630098fe
Merge: ceeff7541e5a4ba8e8d97ffbae32b3f283cb7a3f be4c798a41bf626cdaacf96c382f116ed2f7dbe9
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jun 11 17:53:04 2008 -0700
Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-2.6
commit ceeff7541e5a4ba8e8d97ffbae32b3f283cb7a3f
Author: Patrick McHardy <kaber at trash.net>
Date: Wed Jun 11 17:51:10 2008 -0700
netfilter: nf_conntrack: fix ctnetlink related crash in nf_nat_setup_info()
When creation of a new conntrack entry in ctnetlink fails after having
set up the NAT mappings, the conntrack has an extension area allocated
that is not getting properly destroyed when freeing the conntrack again.
This means the NAT extension is still in the bysource hash, causing a
crash when walking over the hash chain the next time:
BUG: unable to handle kernel paging request at 00120fbd
IP: [<c03d394b>] nf_nat_setup_info+0x221/0x58a
*pde = 00000000
Oops: 0000 [#1] PREEMPT SMP
Pid: 2795, comm: conntrackd Not tainted (2.6.26-rc5 #1)
EIP: 0060:[<c03d394b>] EFLAGS: 00010206 CPU: 1
EIP is at nf_nat_setup_info+0x221/0x58a
EAX: 00120fbd EBX: 00120fbd ECX: 00000001 EDX: 00000000
ESI: 0000019e EDI: e853bbb4 EBP: e853bbc8 ESP: e853bb78
DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
Process conntrackd (pid: 2795, ti=e853a000 task=f7de10f0 task.ti=e853a000)
Stack: 00000000 e853bc2c e85672ec 00000008 c0561084 63c1db4a 00000000 00000000
00000000 0002e109 61d2b1c3 00000000 00000000 00000000 01114e22 61d2b1c3
00000000 00000000 f7444674 e853bc04 00000008 c038e728 0000000a f7444674
Call Trace:
[<c038e728>] nla_parse+0x5c/0xb0
[<c0397c1b>] ctnetlink_change_status+0x190/0x1c6
[<c0397eec>] ctnetlink_new_conntrack+0x189/0x61f
[<c0119aee>] update_curr+0x3d/0x52
[<c03902d1>] nfnetlink_rcv_msg+0xc1/0xd8
[<c0390228>] nfnetlink_rcv_msg+0x18/0xd8
[<c0390210>] nfnetlink_rcv_msg+0x0/0xd8
[<c038d2ce>] netlink_rcv_skb+0x2d/0x71
[<c0390205>] nfnetlink_rcv+0x19/0x24
[<c038d0f5>] netlink_unicast+0x1b3/0x216
...
Move invocation of the extension destructors to nf_conntrack_free()
to fix this problem.
Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10875
Reported-and-Tested-by: Krzysztof Piotr Oledzki <ole at ans.pl>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b66985b11b8b00e1ec65b89a3112510ac9a9ec6e
Author: Eric Leblond <eric at inl.fr>
Date: Wed Jun 11 17:50:27 2008 -0700
netfilter: Make nflog quiet when no one listen in userspace.
The message "nf_log_packet: can't log since no backend logging module loaded
in! Please either load one, or disable logging explicitly" was displayed for
each logged packet when no userspace application is listening to nflog events.
The message seems to warn for a problem with a kernel module missing but as
said before this is not the case. I thus propose to suppress the message (I
don't see any reason to flood the log because a user application has crashed.)
Signed-off-by: Eric Leblond <eric at inl.fr>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 631025b4d87d5a9d7e04a1ed652d247191e223d4
Merge: aaef4d6c2ee64d5e4d59b7c4d23c37ce59115211 5340ba827b6269ccd2dcfd3d966626d9dd75d5d4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 11 17:29:32 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:
USB: don't use reset-resume if drivers don't support it
USB: isp1760: Assign resource fields before adding hcd
isight_firmware: Avoid crash on loading invalid firmware
USB: fix build bug in USB_ISIGHTFW
commit aaef4d6c2ee64d5e4d59b7c4d23c37ce59115211
Merge: da50ccc6a0f32ad29c1168837330a78e6e2e2923 acccafe9ca63eac3a202d8805d286ada6ab8cced
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 11 17:29:06 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:
kobject: Documentation Spelling Patch
dev_set_name: fix missing kernel-doc
commit 1717699cd5130009b7cd6756e883d8582c1fe706
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Thu Jun 12 03:27:26 2008 +0900
ipv6: Fail with appropriate error code when setting not-applicable sockopt.
IPV6_MULTICAST_HOPS, for example, is not valid for stream sockets.
Since they are virtually unavailable for stream sockets,
we should return ENOPROTOOPT instead of EINVAL.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 28d4488216645cd71402925cffde9528b0cfdb7e
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Thu Jun 12 03:14:51 2008 +0900
ipv6: Check IPV6_MULTICAST_LOOP option value.
Only 0 and 1 are valid for IPV6_MULTICAST_LOOP socket option,
and we should return an error of EINVAL otherwise, per RFC3493.
Based on patch from Shan Wei <shanwei at cn.fujitsu.com>.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit e8766fc86b34d44a8c55a2f9d71da69e091b1ca4
Author: Shan Wei <shanwei at cn.fujitsu.com>
Date: Tue Jun 10 15:50:55 2008 +0800
ipv6: Check the hop limit setting in ancillary data.
When specifing the outgoing hop limit as ancillary data for sendmsg(),
the kernel doesn't check the integer hop limit value as specified in
[RFC-3542] section 6.3.
Signed-off-by: Shan Wei <shanwei at cn.fujitsu.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 36e3deae8ba84865fd9eb3f2f21bbc00d49b7544
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Tue May 13 02:52:55 2008 +0900
ipv6 route: Fix route lifetime in netlink message.
1) We may have route lifetime larger than INT_MAX.
In that case we had wired value in lifetime.
Use INT_MAX if lifetime does not fit in s32.
2) Lifetime is valid iif RTF_EXPIRES is set.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 20c61fbd8deb2ada0ac3acecf6156a986dbfff2d
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Mon Apr 28 14:40:55 2008 +0900
ipv6 mcast: Check address family of gf_group in getsockopt(MS_FILTER).
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit da50ccc6a0f32ad29c1168837330a78e6e2e2923
Merge: a4df1ac12dd2d2812713a5fdd56af954d1bc251d 3549dba2c334e82df90f5e00ff85d2a7a2cdd1af
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 11 17:16:32 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: (23 commits)
ACPICA: fix stray va_end() caused by mis-merge
ACPI: Reject below-freezing temperatures as invalid critical temperatures
ACPICA: Fix for access to deleted object <regression>
ACPICA: Fix to make _SST method optional
ACPICA: Fix for Load operator, load table at the namespace root
ACPICA: Ignore ACPI table signature for Load() operator
ACPICA: Fix to allow zero-length ASL field declarations
ACPI: use memory_read_from_buffer()
bay: exit if notify handler cannot be installed
dock.c remove trailing printk whitespace
proper prototype for acpi_processor_tstate_has_changed()
ACPI: handle invalid ACPI SLIT table
PNPACPI: use _CRS IRQ descriptor length for _SRS
pnpacpi: fix shareable IRQ encode/decode
pnpacpi: fix IRQ flag decoding
MAINTAINERS: update ACPI homepage
ACPI 2.6.26-rc2: Add missing newline to DSDT/SSDT warning message
ACPI: EC: Use msleep instead of udelay while waiting for event.
thinkpad-acpi: fix LED handling on older ThinkPads
thinkpad-acpi: fix initialization error paths
...
commit 5340ba827b6269ccd2dcfd3d966626d9dd75d5d4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Jun 10 14:59:43 2008 -0400
USB: don't use reset-resume if drivers don't support it
This patch tries to identify which devices are able to accept
reset-resume handling, by checking that there is at least one
interface driver bound and that all of the drivers have a reset_resume
method defined. If these conditions don't hold then during resume
processing, the device is logicall disconnected.
This is only a temporary fix. Later on we will explicitly unbind
drivers that can't handle reset-resumes.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Cc: Oliver Neukum <oliver at neukum.org>
Cc: Pavel Machek <pavel at suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e6942d633be61f1638e08c56ab8244fc9f1c61e3
Author: Nate Case <ncase at xes-inc.com>
Date: Wed May 21 16:28:20 2008 -0500
USB: isp1760: Assign resource fields before adding hcd
This fixes the bogus "io mem 0x00000000" message printed
during driver init due to hcd->rsrc_start being assigned after
the call to usb_add_hcd().
Signed-off-by: Nate Case <ncase at xes-inc.com>
Acked-by: Sebastian Siewior <bigeasy at linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 62b5884875fcd4babf6c0c377046f226abbfe491
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Fri Jun 6 12:35:15 2008 -0700
isight_firmware: Avoid crash on loading invalid firmware
Different tools generate slightly different formats of the isight
firmware. Ensure that the firmware buffer is not overrun, while still
ensuring that the correct amount of data is written if trailing data is
present.
Signed-off-by: Matthew Garrett <mjg at redhat.com>
Report-by: Justin Mattock <justinmattock at gmail.com>
Tested-by: Justin Mattock <justinmattock at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 6460a261b5893e769a314c246faec31bbc4aad9c
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Jun 2 21:21:03 2008 +0200
USB: fix build bug in USB_ISIGHTFW
USB: fix build bug in USB_ISIGHTFW
-tip tree testing found this build bug:
drivers/built-in.o: In function `isight_firmware_load':
isight_firmware.c:(.text+0x1ade08): undefined reference to `request_firmware'
isight_firmware.c:(.text+0x1adf9c): undefined reference to `release_firmware'
select FW_LOADER in USB_ISIGHTFW.
From: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit acccafe9ca63eac3a202d8805d286ada6ab8cced
Author: David Brigada <brigad at rpi.edu>
Date: Wed Jun 11 13:27:32 2008 -0400
kobject: Documentation Spelling Patch
Signed-off-by: David Brigada <brigad at rpi.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4623236619ff5ce233136d13ee2747c194a63591
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Jun 4 21:40:43 2008 -0700
dev_set_name: fix missing kernel-doc
Fix kernel-doc for new dev_set_name() function:
Warning(lin2626-rc5//drivers/base/core.c:767): No description found for parameter 'fmt'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3463a93def55c309f3c0d0a8aaf216be3be42d64
Author: Alex Chiang <achiang at hp.com>
Date: Wed Jun 11 17:29:27 2008 -0600
[IA64] Update check_sal_cache_flush to use platform_send_ipi()
check_sal_cache_flush is used to detect broken firmware that drops
pending interrupts.
The old implementation schedules a timer interrupt for itself in
the future by getting the current value of the Interval Timer
Counter + 1000 cycles, waits for the interrupt to be pended, calls
SAL_CACHE_FLUSH, and finally checks to see if the interrupt is
still pending.
This implementation can cause problems for virtual machine code if
the process of scheduling the timer interrupt takes more than 1000
cycles; the virtual machine can end up sleeping for several hundred
years while waiting for the ITC to wrap around.
The fix is to use platform_send_ipi. The processor will still send
an interrupt to itself, using the IA64_IPI_DM_INT delivery mode,
which causes the IPI to look like an external interrupt. The rest
of the SAL_CACHE_FLUSH + checking to see if the interrupt is still
pending remains unchanged.
This fix has been boot tested successfully on:
- intel tiger2
- hp rx6600
- hp rx5670
The rx5670 has known buggy firmware, where SAL_CACHE_FLUSH drops
pending interrupts. A boot test on this machine showed this message
on the console:
SAL: SAL_CACHE_FLUSH drops interrupts; PAL_CACHE_FLUSH will be used instead
Which proves that the self-inflicted IPI approach is viable. And
as expected, the other tested platforms correctly did not display
the warning.
Signed-off-by: Alex Chiang <achiang at hp.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 3549dba2c334e82df90f5e00ff85d2a7a2cdd1af
Author: Len Brown <len.brown at intel.com>
Date: Fri Jun 6 15:32:39 2008 -0400
ACPICA: fix stray va_end() caused by mis-merge
Signed-off-by: Len Brown <len.brown at intel.com>
commit a39a2d7c72b358c6253a2ec28e17b023b7f6f41c
Author: Arjan van de Ven <arjan at linux.intel.com>
Date: Mon May 19 15:55:15 2008 -0700
ACPI: Reject below-freezing temperatures as invalid critical temperatures
My laptop thinks that it's a good idea to give -73C as the critical
CPU temperature.... which isn't the best thing since it causes a shutdown
right at bootup.
Temperatures below freezing are clearly invalid critical thresholds
so just reject these as such.
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Acked-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 8410565f540db87ca938f56f92780d251e4f157d
Author: Bob Moore <robert.moore at intel.com>
Date: Tue Jun 10 14:29:26 2008 +0800
ACPICA: Fix for access to deleted object <regression>
Fixes problem introduced in 20080123, with fix for Unload operator.
Parse tree object can be already deleted; must use the opcode
within the WalkState.
ACPI: kmemcheck: Caught 16-bit read from freed memory
http://bugzilla.kernel.org/show_bug.cgi?id=10669
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit d52c79ace60a2e2b22455fd195ff4bc8e7afa177
Author: Bob Moore <robert.moore at intel.com>
Date: Tue Jun 10 14:26:57 2008 +0800
ACPICA: Fix to make _SST method optional
Fixes a problem introduced in 20080514 where the status of
execution of _SST is incorrectly returned to the caller. _SST
is optional, and if it is AE_NOT_FOUND, the exception should be
ignored.
http://www.acpica.org/bugzilla/show_bug.cgi?id=716
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 0bda3f2f86e233b00b46d91b07db25dd23ec15bc
Author: Bob Moore <robert.moore at intel.com>
Date: Tue Jun 10 14:14:17 2008 +0800
ACPICA: Fix for Load operator, load table at the namespace root
This reverts a change introduced in version 20071019. The table
is now loaded at the namespace root even though this goes against
the ACPI specification. This provides compatibility with other
ACPI implementations.
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit bc45b1d39a925b56796bebf8a397a0491489d85c
Author: Bob Moore <robert.moore at intel.com>
Date: Tue Jun 10 14:12:50 2008 +0800
ACPICA: Ignore ACPI table signature for Load() operator
Only "SSDT" is acceptable to the ACPI spec, but tables are
seen with OEMx and null sigs. Therefore, signature validation
is worthless. Apparently MS ACPI accepts such signatures, ACPICA
must be compatible.
http://bugzilla.kernel.org/show_bug.cgi?id=10454
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 7aa7d4336df34e32195557a1ad422627bd69ef0b
Author: Bob Moore <robert.moore at intel.com>
Date: Tue Jun 10 13:00:32 2008 +0800
ACPICA: Fix to allow zero-length ASL field declarations
Allows null field list in Field(), BankField(), and IndexField().
2.6.26-rc1 regression: ACPI fails to load SDT. - Dell M1530
http://bugzilla.kernel.org/show_bug.cgi?id=10606
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 46a21e465e506bcd4dba759a39e7ef79978a705d
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Mon Jun 9 16:22:26 2008 -0700
ACPI: use memory_read_from_buffer()
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Acked-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 7efd52a407bed6a2b02015b8ebbff7beba155392
Author: Holger Macht <hmacht at suse.de>
Date: Mon Jun 9 16:22:24 2008 -0700
bay: exit if notify handler cannot be installed
If acpi_install_notify_handler() for a bay device fails, the bay driver is
superfluous. Most likely, another driver (like libata) is already caring
about this device anyway. Furthermore,
register_hotplug_dock_device(acpi_handle) from the dock driver must not be
called twice with the same handler. This would result in an endless loop
consuming 100% of CPU. So clean up and exit.
Signed-off-by: Holger Macht <hmacht at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1fdd68608614cd1e951fd93873fe5597374e8c54
Author: Tim Pepper <lnxninja at linux.vnet.ibm.com>
Date: Mon Jun 9 16:22:25 2008 -0700
dock.c remove trailing printk whitespace
Signed-off-by: Tim Pepper <lnxninja at linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a66b34b26fe1b0983c6d91b6381df806cd98886e
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Jun 9 16:22:24 2008 -0700
proper prototype for acpi_processor_tstate_has_changed()
This patch adds a proper prototype for acpi_processor_tstate_has_changed()
in include/acpi/processor.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Len Brown <lenb at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 39b8931b5cad9a7cbcd2394a40a088311e783a82
Author: Fenghua Yu <fenghua.yu at intel.com>
Date: Mon Jun 9 16:48:18 2008 -0700
ACPI: handle invalid ACPI SLIT table
This is a SLIT sanity checking patch. It moves slit_valid() function to
generic ACPI code and does sanity checking for both x86 and ia64. It sets up
node_distance with LOCAL_DISTANCE and REMOTE_DISTANCE when hitting invalid
SLIT table on ia64. It also cleans up unused variable localities in
acpi_parse_slit() on x86.
Signed-off-by: Fenghua Yu <fenghua.yu at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 36d872a370d3d10e5a7faa9dcacce744260fb13b
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Jun 9 16:52:06 2008 -0700
PNPACPI: use _CRS IRQ descriptor length for _SRS
When configuring the resources of an ACPI device, we first evaluate _CRS
to get a template of resource descriptors, then fill in the specific
resource values we want, and finally evaluate _SRS to actually configure
the device.
Some resources have optional fields, so the size of encoded descriptors
varies depending on the specific values. For example, IRQ descriptors can
be either two or three bytes long. The third byte contains triggering
information and can be omitted if the IRQ is edge-triggered and active
high.
The BIOS often assumes that IRQ descriptors in the _SRS buffer use the
same format as those in the _CRS buffer, so this patch enforces that
constraint.
The "Start Dependent Function" descriptor also has an optional byte, but
we don't currently encode those descriptors, so I didn't do anything for
those.
I have tested this patch on a Toshiba Portege 4000. Without the patch,
parport_pc claims the parallel port only if I use "pnpacpi=off". This
patch makes it work with PNPACPI.
This is an extension of a patch by Tom Jaeger:
http://bugzilla.kernel.org/show_bug.cgi?id=9487#c42
References:
http://bugzilla.kernel.org/show_bug.cgi?id=5832 Enabling ACPI Plug and Play in kernels >2.6.9 kills Parallel support
http://bugzilla.kernel.org/show_bug.cgi?id=9487 buggy firmware expects four-byte IRQ resource descriptor (was: Serial port disappears after Suspend on Toshiba R25)
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=1d5b285da1893b90507b081664ac27f1a8a3dc5b related ACPICA fix
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a993273beae8022390e48fe9205480565ad470ab
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Jun 9 16:52:05 2008 -0700
pnpacpi: fix shareable IRQ encode/decode
When we encode IRQ resources, we should use the "shareable" flag we got
from _PRS rather than guessing based on the IRQ trigger mode.
This is based on a patch by Tom Jaeger:
http://bugzilla.kernel.org/show_bug.cgi?id=9487#c32
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e9fe9e188118a0a34c6200d9b10ea6247f53592d
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Jun 9 16:52:04 2008 -0700
pnpacpi: fix IRQ flag decoding
When decoding IRQ trigger mode and polarity, it is not enough to mask by
IORESOURCE_BITS because there are now additional bits defined. For
example, if IORESOURCE_IRQ_SHAREABLE was set, we failed to set *triggering
and *polarity at all.
I can't point to a failure that this patch fixes, but
bugs in this area have caused problems when resuming after
suspend, for example:
http://bugzilla.kernel.org/show_bug.cgi?id=6316
http://bugzilla.kernel.org/show_bug.cgi?id=9487
https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.22/+bug/152187
This is based on a patch by Tom Jaeger:
http://bugzilla.kernel.org/show_bug.cgi?id=9487#c32
[rene.herman at keyaccess.nl: fix comment]
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 0638bc8dc037d844efe1d4abf44488c037705905
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue May 20 01:08:23 2008 +0300
MAINTAINERS: update ACPI homepage
This patch updates the location of the ACPI homepage in MAINTAINERS.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Len Brown <len.brown at intel.com>
commit c21d1e7f53ffd9c0f162c42e7fde07d1c45fa127
Author: Alistair John Strachan <alistair at devzero.co.uk>
Date: Mon May 12 19:13:09 2008 +0100
ACPI 2.6.26-rc2: Add missing newline to DSDT/SSDT warning message
As of recently (probably 2.6.26-rc1) I've been getting the following mangling
in the kernel log:
[4294014.568167] ACPI: DSDT override uses original SSDTs unless "acpi_no_auto_ssdt"<6>CPU0: Intel(R) Pentium(R) Dual CPU E2160 @ 1.80GHz stepping 0d
This is due to a missing newline character in the first message. The following
patch against 2.6.26-rc2 fixes it. Please apply.
Signed-off-by: Alistair John Strachan <alistair at devzero.co.uk>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 1b7fc5aae8867046f8d3d45808309d5b7f2e036a
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Fri Jun 6 11:49:33 2008 -0400
ACPI: EC: Use msleep instead of udelay while waiting for event.
http://bugzilla.kernel.org/show_bug.cgi?id=10724
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 24e45bbe695719dca8c20e03d386eb6ea86526b5
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Tue Jun 3 23:36:11 2008 -0300
thinkpad-acpi: fix LED handling on older ThinkPads
The less tested codepaths for LED handling, used on ThinkPads 570, 600e/x,
770e, 770x, A21e, A2xm/p, T20-22, X20 and maybe a few others, would write
data to kernel memory it had no business touching, for leds number 3 and
above. If one is lucky, that illegal write would cause an OOPS, but
chances are it would silently corrupt a byte.
The problem was introduced in commit af116101, "ACPI: thinkpad-acpi: add
sysfs led class support to thinkpad leds (v3.2)".
Fix the bug by refactoring the entire code to be far more obvious on what
it wants to do. Also do some defensive "constification".
Issue reported by Karol Lewandowski <lmctlx at gmail.com> (he's an lucky guy
and got an OOPS instead of silent corruption :-) ).
Root cause of the OOPS identified by Adrian Bunk <bunk at kernel.org>.
Thanks, Adrian!
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Tested-by: Karol Lewandowski <lmctlx at gmail.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 9c0a76e16ee6648f4bd19563e9fe12a4f4fabba1
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Tue Jun 3 23:36:10 2008 -0300
thinkpad-acpi: fix initialization error paths
Rework some subdriver init and exit handlers, in order to fix some
initialization error paths that were missing, or broken.
Hitting those bugs should be extremely rare in the real world, but should
that happen, thinkpad-acpi would fail to dealocate some resources and a
reboot might well be needed to be able to load the driver again.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 197a2cd907e3a5278a1cfd48c86402133f38a9ba
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Tue Jun 3 23:36:09 2008 -0300
thinkpad-acpi: SW_RADIO to SW_RFKILL_ALL rename
Rename SW_RADIO to SW_RFKILL_ALL in thinkpad-acpi code and docs, following
5adad0133907790c50283bf03271d920d6897043 "Input: rename SW_RADIO to
SW_RFKILL_ALL".
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Len Brown <len.brown at intel.com>
commit dcb84f335bee9c9a7781cfc5d74492dccaf066d2
Author: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Date: Mon May 19 19:09:27 2008 -0400
cpuidle acpi driver: fix oops on AC<->DC
cpuidle and acpi driver interaction bug with the way cpuidle_register_driver()
is called. Due to this bug, there will be oops on
AC<->DC on some systems, where they support C-states in one DC and not in AC.
The current code does
ON BOOT:
Look at CST and other C-state info to see whether more than C1 is
supported. If it is, then acpi processor_idle does a
cpuidle_register_driver() call, which internally enables the device.
ON CST change notification (AC<->DC) and on suspend-resume:
acpi driver temporarily disables device, updates the device with
any new C-states, and reenables the device.
The problem is is on boot, there are no C2, C3 states supported and we skip
the register. Later on AC<->DC, we may get a CST notification and we try
to reevaluate CST and enabled the device, without actually registering it.
This causes breakage as we try to create /sys fs sub directory, without the
parent directory which is created at register time.
Thanks to Sanjeev for reporting the problem here.
http://bugzilla.kernel.org/show_bug.cgi?id=10394
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit e1094bfa26e5e94af2fea79e004614dbce42b008
Author: Zhao Yakui <yakui.zhao at intel.com>
Date: Wed May 14 11:32:59 2008 +0800
ACPI: Disable Fixed_RTC event when installing RTC handler
The Fixed_RTC event should be disabled when installing RTC handler.
Only when RTC alarm is set will it be enabled again. If it is not
disabled, maybe some machines will be powered on automatically after
the system is shutdown even when the RTC alarm is not set.
http://bugzilla.kernel.org/show_bug.cgi?id=10010
Signed-off-by: Zhao Yakui <yakui.zhao at intel.com>
Signed-off-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 62cfcf4f467733a8dc218691c791804a148da887
Author: Jürgen Schindele <linux at schindele.name>
Date: Wed Jun 11 19:56:06 2008 +0100
[ARM] 5090/1: Correct pxafb palette typo error
This patch correct a typo error in pxafb vhich is relevant for 8-bit palette framebuffer configuration.
Signed-off-by: Jrgen Schindele <linux at schindele.name>
Acked-by: Eric Miao <eric.y.miao at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit a4aff2233786640c10b178ad78d4dd7e375f1955
Author: Guennadi Liakhovetski <lg at denx.de>
Date: Thu Jun 5 10:43:14 2008 +0100
[ARM] 5077/1: spi: fix list scan success verification in PXA ssp driver
The list search success check in arch/arm/mach-pxa/ssp.c is wrong: for
example, it didn't recognise failure for me when I requested port 0.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at pengutronix.de>
Acked-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 83014699b06fb9a300d896c7c49fb8be1c6c5ddc
Author: stephane eranian <eranian at googlemail.com>
Date: Wed Jun 11 15:24:13 2008 -0700
[IA64] perfmon: fix async exit bug
Move the cleanup of the async queue to the close callback from the flush
callback. This avoids losing asynchronous overflow notifications when
the file descriptor is shared by multiple processes and one terminates.
Signed-off-by: Stephane Eranian <eranian at gmail.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit a4df1ac12dd2d2812713a5fdd56af954d1bc251d
Merge: 2a212f699671c967dd0fad133f62e6f3e721c73d 3c9155106d589584f67b026ec444e69c4a68d7dc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 11 10:35:44 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:
KVM: MMU: Fix is_empty_shadow_page() check
KVM: MMU: Fix printk() format string
KVM: IOAPIC: only set remote_irr if interrupt was injected
KVM: MMU: reschedule during shadow teardown
KVM: VMX: Clear CR4.VMXE in hardware_disable
KVM: migrate PIT timer
KVM: ppc: Report bad GFNs
KVM: ppc: Use a read lock around MMU operations, and release it on error
KVM: ppc: Remove unmatched kunmap() call
KVM: ppc: add lwzx/stwz emulation
KVM: ppc: Remove duplicate function
KVM: s390: Fix race condition in kvm_s390_handle_wait
KVM: s390: Send program check on access error
KVM: s390: fix interrupt delivery
KVM: s390: handle machine checks when guest is running
KVM: s390: fix locking order problem in enable_sie
KVM: s390: use yield instead of schedule to implement diag 0x44
KVM: x86 emulator: fix hypercall return value on AMD
KVM: ia64: fix zero extending for mmio ld1/2/4 emulation in KVM
commit 2a212f699671c967dd0fad133f62e6f3e721c73d
Merge: f7f866eed01b7a03dd5aa36daf3c2c2721f922da 79ee9a8b2d328243488fee8b55bfacc822049a2a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 11 09:45:51 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] cifs: fix oops on mount when CONFIG_CIFS_DFS_UPCALL is enabled
[CIFS] Fix hang in mount when negprot causes server to kill tcp session
disable most mode changes on non-unix/non-cifsacl mounts
[CIFS] Correct incorrect obscure open flag
[CIFS] warn if both dynperm and cifsacl mount options specified
silently ignore ownership changes unless unix extensions are enabled or we're faking uid changes
[CIFS] remove trailing whitespace
when creating new inodes, use file_mode/dir_mode exclusively on mount without unix extensions
on non-posix shares, clear write bits in mode when ATTR_READONLY is set
[CIFS] remove unused variables
commit f7f866eed01b7a03dd5aa36daf3c2c2721f922da
Merge: 7427d8b815c7fc0b005a17cf3952b7ebef0481d2 513fd370e6832f81ab717df4645f5ce679e44f14
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 11 08:39:51 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: (42 commits)
net: Fix routing tables with id > 255 for legacy software
sky2: Hold RTNL while calling dev_close()
s2io iomem annotations
atl1: fix suspend regression
qeth: start dev queue after tx drop error
qeth: Prepare-function to call s390dbf was wrong
qeth: reduce number of kernel messages
qeth: Use ccw_device_get_id().
qeth: layer 3 Oops in ip event handler
virtio: use callback on empty in virtio_net
virtio: virtio_net free transmit skbs in a timer
virtio: Fix typo in virtio_net_hdr comments
virtio_net: Fix skb->csum_start computation
ehea: set mac address fix
sfc: Recover from RX queue flush failure
add missing lance_* exports
ixgbe: fix typo
forcedeth: msi interrupts
ipsec: pfkey should ignore events when no listeners
pppoe: Unshare skb before anything else
...
commit 7427d8b815c7fc0b005a17cf3952b7ebef0481d2
Author: Bryan Wu <cooloney at kernel.org>
Date: Wed Jun 11 12:08:39 2008 +0800
smc91x: fix build error from the SMC_GET_MAC_ADDR API change
Cc: Jeff Garzik <jeff at garzik.org>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8d6bcd6e219f183aba4fb62bb7065a4db772ac49
Author: Grant Likely <grant.likely at secretlab.ca>
Date: Sat May 24 16:11:51 2008 +1000
[POWERPC] bootwrapper: add simpleImage* to list of boot targets
Without simpleImage% in the BOOT_TARGETS list, it is impossible to
build any of the simpleImages.
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit be4c798a41bf626cdaacf96c382f116ed2f7dbe9
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date: Wed Jun 11 11:19:10 2008 +0100
dccp: Bug in initial acknowledgment number assignment
Step 8.5 in RFC 4340 says for the newly cloned socket
Initialize S.GAR := S.ISS,
but what in fact the code (minisocks.c) does is
Initialize S.GAR := S.ISR,
which is wrong (typo?) -- fixed by the patch.
Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
commit 7deb0f851003287d7e259bf6b33548b144c0f2d5
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date: Wed Jun 11 11:19:10 2008 +0100
dccp ccid-3: X truncated due to type conversion
This fixes a bug in computing the inter-packet-interval t_ipi = s/X:
scaled_div32(a, b) uses u32 for b, but in "scaled_div32(s, X)" the type of the
sending rate `X' is u64. Since X is scaled by 2^6, this truncates rates greater
than 2^26 Bps (~537 Mbps).
Using full 64-bit division now.
Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
commit 1e8a287c79f64226541f5c44aa52d4698bb84cf5
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date: Wed Jun 11 11:19:10 2008 +0100
dccp ccid-3: TFRC reverse-lookup Bug-Fix
This fixes a bug in the reverse lookup of p: given a value f(p), instead of p,
the function returned the smallest tabulated value f(p).
The smallest tabulated value of
10^6 * f(p) = sqrt(2*p/3) + 12 * sqrt(3*p/8) * (32 * p^3 + p)
for p=0.0001 is 8172.
Since this value is scaled by 10^6, the outcome of this bug is that a loss
of 8172/10^6 = 0.8172% was reported whenever the input was below the table
resolution of 0.01%.
This means that the value was over 80 times too high, resulting in large spikes
of the initial loss interval, thus unnecessarily reducing the throughput.
Also corrected the printk format (%u for u32).
Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
commit 65907a433ac0ca450c4408080f24c6e4743386b2
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date: Wed Jun 11 11:19:09 2008 +0100
dccp ccid-2: Bug-Fix - Ack Vectors need to be ignored on request sockets
This fixes an oversight from an earlier patch, ensuring that Ack Vectors
are not processed on request sockets.
The issue is that Ack Vectors must not be parsed on request sockets, since
the Ack Vector feature depends on the selection of the (TX) CCID. During the
initial handshake the CCIDs are undefined, and so RFC 4340, 10.3 applies:
"Using CCID-specific options and feature options during a negotiation
for the corresponding CCID feature is NOT RECOMMENDED [...]"
And it is not even possible: when the server receives the Request from the
client, the CCID and Ack vector features are undefined; when the Ack finalising
the 3-way hanshake arrives, the request socket has not been cloned yet into a
full socket. (This order is necessary, since otherwise the newly created socket
would have to be destroyed whenever an option error occurred - a malicious
hacker could simply send garbage options and exploit this.)
Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
commit 1e2f0e5e8376f2a0ada8760fc9d3104e1a81382b
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date: Wed Jun 11 11:19:09 2008 +0100
dccp: Fix sparse warnings
This patch fixes the following sparse warnings:
* nested min(max()) expression:
net/dccp/ccids/ccid3.c:91:21: warning: symbol '__x' shadows an earlier one
net/dccp/ccids/ccid3.c:91:21: warning: symbol '__y' shadows an earlier one
* Declaration of function prototypes in .c instead of .h file, resulting in
"should it be static?" warnings.
* Declared "struct dccpw" static (local to dccp_probe).
* Disabled dccp_delayed_ack() - not fully removed due to RFC 4340, 11.3
("Receivers SHOULD implement delayed acknowledgement timers ...").
* Used a different local variable name to avoid
net/dccp/ackvec.c:293:13: warning: symbol 'state' shadows an earlier one
net/dccp/ackvec.c:238:33: originally declared here
* Removed unused functions `dccp_ackvector_print' and `dccp_ackvec_print'.
Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
commit 3294f202dc1acd82223e83ef59f272bd87bb06b2
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date: Wed Jun 11 11:19:09 2008 +0100
dccp ccid-3: Bug-Fix - Zero RTT is possible
In commit $(825de27d9e40b3117b29a79d412b7a4b78c5d815) (from 27th May, commit
message `dccp ccid-3: Fix "t_ipi explosion" bug'), the CCID-3 window counter
computation was fixed to cope with RTTs < 4 microseconds.
Such RTTs can be found e.g. when running CCID-3 over loopback. The fix removed
a check against RTT < 4, but introduced a divide-by-zero bug.
All steady-state RTTs in DCCP are filtered using dccp_sample_rtt(), which
ensures non-zero samples. However, a zero RTT is possible on initialisation,
when there is no RTT sample from the Request/Response exchange.
The fix is to use the fallback-RTT from RFC 4340, 3.4.
This is also better than just fixing update_win_count() since it allows other
parts of the code to always assume that the RTT is non-zero during the time
that the CCID is used.
Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
commit 513fd370e6832f81ab717df4645f5ce679e44f14
Merge: 709772e6e06564ed94ba740de70185ac3d792773 68c2889834602f6efed195f44439ef5d526683a8
Author: David S. Miller <davem at davemloft.net>
Date: Tue Jun 10 16:21:55 2008 -0700
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit 709772e6e06564ed94ba740de70185ac3d792773
Author: Krzysztof Piotr Oledzki <ole at ans.pl>
Date: Tue Jun 10 15:44:49 2008 -0700
net: Fix routing tables with id > 255 for legacy software
Most legacy software do not like tables > 255 as rtm_table is u8
so tb_id is sent &0xff and it is possible to mismatch for example
table 510 with table 254 (main).
This patch introduces RT_TABLE_COMPAT=252 so the code uses it if
tb_id > 255. It makes such old applications happy, new
ones are still able to use RTA_TABLE to get a proper table id.
Signed-off-by: Krzysztof Piotr Oledzki <ole at ans.pl>
Acked-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 68c2889834602f6efed195f44439ef5d526683a8
Author: Ben Hutchings <bhutchings at solarflare.com>
Date: Sat May 31 16:52:52 2008 +0100
sky2: Hold RTNL while calling dev_close()
dev_close() must be called holding the RTNL.
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 69de8d23d10694bdd63fe715b98e1a61c56ed288
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
s2io iomem annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ae6b4d9ab6129467415801f30e487bc141a3f471
Author: Jay Cliburn <jacliburn at bellsouth.net>
Date: Sun Jun 1 16:57:11 2008 -0500
atl1: fix suspend regression
Using vendor magic to force the PHY into power save mode breaks
suspend. It isn't needed anyway, so remove it.
Tested-by: Avuton Olrich <avuton at gmail.com>
Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d0ec0f549705b7ecfb787f02512606b08fe5b291
Author: Frank Blaschka <frank.blaschka at de.ibm.com>
Date: Fri Jun 6 12:37:48 2008 +0200
qeth: start dev queue after tx drop error
In case the xmit function drop out with an error, we have to wake
the netdevice queue to start another xmit.
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 345aa66e97e61dccafaaa835e4b20d9b241e187f
Author: Peter Tiedemann <ptiedem at de.ibm.com>
Date: Fri Jun 6 12:37:47 2008 +0200
qeth: Prepare-function to call s390dbf was wrong
Prepare-function to call s390dbf was wrong handling variable arguments.
This worked as macro but not as function any more.
Now using va_list processing.
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 14cc21b6770972e5d1487dbf3a2caaf63cae909a
Author: Frank Blaschka <frank.blaschka at de.ibm.com>
Date: Fri Jun 6 12:37:46 2008 +0200
qeth: reduce number of kernel messages
Remove unnecessary messages. Write important debug information to
s390dbf.
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f06f6f3224afdd7e58207d1f5950f4666c5f095f
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date: Fri Jun 6 12:37:45 2008 +0200
qeth: Use ccw_device_get_id().
Get the devno from the ccw device via ccw_device_get_id() instead
of parsing the bus_id.
Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky 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 e5bd7be56787f8c5042081157fff983bcf0c8a42
Author: Frank Blaschka <frank.blaschka at de.ibm.com>
Date: Fri Jun 6 12:37:44 2008 +0200
qeth: layer 3 Oops in ip event handler
The ip event handler may present us non qeth network interfaces.
Add qeth card pointer check.
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 363f15149cfba67d29f1e6a6103dda079f27f3fa
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Sun Jun 8 20:51:55 2008 +1000
virtio: use callback on empty in virtio_net
virtio_net uses a timer to free old transmitted packets, rather than
leaving callbacks enabled all the time. If the host promises to
always notify us when the transmit ring is empty, we can free packets
at that point and avoid the timer.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 14c998f034bdc9a5bfa53bca18fbd0738cbc65e8
Author: Mark McLoughlin <markmc at redhat.com>
Date: Sun Jun 8 20:50:56 2008 +1000
virtio: virtio_net free transmit skbs in a timer
virtio_net currently only frees old transmit skbs just
before queueing new ones. If the queue is full, it then
enables interrupts and waits for notification that more
work has been performed.
However, a side-effect of this scheme is that there are
always xmit skbs left dangling when no new packets are
sent, against the Documentation/networking/driver.txt
guideline:
"... it is not allowed for your TX mitigation scheme
to let TX packets "hang out" in the TX ring unreclaimed
forever if no new TX packets are sent."
Add a timer to ensure that any time we queue new TX
skbs, we will shortly free them again.
This fixes an easily reproduced hang at shutdown where
iptables attempts to unload nf_conntrack and nf_conntrack
waits for an skb it is tracking to be freed, but virtio_net
never frees it.
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 2506ece0c0bbd2fc19a4827b96dc52ea47e2ce4a
Author: Mark McLoughlin <markmc at redhat.com>
Date: Sun Jun 8 20:49:59 2008 +1000
virtio: Fix typo in virtio_net_hdr comments
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 23cde76d801246a702e7a84c3fe3d655b35c89a1
Author: Mark McLoughlin <markmc at redhat.com>
Date: Sun Jun 8 20:49:00 2008 +1000
virtio_net: Fix skb->csum_start computation
hdr->csum_start is the offset from the start of the ethernet
header to the transport layer checksum field. skb->csum_start
is the offset from skb->head.
skb_partial_csum_set() assumes that skb->data points to the
ethernet header - i.e. it computes skb->csum_start by adding
the headroom to hdr->csum_start.
Since eth_type_trans() skb_pull()s the ethernet header,
skb_partial_csum_set() should be called before
eth_type_trans().
(Without this patch, GSO packets from a guest to the world outside the
host are corrupted).
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 00aaea2f95d73d4e2b5e45cf77c3cbb16c59e87f
Author: Jan-Bernd Themann <ossthema at de.ibm.com>
Date: Mon Jun 9 15:17:37 2008 +0100
ehea: set mac address fix
eHEA has to call firmware functions in order to change the mac address
of a logical port. This patch checks if the logical port is up
when calling the register / deregister mac address calls. If the port
is down these firmware calls would fail and are therefore not executed.
Signed-off-by: Jan-Bernd Themann <themann at de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 23bdfdd388723b8213f597743b1d4aba0d62de9c
Author: Steve Hodgson <shodgson at solarflare.com>
Date: Mon Jun 9 19:34:32 2008 +0100
sfc: Recover from RX queue flush failure
RX queue flush can fail if traffic continues to arrive. Recover by
performing an invisible reset.
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit bf4d593479e0a3f349118f9b8c40a6bc37bf1e2e
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Jun 10 01:22:16 2008 +0300
add missing lance_* exports
This patch fixes the following build error:
<-- snip -->
...
Building modules, stage 2.
MODPOST 1203 modules
ERROR: "lance_open" [drivers/net/mvme147.ko] undefined!
ERROR: "lance_close" [drivers/net/mvme147.ko] undefined!
ERROR: "lance_tx_timeout" [drivers/net/mvme147.ko] undefined!
ERROR: "lance_set_multicast" [drivers/net/mvme147.ko] undefined!
ERROR: "lance_start_xmit" [drivers/net/mvme147.ko] undefined!
...
make[2]: *** [__modpost] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ff68cdbf86f09e602eb2b04e1a7d448a3c3a3b28
Author: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Date: Mon Jun 9 15:57:17 2008 -0700
ixgbe: fix typo
Define names were accidently transposed.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4db0ee176e256444695ee2d7b004552e82fec987
Author: Ayaz Abdulla <aabdulla at nvidia.com>
Date: Mon Jun 9 16:51:06 2008 -0700
forcedeth: msi interrupts
Add a workaround for lost MSI interrupts. There is a race condition in
the HW in which future interrupts could be missed. The workaround is to
toggle the MSI irq mask.
Added cleanup based on comments from Andrew Morton.
Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
Cc: Manfred Spraul <manfred at colorfullife.com>
Cc: Jeff Garzik <jeff at garzik.org>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 79ee9a8b2d328243488fee8b55bfacc822049a2a
Author: Steve French <sfrench at us.ibm.com>
Date: Tue Jun 10 21:37:02 2008 +0000
[CIFS] cifs: fix oops on mount when CONFIG_CIFS_DFS_UPCALL is enabled
simple "mount -t cifs //xxx /mnt" oopsed on strlen of options
http://kerneloops.org/guilty.php?guilty=cifs_get_sb&version=2.6.25-release&start=16711 \
68&end=1703935&class=oops
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Acked-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 99c6f60e72f112b57ddb07abb2e5f771ee211f43
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date: Tue Jun 10 14:25:34 2008 -0700
ipsec: pfkey should ignore events when no listeners
When pfkey has no km listeners, it still does a lot of work
before finding out there aint nobody out there.
If a tree falls in a forest and no one is around to hear it, does it make
a sound? In this case it makes a lot of noise:
With this short-circuit adding 10s of thousands of SAs using
netlink improves performance by ~10%.
Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit dbdbb87636e882042cbe53d5d4eac94206f8db83
Author: Steve French <sfrench at us.ibm.com>
Date: Tue Jun 10 21:21:56 2008 +0000
[CIFS] Fix hang in mount when negprot causes server to kill tcp session
Acked-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 738eca74d1bd3e51180de179b7b74d4e34c4e5a3
Author: Robert Reif <reif at earthlink.net>
Date: Tue Jun 10 14:13:09 2008 -0700
sparc: get leo framebuffer working
This patch fixes several issues:
Use the right openprom device name so the driver is actually loaded.
Fix a crash due to unitialized info->pseudo_palette.
Put the framebuffer in the proper mode for software rendering.
checkpatch cleanups.
Hardware acceleration was removed when the driver was rewritten
for the new framebuffer API in 2003. Software rendering requires
a different framebuffer access mode but that wasn't changed. The
driver now works again but is slow. The proper fix is to reintroduce
hardware acceleration.
Signed-off-by: Robert Reif <reif at earthlink.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit bc6cffd177f9266af38dba96a2cea06c1e7ff932
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date: Tue Jun 10 14:08:25 2008 -0700
pppoe: Unshare skb before anything else
We need to unshare the skb first as otherwise pskb_may_pull may
write to a shared skb which could be bad.
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 392fdb0e35055b96faa9c1cd6ab537805337cdce
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date: Tue Jun 10 14:07:25 2008 -0700
net pppoe: Check packet length on all receive paths
The length field in the PPPOE header wasn't checked completely.
This patch causes all packets shorter than the declared length
to be dropped.
It also changes the memcpy_toiovec call to skb_copy_datagram_iovec
so that paged packets (rare for PPPOE) are handled properly.
Thanks to Ilja of the Netric Security Team for discovering and
reporting this bug, and Chris Wright for the total_len check.
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ea23ec26727b4df97b4965715f0519b6ddc0aa4b
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Tue Jun 10 12:50:14 2008 -0700
isdn: use simple_read_from_buffer()
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Acked-by: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 495b36b15e17fb08434e3800959434f06a1a6fbc
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Jun 10 12:49:31 2008 -0700
isdn divas: fix proc creation
1. creating proc entry and not saving pointer to PDE and checking it
is not going to work.
2. if proc entry wasn't created, no reason to remove it on error path.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b36ffc47a17ab5ce6d9589a99ac5d135c9173a9a
Author: Pradeep Singh Rautela <rautelap at gmail.com>
Date: Tue Jun 10 12:46:52 2008 -0700
drivers/atm/eni.h: remove unused macro KERNEL_OFFSET
KERNEL_OFFSET macro in eni.h is not required as it is not used anywhere.
Remove the unused macro from eni.h header file.
Signed-off-by: Pradeep Singh <rautelap at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ce4a7d0d48bbaed78ccbb0bafb9229651a40303a
Author: Arnaldo Carvalho de Melo <acme at redhat.com>
Date: Tue Jun 10 12:39:35 2008 -0700
inet{6}_request_sock: Init ->opt and ->pktopts in the constructor
Wei Yongjun noticed that we may call reqsk_free on request sock objects where
the opt fields may not be initialized, fix it by introducing inet_reqsk_alloc
where we initialize ->opt to NULL and set ->pktopts to NULL in
inet6_reqsk_alloc.
Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 45d465bc237ab1e1ebb4c65b9b318830dafb7509
Author: Rami Rosen <ramirose at gmail.com>
Date: Tue Jun 10 12:37:42 2008 -0700
ipv4: Remove unused declaration from include/net/tcp.h.
- The tcp_unhash() method in /include/net/tcp.h is no more needed, as the
unhash method in tcp_prot structure is now inet_unhash (instead of
tcp_unhash in the
past); see tcp_prot structure in net/ipv4/tcp_ipv4.c.
- So, this patch removes tcp_unhash() declaration from include/net/tcp.h
Signed-off-by: Rami Rosen <ramirose at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 6b6707a50c7598a83820077393f8823ab791abf8
Author: James Chapman <jchapman at katalix.com>
Date: Tue Jun 10 12:35:00 2008 -0700
l2tp: Fix potential memory corruption in pppol2tp_recvmsg()
This patch fixes a potential memory corruption in
pppol2tp_recvmsg(). If skb->len is bigger than the caller's buffer
length, memcpy_toiovec() will go into unintialized data on the kernel
heap, interpret it as an iovec and start modifying memory.
The fix is to change the memcpy_toiovec() call to
skb_copy_datagram_iovec() so that paged packets (rare for PPPOL2TP)
are handled properly. Also check that the caller's buffer is big
enough for the data and set the MSG_TRUNC flag if it is not so.
Reported-by: Ilja <ilja at netric.org>
Signed-off-by: James Chapman <jchapman at katalix.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 28ffb5d3e0b563be5a9639c3a2b42f1a9430454f
Merge: 19f2b8dfea10e4d5cd34feb08cbab738504c25cf efc0fc1c2f37c8c0e43c7616394a979a042b9331
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Jun 10 12:34:29 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:
fix BLK_DEV_HD_ONLY on ARM dependencies
ide: export ide_doubler
palm_bk3710: add warm-plug support
delkin_cb: add missing __init/__exit tags
delkin_cb: add warm-plug support
delkin_cb: use struct ide_port_info
delkin_cb: set proper hwif->gendev.parent value
ide: fix host drivers missing hwif->chipset initialization
ide-generic: add missing hwif->chipset setup
sis5513: add missing pci_enable_device() call
MAINTAINERS: remove SIS 5513 IDE entry
ide: remove the ide_etrax100 chipset type
commit 24797a344293601f14f49e2d259c3ca447c4f802
Author: Roland Dreier <rolandd at cisco.com>
Date: Tue Jun 10 12:29:49 2008 -0700
RDMA/nes: Fix off-by-one in nes_reg_user_mr() error path
nes_reg_user_mr() should fail if page_count becomes >= 1024 * 512
rather than just testing for strict >, because page_count is
essentially used as an index into an array with 1024 * 512 entries, so
allowing the loop to continue with page_count == 1024 * 512 means that
memory after the end of the array is corrupted. This leads to a crash
triggerable by a userspace application that requests registration of a
too-big region.
Also get rid of the call to pci_free_consistent() here to avoid
corrupting state with a double free, since the same memory will be
freed in the code jumped to at reg_user_mr_err.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit efc0fc1c2f37c8c0e43c7616394a979a042b9331
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Jun 10 20:56:38 2008 +0200
fix BLK_DEV_HD_ONLY on ARM dependencies
This patch limits BLK_DEV_HD_ONLY to the ARM platforms offering
IRQ_HARDDISK, fixing the following compile error on others:
<-- snip -->
...
CC drivers/ide/legacy/hd.o
...
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/legacy/hd.c: In function 'hd_times_out':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/legacy/hd.c:542: error: 'IRQ_HARDDISK' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/legacy/hd.c:542: error: (Each undeclared identifier is reported only once
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/legacy/hd.c:542: error: for each function it appears in.)
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/legacy/hd.c: In function 'do_hd_request':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/legacy/hd.c:661: error: 'IRQ_HARDDISK' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/legacy/hd.c: In function 'hd_init':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/legacy/hd.c:765: error: 'IRQ_HARDDISK' undeclared (first use in this function)
make[3]: *** [drivers/ide/legacy/hd.o] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 513f3c10ddb24b0a261ae96de6f7911ba28713f9
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Jun 10 20:56:38 2008 +0200
ide: export ide_doubler
This patch fixes the following build error:
<-- snip -->
...
Building modules, stage 2.
MODPOST 1204 modules
ERROR: "ide_doubler" [drivers/ide/ide-core.ko] undefined!
...
make[2]: *** [__modpost] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit fb374966ba13ccac341499eaefecd58a96bafb59
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Jun 10 20:56:38 2008 +0200
palm_bk3710: add warm-plug support
Don't fail the probe if there are no devices attached to the controller.
Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit f4084a1d18d618bb360bc72713a3bc2b8375e12f
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Jun 10 20:56:38 2008 +0200
delkin_cb: add missing __init/__exit tags
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 96fe439ec9ca25b09e1458d86bd739757ae11ea1
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Jun 10 20:56:38 2008 +0200
delkin_cb: add warm-plug support
Don't fail the probe if there are no devices attached to the controller.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 1c4d4ad50ac5cc74c605c4a467db42c961ec7a69
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Jun 10 20:56:37 2008 +0200
delkin_cb: use struct ide_port_info
Convert the driver to use struct ide_port_info - as a nice side-effect
this fixes racy setup of ->io_32bit/unmask settings (after ide_device_add()
call device can be already in use).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 8a7dbb9761d59996e4a037c969eabd8e93f3be1c
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Jun 10 20:56:37 2008 +0200
delkin_cb: set proper hwif->gendev.parent value
hwif->dev was set too late (after ide_device_add() call)
so hwif->gendev.parent was not initialized properly.
Fix it by setting hw.dev and letting ide_init_port_hw()
do the rest.
Acked-by: Sergei Shtylyov <sshtylyov at ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d427e836d1d9b58e8f1e648c09b5fbe36e01013b
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Jun 10 20:56:37 2008 +0200
ide: fix host drivers missing hwif->chipset initialization
ide_find_port() now depends on ->chipset being set for occupied ide_hwifs[]
slots so all host drivers have to initialize hwif->chipset properly.
This patch fixes a regression on hosts with > 1 port or with a single port
but no devices attached to it for an affected host drivers.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 343a3451e20314d5959b59b992e33fbaadfe52bf
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Jun 10 20:56:36 2008 +0200
ide-generic: add missing hwif->chipset setup
hwif->chipset need to be set properly or ide-generic driver will break once
we make a final step in fixing host drivers' dependence on ide_hwifs[].
Problem was catched early thanks to IDE tree exposure in -mm / -next trees
and reported by people listed people (thank you guys!).
Reported-by: "John Keller" <jpk at sgi.com>
Reported-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Reported-by: Mel Gorman <mel at csn.ul.ie>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit cd18f69f845dc8c769f0ef65046b7a113b8aba87
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Jun 10 20:56:36 2008 +0200
sis5513: add missing pci_enable_device() call
Cc: Riccardo Gori <goric at trivenet.it>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 34e6e88f025ebe0613f53af2703d4d902e39273a
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Jun 10 20:56:36 2008 +0200
MAINTAINERS: remove SIS 5513 IDE entry
- maintainer has not been active for years
- URLs no longer exist
- covered by the IDE SUBSYSTEM entry
- maintainer email bounces
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Lionel.Bouton at inet6.fr
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b76916462d990751882eaeadc75ac8c487d6de1d
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Jun 10 20:56:36 2008 +0200
ide: remove the ide_etrax100 chipset type
I forgot to remove the ide_etrax100 chipset type when removing the
ETRAX_IDE driver.
Reported-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d1daeabf0da5bfa1943272ce508e2ba785730bf0
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Tue Jun 10 10:20:53 2008 -0500
[SCSI] sr: fix corrupt CD data after media change and delay
Reported-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
If you delay 30s or more before mounting a CD after inserting it then
the kernel has the wrong value for the CD size.
http://marc.info/?t=121276133000001
The problem is in sr_test_unit_ready(): the function eats unit
attentions without adjusting the sdev->changed status. This means
that when the CD signals changed media via unit attention, we can
ignore it. Fix by making sr_test_unit_ready() adjust the changed
status.
Tested-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 19f2b8dfea10e4d5cd34feb08cbab738504c25cf
Merge: c592713b3e124ce0719e6af4bc2520424c49cbae 1783e60ff207805a3e75cf522b17ec9bb1604a62
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Jun 10 08:00:40 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] tape_3590.c: introduce missing kfree
[S390] Fix __ctl_load/__ctl_store inline assembly constraints
[S390] Fix build failure in __cpu_up()
[S390] vt220 console, initialize list head before use
[S390] cio: Fix inverted isc priorities.
[S390] vmemmap: fix off-by-one bug.
[S390] cio: Fix sparse warnings in blacklist.c.
[S390] sparsemem: use SPARSEMEM_STATIC if !64BIT.
commit c592713b3e124ce0719e6af4bc2520424c49cbae
Author: Neil Horman <nhorman at tuxdriver.com>
Date: Tue Jun 10 08:53:39 2008 -0400
shm: Remove silly double assignment
Found a silly double assignment of err is do_shmat. Silly, but good to
clean up the useless code.
Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f17c63231c9c2bfc5717af1890ad17312a1c2c1c
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Mon Mar 17 20:52:08 2008 +0300
[POWERPC] 83xx: MPC837xRDB's VSC7385 ethernet switch isn't on the MDIO bus
MDIO-less PHYs should use CONFIG_FIXED_PHY driver and appropriate
fixed-link property in the device tree.
If not, ethernet will not work:
e0024520:03 not found
eth1: Could not attach to PHY
IP-Config: Failed to open eth1
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit b7f09ae583c49d28b2796d2fa5893dcf822e3a10
Author: Miquel van Smoorenburg <mikevs at xs4all.net>
Date: Thu Jun 5 18:14:44 2008 +0200
x86, pci-dma.c: don't always add __GFP_NORETRY to gfp
Currently arch/x86/kernel/pci-dma.c always adds __GFP_NORETRY
to the allocation flags, because it wants to be reasonably
sure not to deadlock when calling alloc_pages().
But really that should only be done in two cases:
- when allocating memory in the lower 16 MB DMA zone.
If there's no free memory there, waiting or OOM killing is of no use
- when optimistically trying an allocation in the DMA32 zone
when dma_mask < DMA_32BIT_MASK hoping that the allocation
happens to fall within the limits of the dma_mask
Also blindly adding __GFP_NORETRY to the the gfp variable might
not be a good idea since we then also use it when calling
dma_ops->alloc_coherent(). Clearing it might also not be a
good idea, dma_alloc_coherent()'s caller might have set it
on purpose. The gfp variable should not be clobbered.
[ mingo at elte.hu: converted to delta patch ontop of previous version. ]
Signed-off-by: Miquel van Smoorenburg <miquels at cistron.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 16882c1e962b4be5122fc05aaf2afc10fd9e2d15
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Sun Jun 8 21:20:41 2008 +0400
sched: fix TASK_WAKEKILL vs SIGKILL race
schedule() has the special "TASK_INTERRUPTIBLE && signal_pending()" case,
this allows us to do
current->state = TASK_INTERRUPTIBLE;
schedule();
without fear to sleep with pending signal.
However, the code like
current->state = TASK_KILLABLE;
schedule();
is not right, schedule() doesn't take TASK_WAKEKILL into account. This means
that mutex_lock_killable(), wait_for_completion_killable(), down_killable(),
schedule_timeout_killable() can miss SIGKILL (and btw the second SIGKILL has
no effect).
Introduce the new helper, signal_pending_state(), and change schedule() to
use it. Hopefully it will have more users, that is why the task's state is
passed separately.
Note this "__TASK_STOPPED | __TASK_TRACED" check in signal_pending_state().
This is needed to preserve the current behaviour (ptrace_notify). I hope
this check will be removed soon, but this (afaics good) change needs the
separate discussion.
The fast path is "(state & (INTERRUPTIBLE | WAKEKILL)) + signal_pending(p)",
basically the same that schedule() does now. However, this patch of course
bloats schedule().
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 1783e60ff207805a3e75cf522b17ec9bb1604a62
Author: Julia Lawall <julia at diku.dk>
Date: Tue Jun 10 10:03:25 2008 +0200
[S390] tape_3590.c: introduce missing kfree
The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
@r exists@
expression E,E1;
statement S;
position p1,p2,p3;
@@
E =@p1 \(kmalloc\|kcalloc\|kzalloc\)(...)
... when != E = E1
if (E == NULL || ...) S
... when != E = E1
if at p2 (...) {
... when != kfree(E)
}
... when != E = E1
kfree at p3(E);
@forall@
position r.p2;
expression r.E;
int E1 != 0;
@@
* if at p2 (...) {
... when != kfree(E)
when strict
return E1; }
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit b57838ea3f860c97e4726ab93abdf83a3d079a66
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Tue Jun 10 10:03:24 2008 +0200
[S390] Fix __ctl_load/__ctl_store inline assembly constraints
__ctl_load/__ctl_store are called with either an array of unsigned long or
a single unsigned long value. Add an address operator to the "m"/"=m"
contraints to make them work for unsigned long arguments as well.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 24d3e210c18bfedafe986ec489575cf91ac39d22
Author: Segher Boessenkool <segher at kernel.crashing.org>
Date: Tue Jun 10 10:03:23 2008 +0200
[S390] Fix build failure in __cpu_up()
The first argument to __ctl_store() should be the array to store
stuff in, not just the first element of that array. With the
current code in __cpu_up(), mainline GCC dies with an internal
compiler error. I didn't diagnose that further, but just fixed
the kernel bug.
Signed-off-by: Segher Boessenkool <segher at kernel.crashing.org>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
commit 7b439d25300dc59bba76b53eb344bb9e5a1133f2
Author: Carsten Otte <cotte at de.ibm.com>
Date: Tue Jun 10 10:03:22 2008 +0200
[S390] vt220 console, initialize list head before use
This patch fixes a null pointer dereference during initialisation when no
sclp event facility is available:
sclp vt220 tty driver: could not register vt220 - sclp_register returned -5
Unable to handle kernel paging request at virtual user address 0000000000000000
Oops: 0004 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 Not tainted 2.6.26-rc3-kvm-bigiron-00968-gd939e93-dirty #30
Process swapper (pid: 0, task: 0000000000600be0, ksp: 000000000064a000)
Krnl PSW : 0400000180000000 0000000000320d8c (sclp_unregister+0x48/0x8c)
R:0 T:1 IO:0 EX:0 Key:0 M:0 W:0 P:0 AS:0 CC:0 PM:0 EA:3
Krnl GPRS: 0000000000000000 0000000000000000 0000000000630478 0700000000649c20
0000000000000000 0000000000433060 000000000064a660 0000000002e26000
00000000006db000 0000000000000000 0000000000a78578 0000000000649b80
0000000000630dc0 000000000044fa20 0000000000320d76 0000000000649b80
Krnl Code: 0000000000320d7c: e310c0080004 lg %r1,8(%r12)
0000000000320d82: b9040032 lgr %r3,%r2
0000000000320d86: c02000187b79 larl %r2,630478
>0000000000320d8c: e34010000024 stg %r4,0(%r1)
0000000000320d92: e31040080024 stg %r1,8(%r4)
0000000000320d98: c01100200200 lgfi %r1,2097664
0000000000320d9e: e310c0080024 stg %r1,8(%r12)
0000000000320da4: c01100100100 lgfi %r1,1048832
Call Trace:
([<0000000000320d76>] sclp_unregister+0x32/0x8c)
[<00000000006657b4>] __sclp_vt220_cleanup+0xc4/0xe0
[<000000000066595c>] __sclp_vt220_init+0x18c/0x1a0
[<0000000000665aba>] sclp_vt220_con_init+0x42/0x68
[<00000000006601ca>] console_init+0x4e/0x68
[<000000000064acae>] start_kernel+0x3a2/0x4dc
[<0000000000100020>] _stext+0x20/0x80
INFO: lockdep is turned off.
Last Breaking-Event-Address:
[<000000000041f964>] _spin_lock_irqsave+0xb0/0xb4
<4>---[ end trace 31fd0ba7d8756001 ]---
The issue is caused by a list_empty() check in __sclp_vt220_cleanup, which
usually fails on non-initialized list heads that contain {NULL,NULL} instead.
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 85b0d7c0ad92c47887bf6aeb424a14e7af14bd87
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date: Tue Jun 10 10:03:21 2008 +0200
[S390] cio: Fix inverted isc priorities.
Priorities for I/O interruption subclasses range from 0 (highest)
to 7 (lowest). Unfortunately, the console has been using isc 7
instead of an isc with a higher priority than regular I/O
subchannels (which use 3). Fix this by making the console use
isc 1.
Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit ee0ddadd086e25503f81be551c43f66472300acd
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Tue Jun 10 10:03:20 2008 +0200
[S390] vmemmap: fix off-by-one bug.
If a memory range is supposed to be added to the 1:1 mapping and it
ends just below the maximum supported physical address it won't
succeed. This is because a test doesn't consider that the end address
is 1 smaller than start + size.
Fix the comparison.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 12829126aa47758608578cc5be3a5adffc3d4b09
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date: Tue Jun 10 10:03:19 2008 +0200
[S390] cio: Fix sparse warnings in blacklist.c.
sparse complains about signedness:
drivers/s390/cio/blacklist.c:132:28: warning: incorrect type in
argument 2 (different signedness)
drivers/s390/cio/blacklist.c:132:28: expected unsigned int *val
drivers/s390/cio/blacklist.c:132:28: got int *cssid
drivers/s390/cio/blacklist.c:136:28: warning: incorrect type in
argument 2 (different signedness)
drivers/s390/cio/blacklist.c:136:28: expected unsigned int *val
drivers/s390/cio/blacklist.c:136:28: got int *ssid
drivers/s390/cio/blacklist.c:140:28: warning: incorrect type in
argument 2 (different signedness)
drivers/s390/cio/blacklist.c:140:28: expected unsigned int *val
drivers/s390/cio/blacklist.c:140:28: got int *devno
cssid, ssid and devno are of course unsigned, so let's make the
variables unsigned as well.
Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 148f1678f0ba7a5e79e44ff23064d4326fa145a4
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Tue Jun 10 10:03:18 2008 +0200
[S390] sparsemem: use SPARSEMEM_STATIC if !64BIT.
In case of !64BIT kernel we end up with a zero sized mem_section array.
This happens because NR_MEM_SECTIONS is smaller than SECTIONS_PER_ROOT
but we have:
#define NR_SECTION_ROOTS (NR_MEM_SECTIONS / SECTIONS_PER_ROOT)
and
struct mem_section *mem_section[NR_SECTION_ROOTS];
So fix this by selecting SPARSEMEM_STATIC which makes sure
that SECTIONS_PER_ROOT is 1.
Cc: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 5e70b7f3c24468bb1635b295945edb48ecd9656a
Author: Chris Wright <chrisw at sous-sol.org>
Date: Mon Jun 9 16:07:28 2008 -0700
MAINTAINERS: update PPPoE maintainer address
Cc: Michal Ostrowski <mostrows at earthlink.net>
Signed-off-by: Chris Wright <chrisw at sous-sol.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 30c083c3da00a052211f8f73740f2b46974454a1
Merge: 849bf20e732a71ca717a5c6f988bf3acc2a84a0c 4c0283fc561d79a4f94ab48ec37282e15273d1f8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 9 19:28:54 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/core: Remove IB_DEVICE_SEND_W_INV capability flag
IB/umem: Avoid sign problems when demoting npages to integer
commit 849bf20e732a71ca717a5c6f988bf3acc2a84a0c
Merge: d5301a0e884b0dced6e13837f00505f871e3458f 56fa18e8f1ef6b3995a4511e61103d0f9205ff4a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 9 19:28:31 2008 -0700
Merge git://git.infradead.org/users/cbou/battery-2.6.26
* git://git.infradead.org/users/cbou/battery-2.6.26:
power_supply: Fix race in power_supply_uevent
commit d5301a0e884b0dced6e13837f00505f871e3458f
Merge: cc55875e26e2b85484b196edbada6caf84eb7765 3b8458a9793a92a6ca3cb24e309f19821bf0d8e5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 9 19:27:52 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:
Blackfin serial driver: fix up tty core set_ldisc API change breakage bug
Blackfin arch: protect only the SPI bus controller with CONFIG_SPI_BFIN
Blackfin arch: fixup warnings with the new cplb saved values
Blackfin Serial Driver: Clean up BF54x macro in blackfin UART driver.
commit 2e761e0532a784816e7e822dbaaece8c5d4be14d
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Mon Jun 9 15:53:30 2008 -0700
ipv6 netns: init net is used to set bindv6only for new sock
The bindv6only is tuned via sysctl. It is already on a struct net
and per-net sysctls allow for its modification (ipv6_sysctl_net_init).
Despite this the value configured in the init net is used for the
rest of them.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1420a4faee7086b6811b4a1f0672e32b5a6df80e
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Jun 9 15:47:38 2008 -0700
irda: net/irda build fix: mcs7780
-tip testing found the following build error:
drivers/built-in.o: In function `mcs_receive_irq':
mcs7780.c:(.text+0x4e429): undefined reference to `crc32_le'
drivers/built-in.o: In function `mcs_hard_xmit':
mcs7780.c:(.text+0x4e9af): undefined reference to `crc32_le'
with:
http://redhat.com/~mingo/misc/config-Sun_Jun__8_22_56_14_CEST_2008.bad
the reason is a missing enablement of the CRC32 library in the Kconfig.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Samuel Ortiz <samuel at sortiz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1b84d9462a93ccfa99f725aad744ab4d1af8402b
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Mon Jun 9 15:41:33 2008 -0700
tg3: Update version to 3.92.1
This patch increments the version to 3.92.1.
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 5f0c4a3cb6fda7c505f8c916b54ea90205feed68
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Mon Jun 9 15:41:12 2008 -0700
tg3: Fix 5761 WOL
On 5761 non-e devices, two problems prevent the administrator from
overriding the WOL settings in the device's NVRAM.
The first problem is that GPIO 0 and GPIO 2 have been swapped. This
change prevented the administrator from turning on WOL when it is
disabled in NVRAM. The fix is to add a new path for the 5761 that
swaps the two GPIOs in the code as well.
The second problem is that GPIO 1 could not be toggled by the driver
because the GPIO is shared with the debug UART GPIO. This will prevent
the administrator from being able to turn WOL off if it was enabled in
NVRAM. The fix is to always disable the debug UART after a GRC reset.
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 0ba11fb307a4f18c11df6f5f255158ce055a2a16
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Mon Jun 9 15:40:26 2008 -0700
tg3: Fix a flags typo
This patch fixes a problem where the TG3_FLAG_10_100_ONLY flag was
testing against the wrong flags variable.
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 2bd3ed0479c35f7c8dadecf72b725ca0c20ea015
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Mon Jun 9 15:39:55 2008 -0700
tg3: Fix 5714S / 5715S / 5780S link failures
The git commit ef167e27039eeaea6d3cdd5c547b082e89840bdd entitled
"Fix supporting flowctrl code" introduced a bug that prevents 5714S,
5715S and 5780S devices from falling back to a forced link mode. The
problem is that the added flow control check will always fail if flow
control is set to autoneg and either RX or TX (or both) flow control
is enabled. The driver defaults to setting flow control to autoneg
and advertises both RX and TX flow control.
The fix is to remove the errant check.
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 56fa18e8f1ef6b3995a4511e61103d0f9205ff4a
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Sun Jun 8 19:43:42 2008 +0400
power_supply: Fix race in power_supply_uevent
Commit 54d29ad33e3483bcc7ca433a21cf294854e5154a (Power Supply: fix race
in device_create) introduced a race in power_supply_uevent. Previously it
checked that power_supply is available by checking for dev->driver_data.
But now dev->driver_data is set before power_supply->dev is initialised.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Anton Vorontsov <cbouatmailru at gmail.com>
commit b6b16196b064bbff83e8161359f8b73465d4aa36
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Sun Jun 8 13:13:06 2008 +0200
iwlwifi: fix oops in iwl3945_led_brightness_set
fix race between:
ieee80211_open->ieee80211_led_radio->led_trigger_event->led_set_brightness->iwl3945_led_brightness_set
(which assumes that "led->priv" is not NULL)
and
iwl3945_pci_probe->iwl3945_setup_deferred_work->(...)->iwl3945_bg_alive_start->iwl3945_alive_start->iwl3945_led_register->iwl3945_led_register_led
which sets priv field in struct iwl3945_led
after
led->led_dev.brightness_set = iwl3945_led_brightness_set;
(...)
led_classdev_register(device, &led->led_dev);
http://kerneloops.org/guilty.php?guilty=iwl3945_led_brightness_set&version=2.6.25-release&start=1671168&end=1703935&class=oops
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Cc: Zhu Yi <yi.zhu at intel.com>
Cc: Reinette Chatre <reinette.chatre at intel.com>
Cc: Tomas Winkler <tomas.winkler at intel.com>
Cc: linux-wireless at vger.kernel.org
Cc: ipw3945-devel at lists.sourceforge.net
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 585c5434f0e02ff0ffc567ec223af61e2d8e2e88
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu Jun 5 21:29:49 2008 +0300
include/linux/ssb/ssb_driver_gige.h typo fix
This patch fixes a typo in the name of a config variable.
Reported-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Reviewed-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit be038b376465953c358d675cb38a611898a49dc2
Author: Assaf Krauss <assaf.krauss at intel.com>
Date: Thu Jun 5 19:55:21 2008 +0300
mac80211: Checking IBSS support while changing channel in ad-hoc mode
This patch adds a check to the set_channel flow. When attempting to change
the channel while in IBSS mode, and the new channel does not support IBSS
mode, the flow return with an error value with no consequences on the
mac80211 and driver state.
Signed-off-by: Assaf Krauss <assaf.krauss 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 872ba53395b2a8be08c3ea2d39e225e5b4a8cb40
Author: Dan Williams <dcbw at redhat.com>
Date: Wed Jun 4 13:59:34 2008 -0400
mac80211: decrease IBSS creation latency
Sufficient scans (at least 2 or 3) should have been done within 7
seconds to find an existing IBSS to join. This should improve IBSS
creation latency; and since IBSS merging is still in effect, shouldn't
have detrimental effects on eventual IBSS convergence.
Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d005b1d042a1d5dcd8d898f26d8d9bb03f865284
Author: Michael Buesch <mb at bu3sch.de>
Date: Thu Jun 5 16:55:10 2008 +0200
zd1211rw: Fix data padding for QoS
This patch fixes a data alignment issue in the zd1211rw driver.
The IEEE80211_STYPE_QOS_DATA bit should be used as a bitwise test
to test for the presence of the 2 byte QoS control field.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit ad81b2f97d42e13ef78bb3798e046cd5f0492980
Author: Assaf Krauss <assaf.krauss at intel.com>
Date: Wed Jun 4 20:27:59 2008 +0300
mac80211: Fixing slow IBSS rejoin
This patch fixes the issue of slow reconnection to an IBSS cell after
disconnection from it. Now the interface's bssid is reset upon ifdown.
ieee80211_sta_find_ibss:
if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0 &&
(bss = ieee80211_rx_bss_get(dev, bssid,
local->hw.conf.channel->center_freq,
ifsta->ssid, ifsta->ssid_len)))
Note:
In general disconnection is still not handled properly in mac80211
Signed-off-by: Assaf Krauss <assaf.krauss at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit a01f5450401f081f07a866612121e780e0730cfd
Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
Date: Wed Jun 4 11:10:40 2008 +0200
libertas: fix sleep confirmation
This fixes an issus that made "iwconfig eth1 power on" non-working.
When we get a "PS sleep" event, we have to confirm this to the firmware.
The confirm happens with a command, but this command is special: the
firmware won't send us a response. if_cs_host_to_card() is setting
priv->dnld_sent anyway, so this variable stayed at DNLD_DATA_SENT and
was never cleared back.
Now I put the special knowledge that the CMD_802_11_PS_MODE with
CMD_SUBCMD_SLEEP_CONFIRMED doesn't need to need a response by directly
clearing the dnld_sent state in lbs_send_confirmsleep().
Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 507b06d0622480f8026d49a94f86068bb0fd6ed6
Author: Dan Williams <dcbw at redhat.com>
Date: Tue Jun 3 23:39:55 2008 -0400
mac80211: send association event on IBSS create
Otherwise userspace has no idea the IBSS creation succeeded.
Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit ea177305b321a4127e448b88de20d5792682ace1
Author: Dan Williams <dcbw at redhat.com>
Date: Mon Jun 2 17:51:23 2008 -0400
ipw2200: queue direct scans
When another scan is in progress, a direct scan gets dropped on the
floor. However, that direct scan is usually the scan that's really
needed by userspace, and gets stomped on by all the broadcast scans the
ipw2200 driver issues internally. Make sure the direct scan happens
eventually, and as a bonus ensure that the passive scan worker is
cleaned up when appropriate.
The change of request_passive_scan form a struct work to struct
delayed_work is only to make the set_wx_scan() code a bit simpler, it's
still only used with a delay of 0 to match previous behavior.
Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit cc55875e26e2b85484b196edbada6caf84eb7765
Merge: d563923011110a91bdbf1d89055c3e803ec01f0f 326f6a5c9c9e1a62aec37bdc0c3f8d53adabe77b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 9 11:27:55 2008 -0700
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] Fix format string bug.
commit 326f6a5c9c9e1a62aec37bdc0c3f8d53adabe77b
Author: Chris Wright <chrisw at sous-sol.org>
Date: Fri Jun 6 21:26:02 2008 -0700
[CPUFREQ] Fix format string bug.
Format string bug. Not exploitable, as this is only writable by root,
but worth fixing all the same.
Spotted-by: Ilja van Sprundel <ilja at netric.org>
Signed-off-by: Dave Jones <davej at redhat.com>
commit d563923011110a91bdbf1d89055c3e803ec01f0f
Merge: 64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b 7b1e8795ebfe1705153d1001f2a899119f4d9012
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 9 10:23:45 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] hda - Fix "alc262_sony_unsol[]" hda_verb array
commit 64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b
Merge: 53207293ba96552f67028ce54b74b4cc73c6d87a 60d5019be8acef268f4676d229c490186d338fbc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 9 10:23:29 2008 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG
[POWERPC] Make walk_memory_resource available with MEMORY_HOTPLUG=n
[POWERPC] Use dev_set_name in pci_64.c
[POWERPC] Fix incorrect enabling of VMX when building signal or user context
[POWERPC] boot/Makefile CONFIG_ variable fixes
commit 53207293ba96552f67028ce54b74b4cc73c6d87a
Merge: dfa7e20cc0d1a7a620def4dce97de1ae5375f99b e50901338b23cc173f464ff8e0179c4354d16877
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 9 10:23:03 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26:
sh: Add -mno-fdpic to default flags.
sh: add resource of USB host for SH7723
usb: r8a66597-hcd: Add support for SH7723 USB host
sh: Fix compile error SH7763 setup code
sh: Add SH7723 SCIF support
commit dfa7e20cc0d1a7a620def4dce97de1ae5375f99b
Author: Russ Anderson <rja at sgi.com>
Date: Mon Jun 9 11:18:45 2008 -0500
mm: Minor clean-up of page flags in mm/page_alloc.c
Minor source code cleanup of page flags in mm/page_alloc.c.
Move the definition of the groups of bits to page-flags.h.
The purpose of this clean up is that the next patch will
conditionally add a page flag to the groups. Doing that
in a header file is cleaner than adding #ifdefs to the
C code.
Signed-off-by: Russ Anderson <rja at sgi.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d5791d13b1d45542895104edf4b09476d5ad24b0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 9 10:06:24 2008 -0700
Fix invalid access errors in blk_lookup_devt
Commit 30f2f0eb4bd2c43d10a8b0d872c6e5ad8f31c9a0 ("block: do_mounts -
accept root=<non-existant partition>") extended blk_lookup_devt() to be
able to look up partitions that had not yet been registered, but in the
process made the assumption that the '&block_class.devices' list only
contains disk devices and that you can do 'dev_to_disk(dev)' on them.
That isn't actually true. The block_class device list also contains the
partitions we've discovered so far, and you can't just do a
'dev_to_disk()' on those.
So make sure to only work on devices that block/genhd.c has registered
itself, something we can test by checking the 'dev->type' member. This
makes the loop in blk_lookup_devt() match the other such loops in this
file.
[ We may want to do an alternate version that knows to handle _either_
whole-disk devices or partitions, but for now this is the minimal fix
for a series of crashes reported by Mariusz Kozlowski in
http://lkml.org/lkml/2008/5/25/25
and Ingo in
http://lkml.org/lkml/2008/6/9/39 ]
Reported-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Reported-by: Ingo Molnar <mingo at elte.hu>
Cc: Neil Brown <neilb at suse.de>
Cc: Joao Luis Meloni Assirati <assirati at nonada.if.usp.br>
Acked-by: Kay Sievers <kay.sievers at vrfy.org>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4c0283fc561d79a4f94ab48ec37282e15273d1f8
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon Jun 9 09:58:42 2008 -0700
IB/core: Remove IB_DEVICE_SEND_W_INV capability flag
In 2.6.26, we added some support for send with invalidate work
requests, including a device capability flag to indicate whether a
device supports such requests. However, the support was incomplete:
the completion structure was not extended with a field for the key
contained in incoming send with invalidate requests.
Full support for memory management extensions (send with invalidate,
local invalidate, fast register through a send queue, etc) is planned
for 2.6.27. Since send with invalidate is not very useful by itself,
just remove the IB_DEVICE_SEND_W_INV bit before the 2.6.26 final
release; we will add an IB_DEVICE_MEM_MGT_EXTENSIONS bit in 2.6.27,
which makes things simpler for applications, since they will not have
quite as confusing an array of fine-grained bits to check.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 7b1e8795ebfe1705153d1001f2a899119f4d9012
Author: Akio Idehara <zbe64533 at gmail.com>
Date: Mon Jun 9 22:46:07 2008 +0900
[ALSA] hda - Fix "alc262_sony_unsol[]" hda_verb array
I think that hda_verb array must have "terminator (empty array)".
But alc262_sony_unsol[] does not have it.
And it causes gcc-4.3's buggy behavior
with snd_hda_sequence_write().
Signed-off-by: Akio Idehara <zbe64533 at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 70b3ec3e523fc2370117c0eaf5be80859848f66a
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Mon Jun 9 08:53:39 2008 -0500
[POWERPC] Updated Freescale PPC defconfigs
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit a1072b2597752eafca77a664a1816faf7a43bac8
Author: Timur Tabi <timur at freescale.com>
Date: Tue May 20 15:14:18 2008 -0500
[POWERPC] 8610: Update defconfig for MPC8610 HPCD
Update the defconfig for the Freescale MPC8610 HPCD board. Enable module
support. Disable support for all NICs except for the on-board ULI526x.
Enable support for the Freescale DIU driver. Increase the maximum zone order
to 12, so that the DIU driver can allocate physically-contiguous 5MB buffers.
Enable SYSV IPC and OSS plugin support, which are needed for some OSS apps.
Signed-off-by: Timur Tabi <timur at freescale.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit ad16880daae42b4e8e078580812faa216600b05e
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Fri Jun 6 10:35:13 2008 -0500
[POWERPC] 85xx: MPC8548CDS - Fix size of PCIe IO space
Andrew Klossner pointed out the IO space size was in violation of
the alignment requirements for windows on the 85xx. The size should
have been 1M (to match u-boot).
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit c4ea896476d30514109f61f1a6e0d8e2b201e401
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Tue Jun 3 13:36:19 2008 -0500
[POWERPC] 85xx: MPC85xx MDS - Unconditionally select PHYLIB for board fixups
The MPC85xx MDS board requires some board level tweaks of the PHYs that
either the eTSEC (gianfar) or UCC ethernet controllers are connected to.
Its possible to build the phylib as a module, however this breaks the
board level fix ups because phy_read and phy_write are not available
if we build as a module.
So we unconditionally select PHYLIB to ensure its built into the kernel
if we are building in MPC85xx MDS support. This was determined to be
the easiest soultion even though it prevents the user from removing
PHYLIB support if they decide they don't want it.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit e50901338b23cc173f464ff8e0179c4354d16877
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Jun 9 16:49:43 2008 +0900
sh: Add -mno-fdpic to default flags.
Presently the --fdpic specifier and the --isa matching clash when
building with FDPIC toolchains. As we have no interest in building the
kernel with --fdpic in the first place, always try to add in -mno-fdpic
to the default flags.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit b8858eed87f1f19903ad9224f7228cbe7374ac7e
Author: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Date: Thu Jun 5 21:21:04 2008 +0900
sh: add resource of USB host for SH7723
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 77d11ba993bf1258f242b6a4ee0230aec8c6c8a4
Author: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Date: Mon Jun 9 16:00:32 2008 +0900
usb: r8a66597-hcd: Add support for SH7723 USB host
R8A66597 is similar to SH7723 USB 2.0 Host/Function module.
In addition, the USB of SH7366 is compatible with SH7723.
It can support SH7723 USB host by changing Kconfig.
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 5bde47bc63a9e8ccf9b1542498e266196b307cc2
Author: Nobuhiro Iwamatsu <iwamatsu.nobuhiro at renesas.com>
Date: Wed Jun 4 17:16:15 2008 +0900
sh: Fix compile error SH7763 setup code
SH7763's setup code use old DECLARE_INTC_DESC.
There was a compile error because of this.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro at renesas.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 576b91873fc012620fae2b33ddae3fee2fa0a4ef
Author: Yusuke.Goda <goda.yusuke at renesas.com>
Date: Wed Jun 4 19:22:59 2008 +0900
sh: Add SH7723 SCIF support
Signed-off-by: Yusuke Goda <goda.yusuke at renesas.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 60d5019be8acef268f4676d229c490186d338fbc
Author: Nathan Lynch <ntl at pobox.com>
Date: Wed Jun 4 08:31:28 2008 +1000
[POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG
Now that walk_memory_resource() is available regardless of
MEMORY_HOTPLUG's setting, this dependency is not needed.
Signed-off-by: Nathan Lynch <ntl at pobox.com>
Acked-by: Jeff Garzik <jeff at garzik.org>
Acked-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 0d5799449f0f373ca12681d86c941ae464146a37
Author: Nathan Lynch <ntl at pobox.com>
Date: Wed Jun 4 08:30:54 2008 +1000
[POWERPC] Make walk_memory_resource available with MEMORY_HOTPLUG=n
The ehea driver was recently changed[1] to use walk_memory_resource() to
detect the system's memory layout. However, walk_memory_resource() is
available only when memory hotplug is enabled. So CONFIG_EHEA was
made to depend on MEMORY_HOTPLUG [2], but it is inappropriate for a
network driver to have such a dependency.
Make the declaration of walk_memory_resource() and its powerpc
implementation (ehea is powerpc-specific) unconditionally available.
[1] 48cfb14f8b89d4d5b3df6c16f08b258686fb12ad
"ehea: Add DLPAR memory remove support"
[2] fb7b6ca2b6b7c23b52be143bdd5f55a23b9780c8
"ehea: Add dependency to Kconfig"
Signed-off-by: Nathan Lynch <ntl at pobox.com>
Acked-by: Badari Pulavarty <pbadari at us.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 420b5eeaee5b877829c4f0a514a5ad21448596af
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Tue Jun 3 13:36:11 2008 +1000
[POWERPC] Use dev_set_name in pci_64.c
During the next merge window, pci_name()'s return value will become
const, so use the new dev_set_name() instead to avoid the warning (from
linux-next):
arch/powerpc/kernel/pci_64.c: In function 'of_create_pci_dev':
arch/powerpc/kernel/pci_64.c:193: warning: passing argument 1 of 'sprintf' discards qualifiers from pointer target type
Cc: Kay Sievers <kay.sievers at vrfy.org>
Cc: Greg KH <greg at kroah.com>
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 0be234a46596cd19eb56d2cf46836de8221afb6b
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon Jun 2 16:22:59 2008 +1000
[POWERPC] Fix incorrect enabling of VMX when building signal or user context
When building a signal or a ucontext, we can incorrectly set the MSR_VEC
bit of the kernel pt_regs->msr before returning to userspace if the task
-ever- used VMX.
This can lead to funny result if that stack used it in the past, then
"lost" it (ie. it wasn't enabled after a context switch for example)
and then called get_context. It can end up with VMX enabled and the
registers containing values from some other task.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit efa58fbf19fb778a8ad2fd000a6dfa9c75263a37
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu May 22 03:38:28 2008 +1000
[POWERPC] boot/Makefile CONFIG_ variable fixes
This corrects the names of two CONFIG_ variables.
Note that the CONFIG_MPC86XADS fix uncovers another bug
(with mpc866_ads_defconfig) that will require fixing:
<-- snip -->
...
arch/powerpc/boot/dtc -O dtb -o arch/powerpc/boot/mpc866ads.dtb -b 0 /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/powerpc/boot/dts/mpc866ads.dts
DTC: dts->dtb on file "/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/powerpc/boot/dts/mpc866ads.dts"
WRAP arch/powerpc/boot/cuImage.mpc866ads
powerpc64-linux-ld: arch/powerpc/boot/cuboot-mpc866ads.o: No such file: No such file or directory
make[2]: *** [arch/powerpc/boot/cuImage.mpc866ads] Error 1
<-- snip -->
Reported-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit f751aa125d1843ea4a9a264b451fd5b1639fab20
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun Jun 8 21:43:10 2008 +0300
fat_valid_media() isn't for userspace
Commit 73f20e58b1d586e9f6d3ddc3aad872829aca7743 ("FAT_VALID_MEDIA():
remove pointless test") wrongly added the new fat_valid_media() function
to the userspace-visible part of include/linux/msdos_fs.h
Move it to the part of include/linux/msdos_fs.h that is not exported to
userspace.
Reported-by: Onur Küçük <onur at pardus.org.tr>
Reported-by: S.ÃaÄlar Onur <caglar at pardus.org.tr>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3b8458a9793a92a6ca3cb24e309f19821bf0d8e5
Author: Graf Yang <graf.yang at analog.com>
Date: Sat Jun 7 15:36:33 2008 +0800
Blackfin serial driver: fix up tty core set_ldisc API change breakage bug
This is the patch that follows Linus's modification about set_ldisc.
Graf has built and tested it on BF537 using Linus's git Tree.
Signed-off-by: Graf Yang <graf.yang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 5bda27235b24146cf870de663141ee4fbfa8a70b
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Sat Jun 7 15:03:01 2008 +0800
Blackfin arch: protect only the SPI bus controller with CONFIG_SPI_BFIN
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 8079ffa0e18baaf2940e52e0c118eef420a473a4
Author: Roland Dreier <rolandd at cisco.com>
Date: Fri Jun 6 21:38:37 2008 -0700
IB/umem: Avoid sign problems when demoting npages to integer
On a 64-bit architecture, if ib_umem_get() is called with a size value
that is so big that npages is negative when cast to int, then the
length of the page list passed to get_user_pages(), namely
min_t(int, npages, PAGE_SIZE / sizeof (struct page *))
will be negative, and get_user_pages() will immediately return 0 (at
least since 900cf086, "Be more robust about bad arguments in
get_user_pages()"). This leads to an infinite loop in ib_umem_get(),
since the code boils down to:
while (npages) {
ret = get_user_pages(...);
npages -= ret;
}
Fix this by taking the minimum as unsigned longs, so that the value of
npages is never truncated.
The impact of this bug isn't too severe, since the value of npages is
checked against RLIMIT_MEMLOCK, so a process would need to have an
astronomical limit or have CAP_IPC_LOCK to be able to trigger this,
and such a process could already cause lots of mischief. But it does
let buggy userspace code cause a kernel lock-up; for example I hit
this with code that passes a negative value into a memory registartion
function where it is promoted to a huge u64 value.
Cc: <stable at kernel.org>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 5f0e62c3e1db9acb35b750e02cddc1fcb8cfd52b
Merge: aab2545fdd6641b76af0ae96456c4ca9d1e50dad 571640cad3fda6475da45d91cf86076f1f86bd9b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 6 15:30:53 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:
ext4: enable barriers by default
jbd2: Fix barrier fallback code to re-lock the buffer head
ext4: Display the journal_async_commit mount option in /proc/mounts
jbd2: If a journal checksum error is detected, propagate the error to ext4
jbd2: Fix memory leak when verifying checksums in the journal
ext4: fix online resize bug
ext4: Fix uninit block group initialization with FLEX_BG
ext4: Fix use of uninitialized data with debug enabled.
commit 3c9155106d589584f67b026ec444e69c4a68d7dc
Author: Avi Kivity <avi at qumranet.com>
Date: Tue May 20 16:21:13 2008 +0300
KVM: MMU: Fix is_empty_shadow_page() check
The check is only looking at one of two possible empty ptes.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit aab2545fdd6641b76af0ae96456c4ca9d1e50dad
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Fri Jun 6 11:31:39 2008 -0700
uml: activate_mm: remove the dead PF_BORROWED_MM check
use_mm() was changed to use switch_mm() instead of activate_mm(), since
then nobody calls (and nobody should call) activate_mm() with
PF_BORROWED_MM bit set.
As Jeff Dike pointed out, we can also remove the "old != new" check, it is
always true.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
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 ebb0e6264c7a65c51feb3575e9edb58eab0cf469
Author: Avi Kivity <avi at qumranet.com>
Date: Tue May 20 16:21:58 2008 +0300
KVM: MMU: Fix printk() format string
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 06a1578e2448112d6f635b1a458a65e36f0f97c6
Merge: 256a13dd708004082a2de0938fd614b155c259e2 27676a3e166b352928a8ef7b1c0e322f3c471a3e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 6 11:33:30 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: Fix SM trap forwarding
IB/ehca: Reject send WRs only for RESET, INIT and RTR state
MAINTAINERS: Update NetEffect (iw_nes) entry
IB/ipath: Fix device capability flags
IB/ipath: Avoid test_bit() on u64 SDMA status value
commit 256a13dd708004082a2de0938fd614b155c259e2
Merge: 330bcd2f7bd1e2e66d54bf95adca0795b262469f 9f67fd5db50566728996b0115a08c83d4f902cb3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 6 11:33:08 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: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
commit ff4b9df877b30b8a371d706d3552999dee450738
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Thu Jun 5 00:08:11 2008 -0300
KVM: IOAPIC: only set remote_irr if interrupt was injected
There's a bug in the IOAPIC code for level-triggered interrupts. Its
relatively easy to trigger by sharing (virtio-blk + usbtablet was the
testcase, initially reported by Gerd von Egidy).
The "remote_irr" variable is used to indicate accepted but not yet acked
interrupts. Its cleared from the EOI handler.
Problem is that the EOI handler clears remote_irr unconditionally, even
if it reinjected another pending interrupt.
In that case, kvm_ioapic_set_irq() proceeds to ioapic_service() which
sets remote_irr even if it failed to inject (since the IRR was high due
to EOI reinjection).
Since the TMR bit has been cleared by the first EOI, the second one
fails to clear remote_irr.
End result is interrupt line dead.
Fix it by setting remote_irr only if a new pending interrupt has been
generated (and the TMR bit for vector in question set).
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 330bcd2f7bd1e2e66d54bf95adca0795b262469f
Merge: 156a9ea43acb609ac89d48dbb9f0d05ee903a12e 868e15dbd2940f9453b4399117686f408dc77299
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 6 11:32:37 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:
sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card
commit 8d2d73b9a5c35f2c6abf427afba7888cfc4cc65d
Author: Avi Kivity <avi at qumranet.com>
Date: Wed Jun 4 18:42:24 2008 +0300
KVM: MMU: reschedule during shadow teardown
Shadows for large guests can take a long time to tear down, so reschedule
occasionally to avoid softlockup warnings.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 156a9ea43acb609ac89d48dbb9f0d05ee903a12e
Merge: c8d10bffdbea5f82a8e491467a23fb2cc7da921b ca05a99a54db1db5bca72eccb5866d2a86f8517f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 6 11:31:55 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6:
capabilities: remain source compatible with 32-bit raw legacy capability support.
LSM: remove stale web site from MAINTAINERS
commit c8d10bffdbea5f82a8e491467a23fb2cc7da921b
Merge: eb4e545d4ac82d9018487edb4419b33b9930c857 bc01886352c277e310c07befadbb617c8f561b89
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Jun 6 11:31:18 2008 -0700
Merge git://git.infradead.org/~dwmw2/mtd-2.6.26
* git://git.infradead.org/~dwmw2/mtd-2.6.26:
[MTD] m25p80.c mutex unlock fix
commit eb4e545d4ac82d9018487edb4419b33b9930c857
Author: David Sterba <dsterba at suse.cz>
Date: Fri Jun 6 10:56:35 2008 +0200
ipwireless: Fix blocked sending
Packet sending is driven by two flags, tx_ready and tx_queued.
It was possible, that there were queued data for sending and
hardware was flagged as blocked but in fact it was not.
The tx_queued was indicator but should be really a counter else
first fragmented packet resets tx_queued flag, but there may be
pending packets which do not get sent.
New semantics:
tx_ready - set, if hw is ready to send packet, no packet is being
transferred right now
set the flag right at the place where data are copied
into hw memory and not earlier without checking if it
was succesful
tx_queued - count of enqueued packets, including fragments
Tested-by: Michal Rokos <michal.rokos at gmail.com>
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e693d71b46e64536581bf4884434fc1b8797e96f
Author: Eli Collins <ecollins at vmware.com>
Date: Sun Jun 1 20:24:40 2008 -0700
KVM: VMX: Clear CR4.VMXE in hardware_disable
Clear CR4.VMXE in hardware_disable. There's no reason to leave it set
after doing a VMXOFF.
VMware Workstation 6.5 checks CR4.VMXE as a proxy for whether the CPU is
in VMX mode, so leaving VMXE set means we'll refuse to power on. With this
change the user can power on after unloading the kvm-intel module. I
tested on kvm-67 and kvm-69.
Signed-off-by: Eli Collins <ecollins at vmware.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 979b0fea2d9ae5d57237a368d571cbc84655fba6
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Jun 5 22:47:00 2008 -0700
vm: add kzalloc_node() inline
To get zeroed out memory from a particular NUMA node. To be used by
sunrpc.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Cc: Christoph Lameter <clameter at sgi.com>
Cc: 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 ef421be741a3e56cb89088a7dd4f73cc38739d1b
Author: Thomas Tuttle <ttuttle at google.com>
Date: Thu Jun 5 22:46:59 2008 -0700
pagemap: add documentation for pagemap
Just a quick explanation of the pagemap interface from a userspace point
of view, and an example of how to use it (in English, not code).
Signed-off-by: Thomas Tuttle <ttuttle at google.com>
Cc: 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 4710d1ac4c491dd8a28f57946214c0b5fe73cc87
Author: Thomas Tuttle <ttuttle at google.com>
Date: Thu Jun 5 22:46:58 2008 -0700
pagemap: return EINVAL, not EIO, for unaligned reads of kpagecount or kpageflags
If the user tries to read from a position that is not a multiple of 8, or
read a number of bytes that is not a multiple of 8, they have passed an
invalid argument to read, for the purpose of reading these files. It's
not an IO error because we didn't encounter any trouble finding the data
they asked for.
Signed-off-by: Thomas Tuttle <ttuttle at google.com>
Cc: 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 bbcdac0c20aa20d1daad41d9c138102b70e5aae4
Author: Thomas Tuttle <ttuttle at google.com>
Date: Thu Jun 5 22:46:58 2008 -0700
pagemap: return map count, not reference count, in /proc/kpagecount
Since pagemap is all about examining pages mapped into processes' memory
spaces, it makes sense for kpagecount to return the map counts, not the
reference counts.
Signed-off-by: Thomas Tuttle <ttuttle at google.com>
Cc: 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 a4fa7ef037b17f2a3b9b393cb924e571fc04e784
Author: Tim Gardner <tim.gardner at canonical.com>
Date: Thu Jun 5 22:46:55 2008 -0700
hdaps: fix module loading on Thinkpad T61P
Adds DMI system identifier for ThinkPad T61.
Originally written by Klaus S. Madsen.
Taken from http://launchpadlibrarian.net/10864950/hdaps-t61.patch
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
Signed-off-by: maximilian attems <max at stro.at>
Cc: Klaus S. Madsen <ubuntu at hjernemadsen.org>
Cc: Mark M. Hoffman <mhoffman at lightlink.com>
Cc: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aed5417593ad125283f35513573282139a8664b5
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Thu Jun 5 22:46:53 2008 -0700
proc: calculate the correct /proc/<pid> link count
This patch:
commit e9720acd728a46cb40daa52c99a979f7c4ff195c
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Fri Mar 7 11:08:40 2008 -0800
[NET]: Make /proc/net a symlink on /proc/self/net (v3)
introduced a /proc/self/net directory without bumping the corresponding
link count for /proc/self.
This patch replaces the static link count initializations with a call that
counts the number of directory entries in the given pid_entry table
whenever it is instantiated, and thus relieves the burden of manually
keeping the two in sync.
[akpm at linux-foundation.org: cleanup]
Acked-by: Eric W. Biederman <ebiederm at xmission.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Vegard Nossum <vegard.nossum at gmail.com>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
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 aabe188565124ee2ed060a072764d6ed34dfa4ed
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Thu Jun 5 22:46:50 2008 -0700
rtc: class driver for ppc_md RTC functions
This hooks up the platform-specific [gs]et_rtc_time functions so that
kernels using CONFIG_RTC_CLASS have RTC support on most PowerPC platforms.
A new driver, and one which we've been shipping in Fedora for a while
already, since otherwise RTC support breaks.
[akpm at linux-foundation.org: fix Kconfig indenting]
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
Acked-by: Alessandro Zummo <a.zummo at towertech.it>
Acked-by: David Brownell <david-b at pacbell.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 ec0ced156f930aba24e7527905de294ad929ef65
Author: Adrian Bunk <adrian.bunk at movial.fi>
Date: Thu Jun 5 22:46:48 2008 -0700
asm-m32r/uaccess.h must #include <asm/setup.h>
This patch fixes the following compile error caused by
commit 4016a1390d07f15b267eecb20e76a48fd5c524ef
(mm/nommu.c: return 0 from kobjsize with invalid objects):
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c: In function 'kobjsize':
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c:112: error: 'memory_end' undeclared (first use in this function)
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c:112: error: (Each undeclared identifier is reported only once
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/nommu.c:112: error: for each function it appears in.)
The patch also removes now no longer required memory_{start,end}
declarations inside access_ok().
Reported-by: Adrian Bunk <adrian.bunk at movial.fi>
Signed-off-by: Adrian Bunk <adrian.bunk at movial.fi>
Cc: Hirokazu Takata <takata at linux-m32r.org>
Cc: Michael Hennerich <Michael.Hennerich at analog.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9bb91784de6618c955994b2d5be332fb68c87ef1
Author: Josef Bacik <jbacik at redhat.com>
Date: Thu Jun 5 22:46:47 2008 -0700
ext3: fix online resize bug
There is a bug when we are trying to verify that the reserve inode's
double indirect blocks point back to the primary gdt blocks. The fix is
obvious, we need to mod the gdb count by the addr's per block. You can
verify this with the following test case
dd if=/dev/zero of=disk1 seek=1024 count=1 bs=100M
losetup /dev/loop1 disk1
pvcreate /dev/loop1
vgcreate loopvg1 /dev/loop1
lvcreate -l 100%VG loopvg1 -n looplv1
mkfs.ext3 -J size=64 -b 1024 /dev/loopvg1/looplv1
mount /dev/loopvg1/looplv1 /mnt/loop
dd if=/dev/zero of=disk2 seek=1024 count=1 bs=50M
losetup /dev/loop2 disk2
pvcreate /dev/loop2
vgextend loopvg1 /dev/loop2
lvextend -l 100%VG /dev/loopvg1/looplv1
resize2fs /dev/loopvg1/looplv1
without this patch the resize2fs fails, with it the resize2fs succeeds.
Signed-off-by: Josef Bacik <jbacik at redhat.com>
Acked-by: Andreas Dilger <adilger at sun.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 d100d148aa48df3b6ad526a48624f906695efe60
Author: Pekka Enberg <penberg at cs.helsinki.fi>
Date: Thu Jun 5 22:46:46 2008 -0700
nommu: fix ksize() abuse
The nommu binfmt code uses ksize() for pointers returned from do_mmap()
which is wrong. This converts the call-sites to use the nommu specific
kobjsize() function which works as expected.
Cc: Christoph Lameter <clameter at sgi.com>
Cc: Matt Mackall <mpm at selenic.com>
Acked-by: Paul Mundt <lethal at linux-sh.org>
Acked-by: David Howells <dhowells at redhat.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
Acked-by: Greg Ungerer <gerg at snapgear.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0842b245a8e6c14e3aa49f91018902591d1069b3
Author: Paul Jackson <pj at sgi.com>
Date: Thu Jun 5 22:46:45 2008 -0700
doc: document the kernel-doc conventions for kernel hackers
Provide documentation of the kernel-doc documentation conventions oriented
to kernel hackers.
Since I figure that there will be more people reading this
kernel-doc-nano-HOWTO.txt file who are kernel developers focused on the
rest of the kernel, than there will be readers of this file who are
documentation developers extracting that embedded kernel-doc
documentation, I have taken the liberty of making the new section added
here:
How to format kernel-doc comments
the first section of the kernel-doc-nano-HOWTO.txt file.
This first section is intended to introduce, motivate and provide basic
usage of the kernel-doc mechanism for kernel hackers developing other
portions of the kernel.
Signed-off-by: Paul Jackson <pj at sgi.com>
Acked-by: Randy Dunlap <rdunlap at xenotime.net>
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 659179b28f15ab1b1db5f8767090f5e728f115a1
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date: Thu Jun 5 22:46:44 2008 -0700
fbdev: export symbol fb_mode_option
Frame buffer and mode setting drivers can be built as modules,
so fb_mode_option needs to be exported to support these.
Prevents this error:
ERROR: "fb_mode_option" [drivers/ps3/ps3av_mod.ko] undefined!
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Cc: Krzysztof Helt <krzysztof.h1 at poczta.fm>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1502cb361666808acb1dfd92238fc2b7a7a48221
Author: Alan Cox <alan at redhat.com>
Date: Thu Jun 5 22:46:42 2008 -0700
MAINTAINERS: reiserfs entry is out of date
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Edward Shishkin <edward.shishkin at gmail.com>
Cc: Jeff Mahoney <jeffm at suse.com>
Cc: Chris Mason <chris.mason at oracle.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 4fd5a433d4887f0a6c766c258ca335100ffe208a
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Thu Jun 5 22:46:42 2008 -0700
v850: fix typo in header guard
Signed-off-by: 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 3b2d38b48b5abb6921ac6ad2d080ce82887cdbc7
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Thu Jun 5 22:46:41 2008 -0700
h8300: fix typo in header guard
Signed-off-by: Vegard Nossum <vegard.nossum at gmail.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 9c81c5c95c00c35a328e1757ca45a66647105f6c
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Thu Jun 5 22:46:39 2008 -0700
atmel_serial: filter out FP during baud rate detection
I made a change to u-boot that used the FP (Fractional Part) field of BRGR
to achieve more accurate baud rate generation. Unfortunately, the
atmel_serial driver looks at the whole BRGR register when trying to detect
the baud rate that the port is currently running at, so setting FP to a
nonzero value breaks the baud rate detection.
I'll sit on the u-boot patch for a while longer, but this is clearly a
bug in the atmel_serial driver which should be fixed.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Acked-by: Andrew Victor <linux at maxim.org.za>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 81c6ce9bd3ed3a88caeb9ed97d874450d53339dc
Author: Nick Piggin <npiggin at suse.de>
Date: Thu Jun 5 22:46:38 2008 -0700
vt: fix vc_resize locking
Lockdep says we can't take tasklist lock or sighand lock inside ctrl_lock.
Signed-off-by: Nick Piggin <npiggin at suse.de>
Acked-by: Alan Cox <alan at redhat.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
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 dfcceb26f89da86ec4ac9583c4515504af8c6c84
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Thu Jun 5 22:46:38 2008 -0700
ipc: only output msgmni value at boot time
When posting:
[PATCH 1/8] Scaling msgmni to the amount of lowmem
(see http://lkml.org/lkml/2008/2/11/171), I have added a KERN_INFO message
that is output each time msgmni is recomputed.
In http://lkml.org/lkml/2008/4/29/575 Tony Luck complained that this
message references an ipc namespace address that is useless.
I first thought of using an audit_log instead of a printk, as suggested by
Serge Hallyn. But unfortunately, we do not have any other information
than the namespace address to provide here too. So I chose to move the
message and output it only at boot time, removing the reference to the
namespace.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Pierre Peiffer <peifferp at gmail.com>
Cc: Manfred Spraul <manfred at colorfullife.com>
Acked-by: Tony Luck <tony.luck at intel.com>
Cc: "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 68aa0a206a7a2dd8655a50b36e8274eb87b84544
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date: Thu Jun 5 22:46:36 2008 -0700
ipc: restore MSGPOOL original value
When posting:
[PATCH 1/8] Scaling msgmni to the amount of lowmem
(see http://article.gmane.org/gmane.linux.kernel/637849/) I changed the
MSGPOOL value to make it fit what is said in the man pages (i.e. a size
in bytes).
But Michael Kerrisk rightly complained that this change could affect the
ABI. So I'm posting this patch to make MSGPOOL expressed back in Kbytes.
Michael, on his side, has fixed the man page.
Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Pierre Peiffer <peifferp at gmail.com>
Cc: Manfred Spraul <manfred at colorfullife.com>
Acked-by: Michael Kerrisk <mtk.manpages at googlemail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 774533b3e86fa52941c79aa80ab3f0cc511bba7f
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Thu Jun 5 22:46:34 2008 -0700
vt: fix background color on line feed, DEC invert
Original report: """I used to force my console to black-on-white by the
command `setterm -inversescreen on`. In 2.6.26-rc4, I get lots of black
background characters."""
Another addendum to commit c9e587ab. This was previously missed out since
I was not aware of what vc_decscnm was for.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
Reported-by: <thunder7 at xs4all.nl>
Tested-by: <thunder7 at xs4all.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 879000f94442860e72c934f9e568989bc7fb8ec4
Author: CHIKAMA masaki <masaki.chikama at gmail.com>
Date: Thu Jun 5 22:46:33 2008 -0700
cpufreq: fix null object access on Transmeta CPU
If cpu specific cpufreq driver(i.e. longrun) has "setpolicy" function,
governor object isn't set into cpufreq_policy object at "__cpufreq_set_policy"
function in driver/cpufreq/cpufreq.c .
This causes a null object access at "store_scaling_setspeed" and
"show_scaling_setspeed" function in driver/cpufreq/cpufreq.c when reading or
writing through /sys interface (ex. cat
/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed)
Addresses:
http://bugzilla.kernel.org/show_bug.cgi?id=10654
https://bugzilla.redhat.com/show_bug.cgi?id=443354
Signed-off-by: CHIKAMA Masaki <masaki.chikama at gmail.com>
Cc: Dave Jones <davej at codemonkey.org.uk>
Cc: Chuck Ebbert <cebbert at redhat.com>
Acked-by: Dominik Brodowski <linux at dominikbrodowski.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 10732c35dff6c2e15e413e7806a7114a2faa0ecf
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Thu Jun 5 22:46:33 2008 -0700
fbcon: fix wrong vmode bits copied on console switch
The interlaced and double line mode bits should not be copied to new
console when the console is switched. Otherwise, the new console may be
set to incorrect refresh rate.
Also, the x and y offsets does not need to be copied.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dba6a4d32d8677c99e73798d3375417f8a6d46de
Author: Daniel Walker <dwalker at mvista.com>
Date: Thu Jun 5 22:46:32 2008 -0700
keys: remove unused key_alloc_sem
This semaphore doesn't appear to be used, so remove it.
Signed-off-by: Daniel Walker <dwalker at mvista.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 37340746a66e5e7feed5945f28cb75d90a8fd9f6
Author: Lai Jiangshan <laijs at cn.fujitsu.com>
Date: Thu Jun 5 22:46:32 2008 -0700
cpusets: fix bug when adding nonexistent cpu or mem
Adding a nonexistent cpu to a cpuset will be omitted quietly. It should
return -EINVAL.
Example: (real_nr_cpus <= 4 < NR_CPUS or cpu#4 was just offline)
# cat cpus
0-1
# /bin/echo 4 > cpus
# /bin/echo $?
0
# cat cpus
#
The same occurs when add a nonexistent mem.
This patch will fix this bug.
And when *buf == "", the check is unneeded.
Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
Acked-by: Paul Jackson <pj at sgi.com>
Cc: 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 aae8679b0ebcaa92f99c1c3cb0cd651594a43915
Author: Thomas Tuttle <ttuttle at google.com>
Date: Thu Jun 5 22:46:31 2008 -0700
pagemap: fix bug in add_to_pagemap, require aligned-length reads of /proc/pid/pagemap
Fix a bug in add_to_pagemap. Previously, since pm->out was a char *,
put_user was only copying 1 byte of every PFN, resulting in the top 7
bytes of each PFN not being copied. By requiring that reads be a multiple
of 8 bytes, I can make pm->out and pm->end u64*s instead of char*s, which
makes put_user work properly, and also simplifies the logic in
add_to_pagemap a bit.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Thomas Tuttle <ttuttle at google.com>
Cc: Matt Mackall <mpm at selenic.com>
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 d1ee2971f5bd8a16bc5ecfe1b00e14b4fe407c4f
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu Jun 5 22:46:28 2008 -0700
devscgroup: make white list more compact in some cases
Consider you added a 'c foo:bar r' permission to some cgroup and then (a
bit later) 'c'foo:bar w' for it. After this you'll see the
c foo:bar r
c foo:bar w
lines in a devices.list file.
Another example - consider you added 10 'c foo:bar r' permissions to some
cgroup (e.g. by mistake). After this you'll see 10 c foo:bar r lines in
a list file.
This is weird. This situation also has one more annoying consequence.
Having many items in a white list makes permissions checking slower, sine
it has to walk a longer list.
The proposal is to merge permissions for items, that correspond to the
same device.
Signed-off-by: Pavel Emelyanov <xemul at openvz.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 7db9cfd380205f6b50afdc3bc3619f876a5eaf0d
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu Jun 5 22:46:27 2008 -0700
devscgroup: check for device permissions at mount time
Currently even if a task sits in an all-denied cgroup it can still mount
any block device in any mode it wants.
Put a proper check in do_open for block device to prevent this.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Tested-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 cc9cb219aac24ffc711566c8f372c2b3a3bf840f
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu Jun 5 22:46:26 2008 -0700
devscgroup: relax task to dev_cgroup conversion
Two functions, that need to get a device_cgroup from a task (they are
devcgroup_inode_permission and devcgroup_inode_mknod) make it in a strange
way:
They get a css_set from task, then a subsys_state from css_set, then a
cgroup from the state and then a subsys_state again from the cgroup.
Besides, the devices_subsys_id is read from memory, whilst there's a
enum-ed constant for it.
Optimize this part a bit:
1. Get the subsys_stats form the task and be done - no 2 extra
dereferences,
2. Use the device_subsys_id constant, not the value from memory
(i.e. one less dereference).
Found while preparing 2.6.26 OpenVZ port.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Acked-by: Paul Menage <menage at google.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: James Morris <jmorris at namei.org>
Cc: Chris Wright <chrisw at sous-sol.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 b66862f7663332aa1ecb3ebda4086360ddb8befc
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu Jun 5 22:46:24 2008 -0700
devcgroup: make a helper to convert cgroup_subsys_state to devs_cgroup
This is just picking the container_of out of cgroup_to_devcgroup into a
separate function.
This new css_to_devcgroup will be used in the 2nd patch.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: Serge Hallyn <serue at us.ibm.com>
Cc: Paul Menage <menage at google.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: James Morris <jmorris at namei.org>
Cc: Chris Wright <chrisw at sous-sol.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 93b071139a956e51c98cdefd50a47981a4eb852e
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date: Thu Jun 5 22:46:21 2008 -0700
introduce memory_read_from_buffer()
This patch introduces memory_read_from_buffer().
The only difference between memory_read_from_buffer() and
simple_read_from_buffer() is which address space the function copies to.
simple_read_from_buffer copies to user space memory.
memory_read_from_buffer copies to normal memory.
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Cc: Doug Warzecha <Douglas_Warzecha at dell.com>
Cc: Zhang Rui <rui.zhang at intel.com>
Cc: Matt Domsch <Matt_Domsch at dell.com>
Cc: Abhay Salunke <Abhay_Salunke at dell.com>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Cc: Markus Rechberger <markus.rechberger at amd.com>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Cc: Bob Moore <robert.moore at intel.com>
Cc: Thomas Renninger <trenn at suse.de>
Cc: Len Brown <lenb at kernel.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Krzysztof Helt <krzysztof.h1 at poczta.fm>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Peter Oberparleiter <peter.oberparleiter at de.ibm.com>
Cc: Michael Holzheu <holzheu at de.ibm.com>
Cc: Brian King <brking at us.ibm.com>
Cc: James E.J. Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Andrew Vasquez <linux-driver at qlogic.com>
Cc: Seokmann Ju <seokmann.ju at qlogic.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3527fb326f07bc8e85cf66d4f987ebeea24e8e4a
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu Jun 5 22:46:19 2008 -0700
lib: export bitrev16
Bluetooth will be able to use this.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Marcel Holtmann <marcel at holtmann.org>
Cc: Dave Young <hidave.darkstar at gmail.com>
Cc: 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 f2eb432715a81a703e626df59347ba3557009557
Author: Jean Delvare <khali at linux-fr.org>
Date: Thu Jun 5 22:46:18 2008 -0700
rtc-ds1374: rename device to just "ds1374"
Change the name of the device from "rtc-ds1374" to just "ds1374", to match
what all other RTC drivers do. I seem to remember that this name was
chosen to avoid possible confusion with an older ds1374 driver, but that
driver was removed 3 months ago.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Alessandro Zummo <a.zummo at towertech.it>
Acked-by: Kumar Gala <galak at kernel.crashing.org>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.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 44d1b980c72db0faf35adb082fb2208351803028
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Thu Jun 5 22:46:18 2008 -0700
Fix various old email addresses for dwmw2
Although if people have questions about ARCnet, perhaps it's _better_
for them to be mailing dwmw2 at cam.ac.uk about it...
Signed-off-by: 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 b6d8adf477439e7086224bc9674c6b6638780783
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu Jun 5 22:46:14 2008 -0700
uml: PATH_MAX needs limits.h
Include limits.h to get a definition of PATH_MAX.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Jeff Dike <jdike 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 3d5ede6f776bdb1483bcd086f79c3bf41fed3865
Author: Jeff Dike <jdike at addtoit.com>
Date: Thu Jun 5 22:46:13 2008 -0700
uml: stub needs to tolerate SIGWINCH
We lost the marking of SIGWINCH as being OK to receive during stub
execution, causing a panic should that happen.
Cc: Benedict Verheyen <benedict.verheyen at gmail.com>
Signed-off-by: Jeff Dike <jdike 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 8bfd04b974689f700bbd053ad6e66b0a95fb80c9
Author: Jeff Dike <jdike at addtoit.com>
Date: Thu Jun 5 22:46:13 2008 -0700
uml: memcpy export needs to follow host declaration
x86_64 defines either memcpy or __memcpy depending on the gcc version, and
it looks like UML needs to follow that in its exporting.
Cc: Gabriel C <nix.or.die at googlemail.com>
Signed-off-by: Jeff Dike <jdike 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 40fb16a360d9c6459afee91dc793c1e3374feb94
Author: Tom Spink <tspink at gmail.com>
Date: Thu Jun 5 22:46:12 2008 -0700
uml: deal with inaccessible address space start
This patch makes os_get_task_size locate the bottom of the address space,
as well as the top. This is for systems which put a lower limit on mmap
addresses. It works by manually scanning pages from zero onwards until a
valid page is found.
Because the bottom of the address space may not be zero, it's not
sufficient to assume the top of the address space is the size of the
address space. The size is the difference between the top address and
bottom address.
[jdike at addtoit.com: changed the name to reflect that this function is
supposed to return the top of the process address space, not its size and
changed the return value to reflect that. Also some minor formatting
changes]
Signed-off-by: Tom Spink <tspink at gmail.com>
Signed-off-by: Jeff Dike <jdike 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 9f31287b443f30a591539e448fb628e3827a8f61
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Thu Jun 5 22:46:11 2008 -0700
uml: remove a duplicate include
Removed duplicated include file "kern_util.h" in
arch/um/drivers/ubd_kern.c.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Jeff Dike <jdike 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 06e1e4ffbd1932e288839b3140cda6b8141eb684
Author: Jeff Dike <jdike at addtoit.com>
Date: Thu Jun 5 22:46:10 2008 -0700
uml: deal with host time going backwards
Protection against the host's time going backwards (eg, ntp activity on
the host) by keeping track of the time at the last tick and if it's
greater than the current time, keep time stopped until the host catches
up.
Cc: Nix <nix at esperi.org.uk>
Signed-off-by: Jeff Dike <jdike 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 34397892a3d677d857fdaf8dec66a66b07dde0b5
Author: Paul Jackson <pj at sgi.com>
Date: Thu Jun 5 22:46:09 2008 -0700
doc: update to URL and status of kernel-docs.txt entry
Update status and URL for the "Gary's Encyclopedia" entry.
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 a361a82c10c20eff402d72ce83b66913d04894ee
Author: Dan Williams <dcbw at redhat.com>
Date: Thu Jun 5 22:46:08 2008 -0700
fujitsu-laptop: autoload module on Lifebook P1510D
Signed-off-by: Dan Williams <dcbw at redhat.com>
Cc: Jonathan Woithe <jwoithe at physics.adelaide.edu.au>
Cc: Len Brown <len.brown at intel.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 6cfd53fc03670c7a544a56d441eb1a6cc800d72b
Author: Paul Mundt <lethal at linux-sh.org>
Date: Thu Jun 5 22:46:08 2008 -0700
nommu: fix kobjsize() for SLOB and SLUB
kobjsize() has been abusing page->index as a method for sorting out
compound order, which blows up both for page cache pages, and SLOB's
reuse of the index in struct slob_page.
Presently we are not able to accurately size arbitrary pointers that
don't come from kmalloc(), so the best we can do is sort out the
compound order from the head page if it's a compound page, or default
to 0-order if it's impossible to ksize() the object.
Obviously this leaves quite a bit to be desired in terms of object
sizing accuracy, but the behaviour is unchanged over the existing
implementation, while fixing the page->index oopses originally reported
here:
http://marc.info/?l=linux-mm&m=121127773325245&w=2
Accuracy could also be improved by having SLUB and SLOB both set PG_slab
on ksizeable pages, rather than just handling the __GFP_COMP cases
irregardless of the PG_slab setting, as made possibly with Pekka's
patches:
http://marc.info/?l=linux-kernel&m=121139439900534&w=2
http://marc.info/?l=linux-kernel&m=121139440000537&w=2
http://marc.info/?l=linux-kernel&m=121139440000540&w=2
This is primarily a bugfix for nommu systems for 2.6.26, with the aim
being to gradually kill off kobjsize() and its particular brand of
object abuse entirely.
Reviewed-by: Pekka Enberg <penberg at cs.helsinki.fi>
Signed-off-by: Paul Mundt <lethal at linux-sh.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 6f09bdfc717a0e1a89a029001484d5a195faab64
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Thu Jun 5 22:46:07 2008 -0700
m68k: enable CONFIG_COMPAT_BRK by default
As some m68k machines have plenty of libc5 binaries in active use, enable
CONFIG_COMPAT_BRK by default.
Signed-off-by: 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 a5b4592cf77b973c29e7c9695873a26052b58951
Author: Jiri Kosina <jkosina at suse.cz>
Date: Thu Jun 5 22:46:05 2008 -0700
brk: make sys_brk() honor COMPAT_BRK when computing lower bound
Fix a regression introduced by
commit 4cc6028d4040f95cdb590a87db478b42b8be0508
Author: Jiri Kosina <jkosina at suse.cz>
Date: Wed Feb 6 22:39:44 2008 +0100
brk: check the lower bound properly
The check in sys_brk() on minimum value the brk might have must take
CONFIG_COMPAT_BRK setting into account. When this option is turned on
(i.e. we support ancient legacy binaries, e.g. libc5-linked stuff), the
lower bound on brk value is mm->end_code, otherwise the brk start is
allowed to be arbitrarily shifted.
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Tested-by: Geert Uytterhoeven <geert at linux-m68k.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 33dda515a1995dfb3b6b57d7ace9b3ee9d449c11
Author: Roland.Kletzing <devzero at web.de>
Date: Thu Jun 5 22:46:04 2008 -0700
drivers/char/ip2: fix Kconfig after ip2/ip2main merge
As commit 6089093e588ee3f6aed99d08b1cf5ea37c52cf97 ("ip2: fix crashes on
load/unload") fixed the ip2 crashes on load/unload by making ip2/ip2main
one module (ip2), Kconfig shouldn't mention a now non-existing module.
Signed-off-by: Roland.Kletzing <devzero at web.de>
Acked-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 f6266e34713dc286b52623d8a4ff846973c0bcce
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Thu Jun 5 22:46:03 2008 -0700
edd: fix incorrect return of 1 from module_init
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.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 d3e49afbb66109613c3474f2273f5830ac2dcb09
Author: Michael Halcrow <mhalcrow at us.ibm.com>
Date: Thu Jun 5 22:46:02 2008 -0700
eCryptfs: remove unnecessary page decrypt call
The page decrypt calls in ecryptfs_write() are both pointless and buggy.
Pointless because ecryptfs_get_locked_page() has already brought the page
up to date, and buggy because prior mmap writes will just be blown away by
the decrypt call.
This patch also removes the declaration of a now-nonexistent function
ecryptfs_write_zeros().
Thanks to Eric Sandeen and David Kleikamp for helping to track this
down.
Eric said:
fsx w/ mmap dies quickly ( < 100 ops) without this, and survives
nicely (to millions of ops+) with it in place.
Signed-off-by: Michael Halcrow <mhalcrow at us.ibm.com>
Cc: Eric Sandeen <sandeen at redhat.com>
Cc: Dave Kleikamp <shaggy at austin.ibm.com>
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 c45dcabd2626c56f8c1235df9db065f584f3ac82
Author: Andy Whitcroft <apw at shadowen.org>
Date: Thu Jun 5 22:46:01 2008 -0700
update checkpatch.pl to version 0.19
This version is a bit of a whopper. This version brings a few new checks,
improvements to a number of checks mostly through modifications to the
way types are parsed, several fixes to quote/comment handling, as well as
the usual slew of fixes for false positives.
Of note:
- return is not a function and is now reported,
- preprocessor directive detection is loosened to match C99 standard,
- we now intuit new type modifiers, and
- comment handling is much improved
Andy Whitcroft (18):
Version: 0.19
fix up a couple of missing newlines in reports
colon to parenthesis spacing varies on asm
values: #include is a preprocessor statement
quotes: fix single character quotes at line end
add typedef exception for the non-pointer "function types"
kerneldoc parameters must be on one line, relax line length
types: word boundary is not always required
improved #define bracketing reports
uninitialized_var is an annotation not a function name
possible types: add possible modifier handling
possible types: fastcall is a type modifier
types: unsigned is not a modifier on all types
static/external initialisation to zero should allow modifiers
checkpatch: fix recognition of preprocessor directives -- part 2
comments: fix inter-hunk comment tracking
return is not a function
do not report include/asm/foo.h use in include/linux/foo.h
return is not a function -- tighten test
[jengelh at computergmbh.de: fix recognition of preprocessor directives]
Signed-off-by: Andy Whitcroft <apw at shadowen.org>
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 4feead71fa68a41db1d4f065c0f91fd67288877d
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Jun 5 22:45:58 2008 -0700
serial: fix driver_name conflicts
Some drivers are using too generic "serial" name for driver_name, this
might cause issues, like this:
Freescale QUICC Engine UART device driver
proc_dir_entry 'serial' already registered
Call Trace:
[cf82de50] [c0007f7c] show_stack+0x4c/0x1ac (unreliable)
[cf82de90] [c00b03fc] proc_register+0xfc/0x1ac
[cf82dec0] [c00b05c8] create_proc_entry+0x60/0xac
[cf82dee0] [c00b23dc] proc_tty_register_driver+0x60/0x98
[cf82def0] [c016dbd8] tty_register_driver+0x1b4/0x228
[cf82df20] [c0184d70] uart_register_driver+0x144/0x194
[cf82df40] [c030a378] ucc_uart_init+0x2c/0x94
[cf82df50] [c02f21a0] kernel_init+0x98/0x27c
[cf82dff0] [c000fa74] kernel_thread+0x44/0x60
^^ The board is using ucc_uart.c and 8250.c, both registered as
"serial".
This patch fixes two drivers that are using "serial" for driver_name and
not "ttyS" for dev_name. Drivers that are using "ttyS" for dev_name, will
conflict anyway, so we don't bother with these.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Acked-by: Alan Cox <alan at redhat.com>
Acked-By: Timur Tabi <timur at freescale.com>
Acked-by: Maciej W. Rozycki <macro 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 4647875819aa210115d926242aa18e034517cece
Author: Nick Piggin <npiggin at suse.de>
Date: Thu Jun 5 22:45:57 2008 -0700
hugetlb: fix lockdep error
=============================================
[ INFO: possible recursive locking detected ]
2.6.26-rc4 #30
---------------------------------------------
heap-overflow/2250 is trying to acquire lock:
(&mm->page_table_lock){--..}, at: [<c0000000000cf2e8>] .copy_hugetlb_page_range+0x108/0x280
but task is already holding lock:
(&mm->page_table_lock){--..}, at: [<c0000000000cf2dc>] .copy_hugetlb_page_range+0xfc/0x280
other info that might help us debug this:
3 locks held by heap-overflow/2250:
#0: (&mm->mmap_sem){----}, at: [<c000000000050e44>] .dup_mm+0x134/0x410
#1: (&mm->mmap_sem/1){--..}, at: [<c000000000050e54>] .dup_mm+0x144/0x410
#2: (&mm->page_table_lock){--..}, at: [<c0000000000cf2dc>] .copy_hugetlb_page_range+0xfc/0x280
stack backtrace:
Call Trace:
[c00000003b2774e0] [c000000000010ce4] .show_stack+0x74/0x1f0 (unreliable)
[c00000003b2775a0] [c0000000003f10e0] .dump_stack+0x20/0x34
[c00000003b277620] [c0000000000889bc] .__lock_acquire+0xaac/0x1080
[c00000003b277740] [c000000000089000] .lock_acquire+0x70/0xb0
[c00000003b2777d0] [c0000000003ee15c] ._spin_lock+0x4c/0x80
[c00000003b277870] [c0000000000cf2e8] .copy_hugetlb_page_range+0x108/0x280
[c00000003b277950] [c0000000000bcaa8] .copy_page_range+0x558/0x790
[c00000003b277ac0] [c000000000050fe0] .dup_mm+0x2d0/0x410
[c00000003b277ba0] [c000000000051d24] .copy_process+0xb94/0x1020
[c00000003b277ca0] [c000000000052244] .do_fork+0x94/0x310
[c00000003b277db0] [c000000000011240] .sys_clone+0x60/0x80
[c00000003b277e30] [c0000000000078c4] .ppc_clone+0x8/0xc
Fix is the same way that mm/memory.c copy_page_range does the
lockdep annotation.
Acked-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Acked-by: Adam Litke <agl at us.ibm.com>
Acked-by: Nishanth Aravamudan <nacc at us.ibm.com>
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 e2d4ecafd24d6eee4ae6bdbede0cfd0e78423a33
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Thu Jun 5 22:45:56 2008 -0700
modedb: fix incorrect sync and vmode flags for CVT modes
The temporary structure for calculated CVT mode is not initialized. Few
fields have only bits or-ed or and-ed so they may be left in incorrect
(random) state.
Testing of the tridentfb seems like a good exercise for the fbdev layer.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b8c141e8fd80fa64d80c6a74492053f25a28e0ea
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu Jun 5 22:45:55 2008 -0700
frv: don't offer BINFMT_FLAT
Fix the following compile error:
CC fs/binfmt_flat.o
In file included from
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:36:
/home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/flat.h:14:22: error: asm/flat.h: No such file or directory
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c: In function 'create_flat_tables':
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:124: error: implicit declaration of function 'flat_stack_align'
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:125: error: implicit declaration of function 'flat_argvp_envp_on_stack'
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c: In function 'calc_reloc':
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:347: error: implicit declaration of function 'flat_reloc_valid'
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c: In function 'load_flat_file':
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:479: error: implicit declaration of function 'flat_old_ram_flag'
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:755: error: implicit declaration of function 'flat_set_persistent'
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:757: error: implicit declaration of function 'flat_get_relocate_addr'
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:765: error: implicit declaration of function 'flat_get_addr_from_rp'
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/binfmt_flat.c:781: error: implicit declaration of function 'flat_put_addr_at_rp'
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Tested-by: David Howells <dhowells at redhat.com>
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 6a7d68e899b7f609708e7590784344f03640f774
Author: Miao Xie <miaox at cn.fujitsu.com>
Date: Thu Jun 5 22:45:54 2008 -0700
cpusets: fix and update Documentation
Make the doc consistent with current cpusets implementation.
Signed-off-by: Miao Xie <miaox at cn.fujitsu.com>
Acked-by: Paul Jackson <pj at sgi.com>
Cc: 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 c337869d95011495fa181536786e74aa2d7ff031
Author: Dan Williams <dan.j.williams at intel.com>
Date: Thu Jun 5 22:45:54 2008 -0700
md: do not compute parity unless it is on a failed drive
If a block is computed (rather than read) then a check/repair operation
may be lead to believe that the data on disk is correct, when infact it
isn't. So only compute blocks for failed devices.
This issue has been around since at least 2.6.12, but has become harder to
hit in recent kernels since most reads bypass the cache.
echo repair > /sys/block/mdN/md/sync_action will set the parity blocks to the
correct state.
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 a6d8113a986c66aeb379a26b6e0062488b3e59e1
Author: Dan Williams <dan.j.williams at intel.com>
Date: Thu Jun 5 22:45:53 2008 -0700
md: fix uninitialized use of mddev->recovery_wait
If an array was created with --assume-clean we will oops when trying to
set ->resync_max.
Fix this by initializing ->recovery_wait in mddev_find.
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 e0a115e5aa554b93150a8dc1c3fe15467708abb2
Author: Dan Williams <dan.j.williams at intel.com>
Date: Thu Jun 5 22:45:52 2008 -0700
md: fix prexor vs sync_request race
During the initial array synchronization process there is a window between
when a prexor operation is scheduled to a specific stripe and when it
completes for a sync_request to be scheduled to the same stripe. When
this happens the prexor completes and the stripe is unconditionally marked
"insync", effectively canceling the sync_request for the stripe. Prior to
2.6.23 this was not a problem because the prexor operation was done under
sh->lock. The effect in older kernels being that the prexor would still
erroneously mark the stripe "insync", but sync_request would be held off
and re-mark the stripe as "!in_sync".
Change the write completion logic to not mark the stripe "in_sync" if a
prexor was performed. The effect of the change is to sometimes not set
STRIPE_INSYNC. The worst this can do is cause the resync to stall waiting
for STRIPE_INSYNC to be set. If this were happening, then STRIPE_SYNCING
would be set and handle_issuing_new_read_requests would cause all
available blocks to eventually be read, at which point prexor would never
be used on that stripe any more and STRIPE_INSYNC would eventually be set.
echo repair > /sys/block/mdN/md/sync_action will correct arrays that may
have lost this race.
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 b2c8daddcbe03a22402ecf943bb88302601c6835
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Thu Jun 5 22:45:50 2008 -0700
spi: fix refcount-related spidev oops-on-rmmod
This addresses other oopsing paths in "spidev" by changing how it manages
refcounting. It decouples the lifecycle of the per-device data from the
class device (not just the spi device):
- Use class_{create,destroy} not class_{register,unregister}.
- Use device_{create,destroy} not device_{register,unregister}.
- Free the per-device data only when TWO conditions are true:
* Driver is unbound from underlying SPI device, and
* Device is no longer open (new)
Also, spi_{get,set}_drvdata not dev_{get,set}_drvdata for simpler code.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Sebastian Siewior <bigeasy at tglx.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2f5997140f22f68f6390c49941150d3fa8a95cb7
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date: Tue May 27 12:10:20 2008 -0300
KVM: migrate PIT timer
Migrate the PIT timer to the physical CPU which vcpu0 is scheduled on,
similarly to what is done for the LAPIC timers, otherwise PIT interrupts
will be delayed until an unrelated event causes an exit.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 27676a3e166b352928a8ef7b1c0e322f3c471a3e
Author: Ralph Campbell <ralph.campbell at qlogic.com>
Date: Fri Jun 6 11:23:29 2008 -0700
IB/ipath: Fix SM trap forwarding
SM/SMA traps received by the ipath driver should be forwarded to the
SM if it is running on the host. The ib_ipath driver was incorrectly
replying with "bad method."
Signed-off-by: Ralph Campbell <ralph.campbell at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 9dcb40e1aa5bfe7d6ffc729f3c2b6c8f1392d2d3
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Wed May 21 18:22:55 2008 -0500
KVM: ppc: Report bad GFNs
This code shouldn't be hit anyways, but when it is, it's useful to have a
little more information about the failure.
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 905fa4b9d6e2c9fd1c9ad84e3abe83021f498f53
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Wed May 21 18:22:54 2008 -0500
KVM: ppc: Use a read lock around MMU operations, and release it on error
gfn_to_page() and kvm_release_page_clean() are called from other contexts with
mmap_sem locked only for reading.
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 52435b7c7a29f7dd7947c8c204494d7f52f14813
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Wed May 21 18:22:53 2008 -0500
KVM: ppc: Remove unmatched kunmap() call
We're not calling kmap() now, so we shouldn't call kunmap() either. This has no
practical effect in the non-highmem case, which is why it hasn't caused more
obvious problems.
Pointed out by Anthony Liguori.
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ac3cd34e4eb9e3dccaec8e586c073ba2660b322f
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Wed May 21 18:22:52 2008 -0500
KVM: ppc: add lwzx/stwz emulation
Somehow these load/store instructions got missed before, but weren't used by
the guest so didn't break anything.
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Christian Ehrhardt <ehrhardt at linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit ce263d70e509287ee761f9bba519342f57b121ca
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date: Wed May 21 18:22:51 2008 -0500
KVM: ppc: Remove duplicate function
This was left behind from some code movement.
Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 088af1543c611f4200658250b6a4467b7eb496a6
Author: Joachim Fenkes <fenkes at de.ibm.com>
Date: Fri Jun 6 11:21:33 2008 -0700
IB/ehca: Reject send WRs only for RESET, INIT and RTR state
Signed-off-by: Joachim Fenkes <fenkes at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit e52b2af541bcb299212a63cfa3e3231618a415be
Author: Carsten Otte <cotte at de.ibm.com>
Date: Wed May 21 13:37:44 2008 +0200
KVM: s390: Fix race condition in kvm_s390_handle_wait
The call to add_timer was issued before local_int.lock was taken and before
timer_due was set to 0. If the timer expires before the lock is being taken,
the timer function will set timer_due to 1 and exit before the vcpu falls
asleep. Depending on other external events, the vcpu might sleep forever.
This fix pulls setting timer_due to the beginning of the function before
add_timer, which ensures correct behavior.
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 1f0d0f094df9a570dfc26d5eb825986b7e165e1d
Author: Carsten Otte <cotte at de.ibm.com>
Date: Wed May 21 13:37:40 2008 +0200
KVM: s390: Send program check on access error
If the guest accesses non-existing memory, the sie64a function returns
-EFAULT. We must check the return value and send a program check to the
guest if the sie instruction faulted, otherwise the guest will loop at
the faulting code.
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 0ff318674503ce3787ef62d84f4d948db204b268
Author: Carsten Otte <cotte at de.ibm.com>
Date: Wed May 21 13:37:37 2008 +0200
KVM: s390: fix interrupt delivery
The current code delivers pending interrupts before it checks for
need_resched. On a busy host, this can lead to a longer interrupt
latency if the interrupt is injected while the process is scheduled
away. This patch moves delivering the interrupt _after_ schedule(),
which makes more sense.
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 71cde5879f10b639506bc0b9f29a89f58b42a17e
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Wed May 21 13:37:34 2008 +0200
KVM: s390: handle machine checks when guest is running
The low-level interrupt handler on s390 checks for _TIF_WORK_INT and
exits the guest context, if work is pending.
TIF_WORK_INT is defined as_TIF_SIGPENDING | _TIF_NEED_RESCHED |
_TIF_MCCK_PENDING. Currently the sie loop checks for signals and
reschedule, but it does not check for machine checks. That means that
we exit the guest context if a machine check is pending, but we do not
handle the machine check.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
CC: 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 74b6b522ec83f9c44fc7743f2adcb24664aa8f45
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Wed May 21 13:37:29 2008 +0200
KVM: s390: fix locking order problem in enable_sie
There are potential locking problem in enable_sie. We take the task_lock
and the mmap_sem. As exit_mm uses the same locks vice versa, this triggers
a lockdep warning.
The second problem is that dup_mm and mmput might sleep, so we must not
hold the task_lock at that moment.
The solution is to dup the mm unconditional and use the task_lock before and
afterwards to check if we can use the new mm. dup_mm and mmput are called
outside the task_lock, but we run update_mm while holding the task_lock,
protection us against ptrace.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Carsten Otte <cotte at de.ibm.com>
Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit b8cee18cc75d7b9dbe6c6526dfae9ab49e84fa95
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Wed May 21 13:37:16 2008 +0200
KVM: s390: use yield instead of schedule to implement diag 0x44
diag 0x44 is the common way on s390 to yield the cpu to the hypervisor.
It is called by the guest in cpu_relax and in the spinlock code to
yield to other guest cpus.
This semantic is similar to yield. Lets replace the call to schedule with
yield to make sure that current is really yielding.
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 33e3885de25148e00595c4dd808d6eb15db2edcf
Author: Avi Kivity <avi at qumranet.com>
Date: Wed May 21 15:34:25 2008 +0300
KVM: x86 emulator: fix hypercall return value on AMD
The hypercall instructions on Intel and AMD are different. KVM allows the
guest to choose one or the other (the default is Intel), and if the guest
chooses incorrectly, KVM will patch it at runtime to select the correct
instruction. This allows live migration between Intel and AMD machines.
This patching occurs in the x86 emulator. The current code also executes
the hypercall. Unfortunately, the tail end of the x86 emulator code also
executes, overwriting the return value of the hypercall with the original
contents of rax (which happens to be the hypercall number).
Fix not by executing the hypercall in the emulator context; instead let the
guest reissue the patched instruction and execute the hypercall via the
normal path.
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit f20d2752980c144c82649eb18746ef0c29f508dd
Author: Jes Sorensen <jes at sgi.com>
Date: Tue May 20 13:13:50 2008 +0200
KVM: ia64: fix zero extending for mmio ld1/2/4 emulation in KVM
Only copy in the data actually requested by the instruction emulation
and zero pad the destination register first. This avoids the problem
where emulated mmio access got garbled data from ld2.acq instructions
in the vga console driver.
Signed-off-by: Jes Sorensen <jes at sgi.com>
Acked-by: Xiantao Zhang <xiantao.zhang at intel.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit bc01886352c277e310c07befadbb617c8f561b89
Author: Chen Gong <g.chen at freescale.com>
Date: Thu Jun 5 21:50:04 2008 +0800
[MTD] m25p80.c mutex unlock fix
fix a mutex release bug in function m25p80_write.
Signed-off-by: Chen Gong <g.chen at freescale.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 868e15dbd2940f9453b4399117686f408dc77299
Author: Jaroslav Franek <jarin.franek at post.cz>
Date: Fri Jun 6 11:04:19 2008 +0200
sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card
When the Linux kernel is compiled with CONFIG_DEBUG_SHIRQ=y,
the Soundblaster Audigy2 ZS Notebook PCMCIA card causes the
system hang during boot (udev stage) or when the card is hot-plug.
The CONFIG_DEBUG_SHIRQ flag is by default 'y' with all Fedora
kernels since 2.6.23. The problem was reported as
https://bugzilla.redhat.com/show_bug.cgi?id=326411
The issue was hunted down to the snd_emu10k1_create() routine:
/* pseudo-code */
snd_emu10k1_create(...) {
...
request_irq(... IRQF_SHARED ...) {
register the irq handler
#ifdef CONFIG_DEBUG_SHIRQ
call the irq handler: snd_emu10k1_interrupt() {
poll I/O port // <---- !! system hangs
...
}
#endif
}
...
snd_emu10k1_cardbus_init(...) {
initialize I/O ports
}
...
}
The early access to I/O port in the interrupt handler causes
the freeze. Obviously it is necessary to init the I/O ports
before accessing them. This patch moves the registration of
the irq handler after the initialization of the I/O ports.
Signed-off-by: Jaroslav Franek <jarin.franek at post.cz>
Acked-by: James Courtier-Dutton <James at superbug.co.uk>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit efd5184646d5d400fc538d093e9a0bec22a75551
Author: Jiri Kosina <jkosina at suse.cz>
Date: Fri Jun 6 00:56:43 2008 -0400
Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table
Fujitsu Siemens Amilo Pro V2030 needs nomux table entry, in addition to
already existing entry for V2010 model (note that Fujitsu-Siemens changed
the capitalization in the DMI data for product).
Tested-by: Jiri Mleziva <jmleziva at tiscali.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 714c8a061092417d3ffb1d0f0522e3d092c730dd
Author: Stas Sergeev <stsp at aknet.ru>
Date: Fri Jun 6 00:22:50 2008 -0400
Input: pcspkr - remove negative dependency on snd-pcsp
It should be possible to build pcspkr driver together with snd-pcsp,
even though tehy can not be used together.
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 39b945a37bac2b692773a470890c8ba301485b15
Merge: 203c80187eba037f2d6562e0d5847014746726dd 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 5 16:15:00 2008 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: fix tosa.c build error
[ARM] 5067/1: _raw_write_can_lock macro bugfix
[ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
[ARM] 5068/1: PXA2xx Additional gpio definitions
[ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
[ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
[ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
[ARM] 5060/1: remove unnecessary include of asm/io.h
[ARM] fix AT91 include loops
commit 203c80187eba037f2d6562e0d5847014746726dd
Author: Ben Collins <ben.collins at canonical.com>
Date: Thu Jun 5 19:10:21 2008 -0400
mmc: Fix crash in mmc_block on 64-bit
Fairly simple. "dev_use" was being allocated as a zero length array
because of bad math on 64-bit systems, causing a crash in
find_first_zero_bit(). One-liner follows:
Signed-off-by: Ben Collins <ben.collins at canonical.com>
Acked-by: Pierre Ossman <drzeus at drzeus.cx>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9f67fd5db50566728996b0115a08c83d4f902cb3
Author: Bertram Felgenhauer <int-e at gmx.de>
Date: Thu Jun 5 15:31:22 2008 -0700
x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
This BIOS claims the VIA 8237 south bridge to be compatible with VIA 586,
which it is not.
Without this patch, I get the following warning while booting,
among others,
| PCI: Using IRQ router VIA [1106/3227] at 0000:00:11.0
| ------------[ cut here ]------------
| WARNING: at arch/x86/pci/irq.c:265 pirq_via586_get+0x4a/0x60()
| Modules linked in:
| Pid: 1, comm: swapper Not tainted 2.6.26-rc4-00015-g1ec7d99 #1
| [<c0119fd4>] warn_on_slowpath+0x54/0x70
| [<c02246e0>] ? vt_console_print+0x210/0x2b0
| [<c02244d0>] ? vt_console_print+0x0/0x2b0
| [<c011a413>] ? __call_console_drivers+0x43/0x60
| [<c011a482>] ? _call_console_drivers+0x52/0x80
| [<c011aa89>] ? release_console_sem+0x1c9/0x200
| [<c0291d21>] ? raw_pci_read+0x41/0x70
| [<c0291e8f>] ? pci_read+0x2f/0x40
| [<c029151a>] pirq_via586_get+0x4a/0x60
| [<c02914d0>] ? pirq_via586_get+0x0/0x60
| [<c029178d>] pcibios_lookup_irq+0x15d/0x430
| [<c03b895a>] pcibios_irq_init+0x17a/0x3e0
| [<c03a66f0>] ? kernel_init+0x0/0x250
| [<c03a6763>] kernel_init+0x73/0x250
| [<c03b87e0>] ? pcibios_irq_init+0x0/0x3e0
| [<c0114d00>] ? schedule_tail+0x10/0x40
| [<c0102dee>] ? ret_from_fork+0x6/0x1c
| [<c03a66f0>] ? kernel_init+0x0/0x250
| [<c03a66f0>] ? kernel_init+0x0/0x250
| [<c010324b>] kernel_thread_helper+0x7/0x1c
| =======================
| ---[ end trace 4eaa2a86a8e2da22 ]---
and IRQ trouble later,
| irq 10: nobody cared (try booting with the "irqpoll" option)
Now that's an VIA 8237 chip, so pirq_via586_get shouldn't be called
at all; adding this workaround to via_router_probe() fixes the
problem for me.
Amazingly I have a 2.6.23.8 kernel that somehow works fine ... I'll
never understand why.
Signed-off-by: Bertram Felgenhauer <int-e at gmx.de>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit b2ab26ab28cfed076ee8a83627d008472f6ac54f
Merge: 5965087dc96167298ab83598f681d4d6f9d324fa be573e7872432918e1017cf1e917e73817dcdad6
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 5 14:30:47 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: (48 commits)
V4L/DVB (8001): dib0070: fix dib0070_attach when !CONFIG_DVB_TUNER_DIB0070
V4L/DVB (8000): tda827x: fix NULL pointer in tda827xa_lna_gain
V4L/DVB (7990): Fix entry for PowerColor RA 330 and make it run with firmware version 2.7
V4L/DVB (7983): tda18271_calc_rf_cal must return the return value of tda18271_lookup_map
V4L/DVB (7978): cx18: explicitly test for XC2028 tuner
V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use.
V4L/DVB (7975): saa7134_empress
V4L/DVB (7974): fix MEDIA_TUNER && FW_LOADER build error
V4L/DVB (7972): or51132.c: unaligned
V4L/DVB (7971): usb: unaligned
V4L/DVB (7970): mix trivial endianness annotations
V4L/DVB (7969): m920x: unaligned access
V4L/DVB (7968): zoran: endianness annotations
V4L/DVB (7967): bt8xx: unaligned access
V4L/DVB (7966): cx18: direct dereferencing of iomem
V4L/DVB (7965): annotate bcx_riscmem
V4L/DVB (7964): cx18 iomem annotations
V4L/DVB (7963): ivtv: trivial annotations
V4L/DVB (7962): ttusb endianness annotations and fixes
V4L/DVB (7961): fix endianness bug in dib0700_devices.c
...
commit 5965087dc96167298ab83598f681d4d6f9d324fa
Merge: 698f7a4a12c15fef354b2a1ac14f90a0e71008d9 cd9da13d6ef4f4b652a9a885d4a7c80e40fed229
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 5 14:29:53 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:
Fix divide by zero error in build_clear_page() and build_copy_page()
[MIPS] Fix typo in header guard
[MIPS] Fix build error - Delete debugging crap that crept in with CMP
[MIPS] Add accessors for random register.
[MIPS] IP27: misc fixes
[MIPS] IP27: Fix clockevent setup
[MIPS] IP27: Fix bootmem memory setup
[MIPS] remove CONFIG_CPU_R4000 line from Makefile
[MIPS] Fix check for valid stack pointer during backtrace
[MIPS] Add missing braces to pte_mkyoung
[MIPS] R4700: Fix build_tlb_probe_entry
[MIPS] Alchemy: dbdma: add API to delete custom DDMA device ids.
[MIPS] Alchemy: export get_au1x00_speed for modules
commit 2bdd1b031b200d55c2512c8d7e0e9bdcf85d011f
Author: Andres Salomon <dilinger at queued.net>
Date: Thu Jun 5 14:14:41 2008 -0700
PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
Previously, one would have to specifically choose CONFIG_OLPC and
CONFIG_PCI_GOOLPC in order to enable PCI_OLPC. That doesn't really work
for distro kernels, so this patch allows one to choose CONFIG_OLPC and
CONFIG_PCI_GOANY in order to build in OLPC support in a generic kernel (as
requested by Robert Millan).
This also moves GOOLPC before GOANY in the menuconfig list.
Finally, make pci_access_init return early if we detect OLPC hardware.
There's no need to continue probing stuff, and pci_pcbios_init
specifically trashes our settings (we didn't run into that before because
PCI_GOANY wasn't supported).
Signed-off-by: Andres Salomon <dilinger at debian.org>
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: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 698f7a4a12c15fef354b2a1ac14f90a0e71008d9
Merge: adbd5886da5f467148b26cca3728ab0e672b3fcc ba75321193900a236bc5bbc29145e1039f74eb1b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Jun 5 14:25:48 2008 -0700
Merge git://git.infradead.org/~dwmw2/mtd-2.6.26
* git://git.infradead.org/~dwmw2/mtd-2.6.26:
[MTD] [MAPS] Fix cmdlineparse handling in mapping files
[MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path
commit adbd5886da5f467148b26cca3728ab0e672b3fcc
Author: Willy Tarreau <w at 1wt.eu>
Date: Tue Jun 3 00:20:28 2008 +0200
doc: add suggestions about good practises for maintainers
Suggest how to deal with patch modifications caused by
merging or back-porting when you're a maintainer.
Signed-off-by: Willy Tarreau <w at 1wt.eu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ddb2c43594f22843e9f3153da151deaba1a834c5
Author: Chris Wright <chrisw at sous-sol.org>
Date: Wed Jun 4 09:16:33 2008 -0700
asn1: additional sanity checking during BER decoding
- Don't trust a length which is greater than the working buffer.
An invalid length could cause overflow when calculating buffer size
for decoding oid.
- An oid length of zero is invalid and allows for an off-by-one error when
decoding oid because the first subid actually encodes first 2 subids.
- A primitive encoding may not have an indefinite length.
Thanks to Wei Wang from McAfee for report.
Cc: Steven French <sfrench at us.ibm.com>
Cc: stable at kernel.org
Acked-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: Chris Wright <chrisw at sous-sol.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit efedf51c866130945b5db755cb58670e60205d83
Author: Nick Piggin <npiggin at suse.de>
Date: Wed Jun 4 17:18:42 2008 +0200
Add 'rd' alias to new brd ramdisk driver
Alias brd to rd in the hope of helping legacy users. Suggested by Jan.
Signed-off-by: Nick Piggin <npiggin at suse.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 16104b5504fa8be130f7f127a5a1c7dd774efc44
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Thu Jun 5 22:47:13 2008 +0200
x86: fix CONFIG_NONPROMISC_DEVMEM prompt and help text
Here is an attempt to translate the prompt and help text into something
which is legible and, as a bonus, correct.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 609a70ac927b72da647ccee7873d928d45055eae
Author: David Howells <dhowells at redhat.com>
Date: Thu Jun 5 17:07:35 2008 +0100
FRV: ip_fast_csum() requires a memory clobber on its inline asm
ip_fast_csum() requires a memory clobber on its inline asm as it accesses
memory in a fashion that gcc can't predict.
The GCC manual says:
If your assembler instructions access memory in an unpredictable
fashion, add `memory' to the list of clobbered registers. This will
cause GCC to not keep memory values cached in registers across the
assembler instruction and not optimize stores or loads to that memory.
The bug hasn't been noticed in FRV, but it has been seen in PA-RISC.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5a515bcbea580a65ced92405b083299df9003748
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Thu Jun 5 10:32:23 2008 -0600
PNP: skip UNSET MEM resources as well as DISABLED ones
We don't need to reserve "unset" resources. Trying to reserve
them results in messages like this, which are ugly but harmless:
system 00:08: iomem range 0x0-0x0 could not be reserved
Future PNP patches will remove use of IORESOURCE_UNSET, but
we still need it for now.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cd9da13d6ef4f4b652a9a885d4a7c80e40fed229
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Wed May 7 23:38:15 2008 +0900
Fix divide by zero error in build_clear_page() and build_copy_page()
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 2cc3c0b67bdde7263f6eb16c16709e0b84047646
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Tue May 27 17:27:28 2008 +0200
[MIPS] Fix typo in header guard
Signed-off-by: Vegard Nossum <vegard.nossum at gmail.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 482845a348f76fbf9cec6dda0f1eb113d4fafd9d
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Mon May 26 09:47:55 2008 +0100
[MIPS] Fix build error - Delete debugging crap that crept in with CMP
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 272bace7f3753ea8bf6ee80e3a6b32fa64190744
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Mon May 26 09:35:47 2008 +0100
[MIPS] Add accessors for random register.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 96173a6c4ebca4c146bb87026cce78bbe392cb61
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Thu Apr 17 22:07:42 2008 +0200
[MIPS] IP27: misc fixes
- fix PCI interrupt assignment by emulating ioc3 interrupt pin register
- use pci_probe_only mode
- select correct page size in bridge
- remove no longer needed ioc3_sio_init() code
[Ralf: Fix for 64kB or larger pagesizes]
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit b32bb803fb52cc669762780d44b4c3d9e3d799f6
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Tue Apr 8 23:43:57 2008 +0200
[MIPS] IP27: Fix clockevent setup
Fix breakage introduced by converting hub_rt to clockevent.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 2bf8ec2d8137e66998435ddf6d4060a558e2f727
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Tue Apr 8 23:43:46 2008 +0200
[MIPS] IP27: Fix bootmem memory setup
Changes in the generic bootmem code broke memory setup for IP27. This
patch fixes this by replacing lots of special IP27 code with generic
bootmon code. This has been tested only on a single node.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit c2719d93836b0b0cdf1725449d87705da6ede9a5
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed May 21 01:55:02 2008 +0300
[MIPS] remove CONFIG_CPU_R4000 line from Makefile
The existing options are named CONFIG_CPU_R4300 and CONFIG_CPU_R4X00,
and they are directly below.
Reported-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 10220c884444a1866bb070e207d84fc18188e2a7
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Mon May 12 17:58:48 2008 +0200
[MIPS] Fix check for valid stack pointer during backtrace
The newly added check for valid stack pointer address breaks at least for
64bit kernels. Use __get_user() for accessing stack content to avoid crashes,
when doing the backtrace.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 057229f9efc7ebebd3ce0496195ed46df631f383
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Fri May 2 14:08:20 2008 +0300
[MIPS] Add missing braces to pte_mkyoung
Only the version pte_mkyoung for 36-bit pagetables on 32-bit hw was
affected and with this bug being around since November 29, 2004 there
is evidence to suport the assumption it was benign ;-)
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 326e2e1a59decc81bea052e8a8c6d75c63daa2db
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Mon May 12 13:55:42 2008 +0200
[MIPS] R4700: Fix build_tlb_probe_entry
Treat R4700 like R4600 in build_tlb_probe_entry. Without this fix kernel
will lock up.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit ccdb0034f8d5321be42c479dd7fc872ba2a46adb
Author: Manuel Lauss <mlau at msc-ge.com>
Date: Wed May 7 13:45:23 2008 +0200
[MIPS] Alchemy: dbdma: add API to delete custom DDMA device ids.
Add API to delete custom DDMA device ids create with
au1xxx_ddma_device_add().
Signed-off-by: Manuel Lauss <mano at roarinelk.homelinux.net>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit b1fb05cdb9096e3fe1af4474e108dedce2515801
Author: Manuel Lauss <mlau at msc-ge.com>
Date: Wed May 7 13:42:55 2008 +0200
[MIPS] Alchemy: export get_au1x00_speed for modules
au1xmmc.c driver depends on it, so export it for modules.
Signed-off-by: Manuel Lauss <mano at roarinelk.homelinux.net>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 6311c90a9ea16b4ab93ed48f1a9022647f6b3c43
Author: Hugh Dickins <hugh at veritas.com>
Date: Thu Jun 5 14:44:39 2008 +0100
libata: fix G5 SATA broken on -rc5
Fix G5 SATA irq 18: nobody cared, reported on -rc5 by Olaf Hering:
fixlet to a57c1bade5a0ee5cd8b74502db9cbebb7f5780b2 libata-sff:
Fix oops reported in kerneloops.org for pnp devices with no ctl
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Acked-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
Tested-by: Olaf Hering <olaf at aepfle.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit be573e7872432918e1017cf1e917e73817dcdad6
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Thu Jun 5 13:08:29 2008 -0300
V4L/DVB (8001): dib0070: fix dib0070_attach when !CONFIG_DVB_TUNER_DIB0070
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 67642a0a58143761d7415f0587e0ac6dd6371251
Author: Sigmund Augdal <sigmund at snap.tv>
Date: Thu Jun 5 12:53:08 2008 -0300
V4L/DVB (8000): tda827x: fix NULL pointer in tda827xa_lna_gain
Check that tda827x_config is defined before attempting to use it.
Signed-off-by: Sigmund Augdal <sigmund at snap.tv>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a9606ce697ed719071fcccee8591ff033fa5e16d
Author: Daniel Gimpelevich <daniel at gimpelevich.san-francisco.ca.us>
Date: Tue Jun 3 21:29:45 2008 -0300
V4L/DVB (7990): Fix entry for PowerColor RA 330 and make it run with firmware version 2.7
Signed-off-by: Daniel Gimpelevich <daniel at gimpelevich.san-francisco.ca.us>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fc60d6e2727157b53d49c8d55888d0a78dafbc9f
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sat May 31 18:18:55 2008 -0300
V4L/DVB (7983): tda18271_calc_rf_cal must return the return value of tda18271_lookup_map
On the TDA18271HD/C1, we perform RF tracking filter correction for VHF low
band, only. If supplied a frequency out of range, the error must be returned
to the caller (tda18271c1_rf_tracking_filter_calibration) so that it can
decide whether or not to write to register EB14, RFC_CPROG[7:0]
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4ecc24737700f07d6c2a8fdf8c1737e399f1830f
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Fri May 30 11:03:12 2008 -0300
V4L/DVB (7978): cx18: explicitly test for XC2028 tuner
Testing whether xceive_pin is non-zero is not good enough as 0 is a valid
value. Instead explicitly test whether the Xceive tuner is used.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5e7fdc5ed820516f8253cc7daad27cf3ee6bd784
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Fri May 30 10:51:53 2008 -0300
V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 388748e61cc59487c34e1dfa890ffc44e4d16b1f
Author: Dmitri Belimov <d.belimov at gmail.com>
Date: Wed May 21 01:20:34 2008 -0300
V4L/DVB (7975): saa7134_empress
This is patch for fix data structure in querycap syscall.
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 6637dea60ec93916ea0623a0e9bcc2b1769cbc11
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue May 20 19:34:09 2008 -0300
V4L/DVB (7974): fix MEDIA_TUNER && FW_LOADER build error
-tip testing found the following build failure:
LD .tmp_vmlinux1
drivers/built-in.o: In function `generic_set_freq':
tuner-xc2028.c:(.text+0xbd896): undefined reference to `request_firmware'
tuner-xc2028.c:(.text+0xbdd7a): undefined reference to `release_firmware'
drivers/built-in.o: In function `xc_load_fw_and_init_tuner':
xc5000.c:(.text+0xc68e6): undefined reference to `request_firmware'
xc5000.c:(.text+0xc6abe): undefined reference to `release_firmware'
with this config:
http://redhat.com/~mingo/misc/config-Tue_May_20_18_11_34_CEST_2008.bad
the reason is another kconfig tool bug that has to be worked around in
the driver's Kconfig file: if FW_LOADER is selected in a second
dependency, that is not properly propagated up the dependencies.
in this case, FW_LOADER is selected from MEDIA_TUNER_XC2028:
config MEDIA_TUNER_XC2028
tristate "XCeive xc2028/xc3028 tuners"
depends on VIDEO_MEDIA && I2C
depends on HOTPLUG
select FW_LOADER
which got selected by MEDIA_TUNER:
config MEDIA_TUNER
tristate
default VIDEO_MEDIA && I2C
depends on VIDEO_MEDIA && I2C
select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
but the kconfig tool did not pick up this second-order dependency and
allowed CONFIG_FW_LOADER=m to be selected - in which case the build
fails.
the workaround i found was to move the select of FW_LOADER one level up,
so that the buggy kconfig tool can notice it and can act appropriately.
This problem can probably be worked around in other ways as well, i went
for the minimal fix.
Obviously, the kconfig tool should be fixed, it is not reasonable to
expect driver authors to do manual dependency resolution (that kconfig
itself already does) and uglify the Kconfig files. The kconfig tool did
nothing to warn about this situation and did not prevent this faulty
.config from being constructed.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 18dcd55a8bf8aa7009c647725b5234c9589c6985
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:33:11 2008 -0300
V4L/DVB (7972): or51132.c: unaligned
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 637007fe5cfc790c46e3d7af8ba069ddd73f389c
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:33:01 2008 -0300
V4L/DVB (7971): usb: unaligned
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a954b6681dd389e6bb63d9b5f3254d675f6984c9
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:32:51 2008 -0300
V4L/DVB (7970): mix trivial endianness annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fa9c13a383ea60b5e0a89e9e180683411bc5552c
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:32:41 2008 -0300
V4L/DVB (7969): m920x: unaligned access
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 581a7f1a2ddedbc27ad76f518b861ce1e60ff5ab
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:32:31 2008 -0300
V4L/DVB (7968): zoran: endianness annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c1c36f3128c89aa96f01cbf6d40b0cd77a8bc45e
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:32:21 2008 -0300
V4L/DVB (7967): bt8xx: unaligned access
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 576904bb8941d2ae958a097888cee418d5192144
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:32:11 2008 -0300
V4L/DVB (7966): cx18: direct dereferencing of iomem
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d8eaa58b06e8779453410d88d2d86e700a0432c6
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:31:51 2008 -0300
V4L/DVB (7965): annotate bcx_riscmem
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 990c81c8afcd71eced2482ad59950ea755eddc7f
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:32:01 2008 -0300
V4L/DVB (7964): cx18 iomem annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b0510f8dc73dce56f35337487c6374ae84b15446
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:31:41 2008 -0300
V4L/DVB (7963): ivtv: trivial annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d4f979a9e1c5c8ed291e89ec38248823c9a182ba
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:31:31 2008 -0300
V4L/DVB (7962): ttusb endianness annotations and fixes
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit da5ee48677b96dbf44c2ae46857dea060af34164
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:31:21 2008 -0300
V4L/DVB (7961): fix endianness bug in dib0700_devices.c
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 12fbcef1055ee7dd522d578c4c6c0e80acaa3d4c
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:31:11 2008 -0300
V4L/DVB (7960): net: endianness annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b05ce2e79ebaf205b2d66ac32f10e2bd231d80a4
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:31:01 2008 -0300
V4L/DVB (7959): endianness fix in flexcop-usb.c
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3e085629bc921c37c1bb2e2fb6227fa14de14682
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:30:51 2008 -0300
V4L/DVB (7958): fix unaligned access in av7110.c
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a230e55d92347e09d9ba2e97096df114b2dfaf2d
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:30:41 2008 -0300
V4L/DVB (7957): fix the roothole in av7110_av.c
direct dereferencing from user-supplied address
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Reviewed-by: Oliver Endriss <o.endriss at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit f34ec12a17984d7df784bf49caf64f5f743e5e10
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Wed May 21 00:30:31 2008 -0300
V4L/DVB (7956): cinergyT2: endianness annotations, endianness and race fixes
Endianness annotations and fixes + fixing the handling of
->uncorrected_block_count
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 39028ec69b13712ec1dcd9aa14844bf60f19cb20
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Mon Jun 2 15:46:51 2008 -0300
V4L/DVB (7166): [v4l] Add new user class controls and deprecate others
These were removed in commit 26d507fcfef7f7d0cd2eec874a87169cc121c835:
> -#define V4L2_CID_HCENTER (V4L2_CID_BASE+22)
> -#define V4L2_CID_VCENTER (V4L2_CID_BASE+23)
> -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+24) /*
> last CID + 1 */
> +
> +/* Deprecated, use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
> +#define V4L2_CID_HCENTER_DEPRECATED (V4L2_CID_BASE+22)
> +#define V4L2_CID_VCENTER_DEPRECATED (V4L2_CID_BASE+23)
But there was no warning in Documentation/feature-removal-schedule.txt
and I'm receiving reports that it's breaking userspace apps (the
gstreamer-v4l2 plugin breaks in Fedora rawhide). You can't just pull
things from the published userspace API like that.
Please can we revert the addition of _DEPRECATED to these ioctl
definitions. Perhaps we can add a runtime warning if they actually get
used? Or a compile-time warning if we can manage that?
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c663d03590a882f4834197bff278ca0aa2a95e2e
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri Apr 18 21:22:50 2008 -0300
V4L/DVB (7944): tuner-xc2028: use hybrid_tuner_request_state
Use a standard method to manage multiple instances of a hybrid tuner.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 9adea1c00df74823e1719ebbcb86c972c4c2aba1
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri Apr 18 20:26:04 2008 -0300
V4L/DVB (7943): tuner: add macro, hybrid_tuner_report_instance_count
Create a macro to report the number of instances of the tuner driver
currently in use. This will allow drivers to perform specific cleanups
before destroying the last instance of a tuner.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ba60bc673ce7d019ae6684cebbb33e5239346664
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sun May 25 14:34:36 2008 -0300
V4L/DVB (7934): cx18: move gpio_dir/val statics to the cx18 struct.
The gpio_dir/val statics cannot be global, they are card-specific.
Thanks to Andy Walls for pointing this out.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8f9935732930e705cab1936a03418ce01aee979a
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sun May 25 11:45:53 2008 -0300
V4L/DVB (7932): cx18: mark Compro H900 as fully supported.
I always assumed that the Compro H900 could do digital as well,
but it turned out that it is an analog-only card.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 31554ae599a8ff6854bf8ecbedc1946c64854388
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sun May 25 11:21:27 2008 -0300
V4L/DVB (7931): cx18: allow for simultaneous digital and analog capture
The HVR-1600 can do both analog and digital capture at the same time.
Due to a driver bug -EBUSY would be returned when attempting to setup an
analog capture while a digital capture was already in progress.
Separate the two internally.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit be303e16dbd210077c697aaf2f0960413166b53d
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Sat May 24 12:43:43 2008 -0300
V4L/DVB (7930): ivtv: bump version to 1.3.0.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 63b8c709895febf62766dc8e818a1457a520fb15
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Wed May 21 17:40:19 2008 -0300
V4L/DVB (7928): cx18: fix audio registers 808 and 80c
The handling of the audio registers 808 and 80c were based on old datasheets.
Updated to the latest information.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7f3917f6484938d56cb5ab660f476c1dfa445a81
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Mon May 19 22:13:02 2008 -0300
V4L/DVB (7925): cx18: ensure that the xceive pin is always asserted on init.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3b4a9714f43a1d675a4352260a12daae197f37c3
Author: Andy Walls <awalls at radix.net>
Date: Mon May 26 01:31:17 2008 -0300
V4L/DVB (7922): tuner-simple: fix tuner_warn() induced kernel oops in simple_tuner_attach()
The tuner_warn() macro relies on the local variable "priv" to be a valid
pointer. There was a case in simple_tuner_attach() where this cannot be the
case yet, so tuner_warn() would dereference a NULL "priv" pointer. Changed
the tuner_warn() to a printk() with the originally intended output format.
Signed-off-by: Andy Walls <awalls at radix.net>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 5cf3f5cd1f6ee0d81b75c659c732dd8dd245a350
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sat May 24 23:49:03 2008 -0300
V4L/DVB (7919): VIDEO_AU0828 does not depend on VIDEO_DEV
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 383a211699026ee41d9726e3f5edcfa1b0071b8f
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sat May 24 23:48:16 2008 -0300
V4L/DVB (7918): au0828: remove irrelevent analog tuner standby code
This code is irrelevant to this driver and should be removed. This was
copied from a hack in cx88-dvb.c, which prevents noise coming from the
analog tuner (via an audio patch cable from the pci card to the sound
hardware) when in digital mode by muting the tda988x. This issue does
not apply to this USB hybrid chip design, where a single piece of
silicon handles both analog and digital demodulation.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2f1a1c7f9c10a87a6725e4b9603e4880c2059d71
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Sun May 25 13:09:51 2008 -0300
V4L/DVB (7916): dib7000p: fix dib7000p_attach when !CONFIG_DVB_DIB7000P
somebody forgot to to fix this header...
Thanks to Ingo Molnar for pointing this out.
Tested-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 70345fbe4a76621808219c506f2480b39131e575
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date: Thu May 22 19:30:40 2008 -0300
V4L/DVB (7911): Remove v4l2_video_std_fps prototype declaration
The v4l2_video_std_fps function has been removed by Adrian Bunk in 2004
but then its prototype re-appeared in include/media/v4l2-dev.h. Remove it.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b4aba24186d66190b21ab64bf28f22ffc51a9c43
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue May 20 08:02:33 2008 -0300
V4L/DVB (7910): usb: input layer dependency fixes
testing of the -tip tree found the following build failures on
2.6.26-rc3:
drivers/built-in.o: In function `ttusb_dec_disconnect':
ttusb_dec.c:(.text+0xa2c95): undefined reference to `input_unregister_device'
drivers/built-in.o: In function `dvb_usb_read_remote_control':
dvb-usb-remote.c:(.text+0xa6a94): undefined reference to `input_event'
with this config:
http://redhat.com/~mingo/misc/config-Tue_May_20_03_48_57_CEST_2008.bad
these are due to the media/dvb/usb layer having dependencies on INPUT
functionality, without having that spelled out in the Kconfig file.
this patch makes that dependency explicit (for the drivers affected),
which solves the build error.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 45033bcf172d9965210b644f3769c9de94c33333
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon May 26 14:23:49 2008 -0300
V4L/DVB (7908): always enter drivers/media/video/
After commit 039d40019f3c5e26ea50ec5af4270189f63365e1
(V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic)
VIDEO_MEDIA is no longer usable in Makefile's for deciding
which directories we enter, resulting in compile errors like the
following with CONFIG_VIDEO_DEV=y, CONFIG_DVB_CORE=m:
<-- snip -->
...
MODPOST 187 modules
...
make[2]: *** [__modpost] Error 1
<-- snip -->
The easiest solution is to always enter video/
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 38db143e6feaa2dc649ed8bf69d1a12f7b9c0246
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri May 16 00:15:53 2008 -0300
V4L/DVB (7906): tuners/mxl5005s.c: don't define variables for enums
It doesn't seem to be intended that "tuner_modu_type" and
"MXL5005_ControlName" were global variables.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 427aad6fda607914945022e916827037d2d0db3d
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Sun May 11 19:58:59 2008 -0300
V4L/DVB (7905): check_v4l2 should return -EINVAL on error
check_v4l2 always returns 0, so this change is an noop for now,
but a comment says it will return something else in the future
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4d3437df25325d517ee310d55989ce9630ff529e
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Mon May 26 14:03:02 2008 -0300
V4L/DVB (7904): v4l/tuner-core: consistent handling of return values
change check_mode and set_mode to return negative errors and fix all callers
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 7fa7b8583f14889aaceebcd8dca3093987e289f7
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Sun May 11 19:53:39 2008 -0300
V4L/DVB (7903): gp8psk_power_ctrl should return negative errors
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 4277106b4fb6edd8f52b0653841faebbf7160480
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Sun May 11 19:51:07 2008 -0300
V4L/DVB (7902): fix handling of tea5761_autodetection return value
tea5761_autodetection returns -EINVAL on error
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 81b8021a71c194752e8bbb29328cecc744a47b2b
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed May 14 23:14:04 2008 -0300
V4L/DVB (7901): zoran: use correct type for CPU flags
locking-add-typecheck-on-irqsave-and-friends-for-correct-flags.patch will cause
drivers/media/video/zoran_driver.c: In function 'zoran_close_end_session':
drivers/media/video/zoran_driver.c:1172: warning: comparison of distinct pointer types lacks a cast
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit daf20d95bff81c6fc8a8d8160e620e1f9581af02
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Mon May 12 11:21:58 2008 -0300
V4L/DVB (7885): ivtv/cx18: add compat_ioctl entries
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit ba75321193900a236bc5bbc29145e1039f74eb1b
Author: Kyungmin Park <kyungmin.park at samsung.com>
Date: Wed May 7 11:54:10 2008 +0900
[MTD] [MAPS] Fix cmdlineparse handling in mapping files
Now it returns the 0 if cmdlineparse not supplied.
Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit 9b62d864314736fb6cc5c5db5b964d4a3c093424
Author: Eric Miao <eric.miao at marvell.com>
Date: Wed May 21 17:26:15 2008 +0800
[MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path
Signed-off-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
commit bd628bd085c459838d38f93f2f154f1a2e019e48
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Tue Jun 3 12:23:45 2008 +0800
Blackfin arch: fixup warnings with the new cplb saved values
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 1feaa51d84e9611521ec6e59172f9f90db274588
Author: Sonic Zhang <sonic.zhang at analog.com>
Date: Tue Jun 3 12:19:45 2008 +0800
Blackfin Serial Driver: Clean up BF54x macro in blackfin UART driver.
Hide difference in head file.
Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Mon Jun 2 20:38:15 2008 +0100
[ARM] pxa: fix tosa.c build error
Work around:
arch/arm/mach-pxa/tosa.c: In function `tosa_poweroff':
arch/arm/mach-pxa/tosa.c:470: error: `GPIO_OUT' undeclared (first use in this function)
arch/arm/mach-pxa/tosa.c:470: error: (Each undeclared identifier is reported only once
arch/arm/mach-pxa/tosa.c:470: error: for each function it appears in.)
The proper fix exists in the PXA branch of my kernel git tree, which
will be pushed during the next merge window.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 1e5c594607778f551b729577b046ee5d9333cfb5
Author: surinder <srplsnh at gmail.com>
Date: Wed May 28 09:51:16 2008 +0100
[ARM] 5067/1: _raw_write_can_lock macro bugfix
The current __raw_write_can_lock macro tests whether the lock can be
locked by checking if it is equal to 0x80000000, whereas the lock
should be lockable if its value is 0 i.e. unlocked state is
represented by 0. Hence the macro should test the value of lock
against 0 and not 0x80000000.
Signed-off-by: Surinder Pal Singh <srplsnh at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit ea6a7404da4b381b35bcec48338d376a3873ea46
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Fri May 30 18:53:55 2008 +0100
[ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
PSKTSEL can be routed to GPIO pin 104. This configuration is used by
HP iPAQ hx4700.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Acked-by: Jrgen Schindele <linux at schindele.name>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 106f62701fe79fd5c251e5d3e182516344882962
Author: Jonathan Cameron <jic23 at cam.ac.uk>
Date: Wed May 28 18:37:14 2008 +0100
[ARM] 5068/1: PXA2xx Additional gpio definitions
Some additional alternate gpio definitions relating
to FFUART and USB on the pxa27x. These are used on
the xbow imote2 platform.
Signed-off-by: Jonathan Cameron <jic23 at cam.ac.uk>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 31ab3ffb2b20cda79684a0b3a4265fd7170cdacc
Author: Mike Rapoport <mike at compulab.co.il>
Date: Mon Jun 2 12:58:23 2008 +0100
[ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
Add the IORESOURCE_IRQ_HIGHEDGE to the DM9000 IRQ resource
to stop the driver itself complaining it was not given
any flags to use.
Signed-off-by: Mike Rapoport <mike at compulab.co.il>
Acked-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit b095723526cb80494bd5a13de0e5078f8846866a
Author: Mike Rapoport <mike at compulab.co.il>
Date: Mon Jun 2 12:58:24 2008 +0100
[ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
Add the IORESOURCE_IRQ_HIGHEDGE to the DM9000 IRQ resource
to stop the driver itself complaining it was not given
any flags to use.
Signed-off-by: Mike Rapoport <mike at compulab.co.il>
Acked-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit f529626a86d61897862aa1bbbb4537773209238e
Author: Pavel Machek <pavel at suse.cz>
Date: Thu May 29 00:30:21 2008 -0700
suspend-vs-iommu: prevent suspend if we could not resume
iommu/gart support misses suspend/resume code, which can do bad stuff,
including memory corruption on resume. Prevent system suspend in case we
would be unable to resume.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Tested-by: Patrick <ragamuffin at datacomm.ch>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit db9f600b96c16bb3c7f094e294fbdd370226ad86
Author: Miquel van Smoorenburg <mikevs at xs4all.net>
Date: Wed May 28 10:31:25 2008 +0200
x86: pci-dma.c: use __GFP_NO_OOM instead of __GFP_NORETRY
On Wed, 2008-05-28 at 04:47 +0200, Andi Kleen wrote:
> > So... why not just remove the setting of __GFP_NORETRY? Why is it
> > wrong to oom-kill things in this case?
>
> When the 16MB zone overflows (which can be common in some workloads)
> calling the OOM killer is pretty useless because it has barely any
> real user data [only exception would be the "only 16MB" case Alan
> mentioned]. Killing random processes in this case is bad.
>
> I think for 16MB __GFP_NORETRY is ok because there should be
> nothing freeable in there so looping is useless. Only exception would be the
> "only 16MB total" case again but I'm not sure 2.6 supports that at all
> on x86.
>
> On the other hand d_a_c() does more allocations than just 16MB, especially
> on 64bit and the other zones need different strategies.
Okay, so how about this then ?
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 75b19b790bec3ebffbf513405b27500e22270cbc
Author: Bertram Felgenhauer <int-e at gmx.de>
Date: Fri May 30 03:20:05 2008 +0200
pci, x86: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
This BIOS claims the VIA 8237 south bridge to be compatible with VIA 586,
which it is not.
Without this patch, I get the following warning while booting,
among others,
| PCI: Using IRQ router VIA [1106/3227] at 0000:00:11.0
| ------------[ cut here ]------------
| WARNING: at arch/x86/pci/irq.c:265 pirq_via586_get+0x4a/0x60()
| Modules linked in:
| Pid: 1, comm: swapper Not tainted 2.6.26-rc4-00015-g1ec7d99 #1
| [<c0119fd4>] warn_on_slowpath+0x54/0x70
| [<c02246e0>] ? vt_console_print+0x210/0x2b0
| [<c02244d0>] ? vt_console_print+0x0/0x2b0
| [<c011a413>] ? __call_console_drivers+0x43/0x60
| [<c011a482>] ? _call_console_drivers+0x52/0x80
| [<c011aa89>] ? release_console_sem+0x1c9/0x200
| [<c0291d21>] ? raw_pci_read+0x41/0x70
| [<c0291e8f>] ? pci_read+0x2f/0x40
| [<c029151a>] pirq_via586_get+0x4a/0x60
| [<c02914d0>] ? pirq_via586_get+0x0/0x60
| [<c029178d>] pcibios_lookup_irq+0x15d/0x430
| [<c03b895a>] pcibios_irq_init+0x17a/0x3e0
| [<c03a66f0>] ? kernel_init+0x0/0x250
| [<c03a6763>] kernel_init+0x73/0x250
| [<c03b87e0>] ? pcibios_irq_init+0x0/0x3e0
| [<c0114d00>] ? schedule_tail+0x10/0x40
| [<c0102dee>] ? ret_from_fork+0x6/0x1c
| [<c03a66f0>] ? kernel_init+0x0/0x250
| [<c03a66f0>] ? kernel_init+0x0/0x250
| [<c010324b>] kernel_thread_helper+0x7/0x1c
| =======================
| ---[ end trace 4eaa2a86a8e2da22 ]---
and IRQ trouble later,
| irq 10: nobody cared (try booting with the "irqpoll" option)
Now that's an VIA 8237 chip, so pirq_via586_get shouldn't be called
at all; adding this workaround to via_router_probe() fixes the
problem for me.
Amazingly I have a 2.6.23.8 kernel that somehow works fine ... I'll
never understand why.
Signed-off-by: Bertram Felgenhauer <int-e at gmx.de>
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 6d2545738a7c6ad1831d84ecc6483ea21c327bf4
Author: eric miao <eric.y.miao at gmail.com>
Date: Mon May 26 03:23:14 2008 +0100
[ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
Signed-off-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 759e9408ad2e7f2115ce8341854be982e0186a8c
Author: Greg Ungerer <gerg at snapgear.com>
Date: Sun May 25 12:35:38 2008 +0100
[ARM] 5060/1: remove unnecessary include of asm/io.h
Remove unnecessary include of asm/io.h.
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit ee48a75c95145bf6af3be329cd7cbbca2ec89a2a
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sun Jun 1 11:19:33 2008 +0100
[ARM] fix AT91 include loops
AT91 has one include loop in its header files:
include/asm-arm/io.h <- include/asm-arm/arch-at91/io.h <-
include/asm-arm/io.h
Circular include dependencies are dangerous since they can result in
inconsistent definitions being provided to other code, especially if
'#ifndef' constructs are used.
Solve this by removing the offending includes. Built tested using my
AT91 configuration.
Acked-by: Andrew Victor <linux at maxim.org.za>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit ca05a99a54db1db5bca72eccb5866d2a86f8517f
Author: Andrew G. Morgan <morgan at kernel.org>
Date: Tue May 27 22:05:17 2008 -0700
capabilities: remain source compatible with 32-bit raw legacy capability support.
Source code out there hard-codes a notion of what the
_LINUX_CAPABILITY_VERSION #define means in terms of the semantics of the
raw capability system calls capget() and capset(). Its unfortunate, but
true.
Since the confusing header file has been in a released kernel, there is
software that is erroneously using 64-bit capabilities with the semantics
of 32-bit compatibilities. These recently compiled programs may suffer
corruption of their memory when sys_getcap() overwrites more memory than
they are coded to expect, and the raising of added capabilities when using
sys_capset().
As such, this patch does a number of things to clean up the situation
for all. It
1. forces the _LINUX_CAPABILITY_VERSION define to always retain its
legacy value.
2. adopts a new #define strategy for the kernel's internal
implementation of the preferred magic.
3. deprecates v2 capability magic in favor of a new (v3) magic
number. The functionality of v3 is entirely equivalent to v2,
the only difference being that the v2 magic causes the kernel
to log a "deprecated" warning so the admin can find applications
that may be using v2 inappropriately.
[User space code continues to be encouraged to use the libcap API which
protects the application from details like this. libcap-2.10 is the first
to support v3 capabilities.]
Fixes issue reported in https://bugzilla.redhat.com/show_bug.cgi?id=447518.
Thanks to Bojan Smojver for the report.
[akpm at linux-foundation.org: s/depreciate/deprecate/g]
[akpm at linux-foundation.org: be robust about put_user size]
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Andrew G. Morgan <morgan at kernel.org>
Cc: Serge E. Hallyn <serue at us.ibm.com>
Cc: Bojan Smojver <bojan at rexursive.com>
Cc: stable at kernel.org
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Chris Wright <chrisw at sous-sol.org>
commit cc94bc37d5e02aaf8a6409a28e3c62bbd479b9a8
Author: Chris Wright <chrisw at sous-sol.org>
Date: Mon May 19 14:58:43 2008 -0700
LSM: remove stale web site from MAINTAINERS
Pointed out by Adrian Bunk.
Signed-off-by: Chris Wright <chrisw at sous-sol.org>
commit 5f6256066790e1a9a90438f5eece73069c531ffc
Author: Chien Tung <ctung at neteffect.com>
Date: Mon May 26 15:23:32 2008 -0700
MAINTAINERS: Update NetEffect (iw_nes) entry
Add Chien and remove Nishi from maintainers list for NetEffect.
Signed-off-by: Chien Tung <ctung at neteffect.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 03031f71c7e64aada1add057ccc4a8bc6a79924c
Author: Ralph Campbell <ralph.campbell at qlogic.com>
Date: Mon May 26 15:22:17 2008 -0700
IB/ipath: Fix device capability flags
The driver supports a few features (RNR NAK, port active event, SRQ
resize) that were not reported in the device capability flags. This
patch fixes that.
Signed-off-by: Ralph Campbell <ralph.campbell at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit e8ffef73c8dd2c2d00287829db87cdaf229d3859
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon May 26 15:20:34 2008 -0700
IB/ipath: Avoid test_bit() on u64 SDMA status value
Gabriel C <nix.or.die at googlemail.com> pointed out that when the x86
bitops are updated to operate on unsigned long, the code in
sdma_abort_task() will produce warnings:
drivers/infiniband/hw/ipath/ipath_sdma.c: In function 'sdma_abort_task':
drivers/infiniband/hw/ipath/ipath_sdma.c:267: warning: passing argument 2 of 'constant_test_bit' from incompatible pointer type
and so on, because it uses test_bit() to operation on a u64 value
(returned by ipath_read_kref64() for a hardware register).
Fix up these warnings by converting the test_bit() operations to &ing
with appropriate symbolic defines of the bits within the hardware
register. This has the benign side-effect of making the code more
self-documenting as well.
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 571640cad3fda6475da45d91cf86076f1f86bd9b
Author: Eric Sandeen <sandeen at redhat.com>
Date: Mon May 26 12:29:46 2008 -0400
ext4: enable barriers by default
I can't think of any valid reason for ext4 to not use barriers when
they are available; I believe this is necessary for filesystem
integrity in the face of a volatile write cache on storage.
An administrator who trusts that the cache is sufficiently battery-
backed (and power supplies are sufficiently redundant, etc...)
can always turn it back off again.
SuSE has carried such a patch for ext3 for quite some time now.
Also document the mount option while we're at it.
Signed-off-by: Eric Sandeen <sandeen at redhat.com>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 034772b068be62a79470d6c1b81b01fbe27793ac
Author: Theodore Ts'o <tytso at mit.edu>
Date: Tue Jun 3 22:31:11 2008 -0400
jbd2: Fix barrier fallback code to re-lock the buffer head
If the device doesn't support write barriers, the write is retried
without ordered mode. But the buffer head needs to be re-locked or
submit_bh will fail with on BUG(!buffer_locked(bh)).
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit cd0b6a39a1d68b61b1073662f40f747c8b728f98
Author: Theodore Ts'o <tytso at mit.edu>
Date: Mon May 26 10:28:28 2008 -0400
ext4: Display the journal_async_commit mount option in /proc/mounts
Cc: Andreas Dilger <adilger at clusterfs.com>
Cc: Girish Shilamkar <girish at clusterfs.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 624080eded68738daee041ad64672a9d2614754f
Author: Theodore Ts'o <tytso at mit.edu>
Date: Fri Jun 6 17:50:40 2008 -0400
jbd2: If a journal checksum error is detected, propagate the error to ext4
If a journal checksum error is detected, the ext4 filesystem will call
ext4_error(), and the mount will either continue, become a read-only
mount, or cause a kernel panic based on the superblock flags
indicating the user's preference of what to do in case of filesystem
corruption being detected.
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 8ea76900be3b4522396e2021260d2818a27b3a5b
Author: Theodore Ts'o <tytso at mit.edu>
Date: Mon May 26 10:28:09 2008 -0400
jbd2: Fix memory leak when verifying checksums in the journal
Cc: Andreas Dilger <adilger at clusterfs.com>
Cc: Girish Shilamkar <girish at clusterfs.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 944600930a37aa725ba6f93c3244e2d77a1e3581
Author: Josef Bacik <jbacik at redhat.com>
Date: Fri Jun 6 18:05:52 2008 -0400
ext4: fix online resize bug
There is a bug when we are trying to verify that the reserve inode's
double indirect blocks point back to the primary gdt blocks. The fix is
obvious, we need to mod the gdb count by the addr's per block. This was
verified using the same testcase as with the ext3 equivalent of this
patch.
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 0bf7e8379ce7e0159a2a6bd3d937f2f6ada79799
Author: Jose R. Santos <jrs at us.ibm.com>
Date: Tue Jun 3 14:07:29 2008 -0400
ext4: Fix uninit block group initialization with FLEX_BG
With FLEX_BG block bitmaps, inode bitmaps and inode tables _MAY_ be
allocated outside the group. So, when initializing an uninitialized
block bitmap, we need to check the location of this blocks before
setting the corresponding bits in the block bitmap of the newly
initialized group. Also return the right number of free blocks when
counting the available free blocks in uninit group.
Tested-by: Aneesh Kumar K.V <aneesh.kumar at inux.vnet.ibm.com>
Signed-off-by: Jose R. Santos <jrs at us.ibm.com>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 03cddb80ed2dacaf03c370d38bcc75f8303a03b8
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Thu Jun 5 20:59:29 2008 -0400
ext4: Fix use of uninitialized data with debug enabled.
Fix use of uninitialized data with debug enabled.
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 5132861a7a44498ebb18357473f8b8d4cdc70e9f
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu May 22 09:33:34 2008 -0400
disable most mode changes on non-unix/non-cifsacl mounts
CIFS currently allows you to change the mode of an inode on a share that
doesn't have unix extensions enabled, and isn't using cifsacl. The inode
in this case *only* has its mode changed in memory on the client. This
is problematic since it can change any time the inode is purged from the
cache.
This patch makes cifs_setattr silently ignore most mode changes when
unix extensions and cifsacl support are not enabled, and when the share
is not mounted with the "dynperm" option. The exceptions are:
When a mode change would remove all write access to an inode we turn on
the ATTR_READONLY bit on the server and remove all write bits from the
inode's mode in memory.
When a mode change would add a write bit to an inode that previously had
them all turned off, it turns off the ATTR_READONLY bit on the server,
and resets the mode back to what it would normally be (generally, the
file_mode or dir_mode of the share).
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 4efeb4dd3c0bf534e431a8e7c72d0afbd4cd24aa
Author: Yinghai Lu <Yinghai.Lu at Sun.COM>
Date: Mon May 12 21:21:05 2008 +0200
PCI: use dev_to_node in pci_call_probe
to make sure get one online node.
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 b7206153f61bb63ee2cffa63905b57ec01d20e6e
Author: Steve French <sfrench at us.ibm.com>
Date: Fri May 23 20:35:07 2008 +0000
[CIFS] Correct incorrect obscure open flag
Also add defines for pipe subcommand codes
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 27adb44c4f671d15932eb0702a09d27244a8a7c1
Author: Steve French <sfrench at us.ibm.com>
Date: Fri May 23 19:43:29 2008 +0000
[CIFS] warn if both dynperm and cifsacl mount options specified
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 4ca691a892e8ab4f79583de1394f17a7dcfa2b57
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu May 22 09:33:34 2008 -0400
silently ignore ownership changes unless unix extensions are enabled or we're faking uid changes
CIFS currently allows you to change the ownership of a file, but unless
unix extensions are enabled this change is not passed off to the server.
Have CIFS silently ignore ownership changes that can't be persistently
stored on the server unless the "setuids" option is explicitly
specified.
We could return an error here (-EOPNOTSUPP or something), but this is
how most disk-based windows filesystems on behave on Linux (e.g. VFAT,
NTFS, etc). With cifsacl support and proper Windows to Unix idmapping
support, we may be able to do this more properly in the future.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 4e94a105ed0df78e25b20ff8ed6761f5937662b1
Author: Steve French <sfrench at us.ibm.com>
Date: Fri May 23 18:22:46 2008 +0000
[CIFS] remove trailing whitespace
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit b0fd30d3e7e768aad5e398caaea6ae5a5c814eab
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu May 22 09:33:34 2008 -0400
when creating new inodes, use file_mode/dir_mode exclusively on mount without unix extensions
When CIFS creates a new inode on a mount without unix extensions, it
temporarily assigns the mode that was passed to it in the create/mkdir
call. Eventually, when the inode is revalidated, it changes to have the
file_mode or dir_mode for the mount. This is confusing to users who
expect that the mode shouldn't change this way. It's also problematic
since only the mode is treated this way, not the uid or gid. Suppose you
have a CIFS mount that's mounted with:
uid=0,gid=0,file_mode=0666,dir_mode=0777
...if an unprivileged user comes along and does this on the mount:
mkdir -m 0700 foo
touch foo/bar
...there is a period of time where the touch will fail, since the dir
will initially be owned by root and have mode 0700. If the user waits
long enough, then "foo" will be revalidated and will get the correct
dir_mode permissions.
This patch changes cifs_mkdir and cifs_create to not overwrite the
mode found by the initial cifs_get_inode_info call after the inode is
created on the server. Legacy behavior can be reenabled with the
new "dynperm" mount option.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 4468eb3fd102cad559e51594a01cbc65b994d264
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu May 22 09:31:40 2008 -0400
on non-posix shares, clear write bits in mode when ATTR_READONLY is set
When mounting a share with posix extensions disabled,
cifs_get_inode_info turns off all the write bits in the mode for regular
files if ATTR_READONLY is set. Directories and other inode types,
however, can also have ATTR_READONLY set, but the mode gives no
indication of this.
This patch makes this apply to other inode types besides regular files.
It also cleans up how modes are set in cifs_get_inode_info for both the
"normal" and "dynperm" cases.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit aaa9bbe039febf1d3a0f3a374deea0680d9f5758
Author: Steve French <sfrench at us.ibm.com>
Date: Fri May 23 17:38:32 2008 +0000
[CIFS] remove unused variables
CC: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit a1676072558854b95336c8f7db76b0504e909a0a
Author: Tony Camuso <tcamuso at redhat.com>
Date: Thu May 15 14:40:14 2008 -0400
PCI: Correct last two HP entries in the bfsort whitelist
Greetings.
There is a code flaw in the bfsort whitelist, where there are redundant
entries for the same two HP systems, DL385 G2 and DL585 G2. This patch
replaces those redundant entries with the correct ones. The correct
entries are for large-volume systems, the DL360 and DL380.
-----------------------------------------------------------------------
commit ec69f0374c3b0ad7ea991b0e9ac00377acfe5b1a
Author: Tony Camuso <tony.camuso at hp.com>
Date: Wed May 14 07:09:28 2008 -0400
Replace Redundant Whitelist Entries with the Correct Ones
The ProLiant DL585 G2 and the DL585 G2 are entered reundantly
in the dmi_system_id table. What should have been there are the
DL360 and DL380. This patch simply replaces the redundant
entries with the correct entries.
arch/x86/pci/common.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Signed-off-by: Tony Camuso <tony.camuso at hp.com>
Signed-off-by: Pat Schoeller <patrick.schoeller at hp.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
More information about the commitlog
mailing list