Linux 2.6.31.5
Subsystems (36)
I'm announcing the release of the 2.6.31.5 kernel. All users of the 2.6.31 kernel series are very strongly encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.31.4 and 2.6.31.5
The updated 2.6.31.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.31.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.31.y.git;a=summarythanks,
greg k-h
------------
Documentation/connector/cn_test.c | 4 Documentation/connector/connector.txt | 8 MAINTAINERS | 2 Makefile | 7 arch/arm/Makefile | 2 arch/arm/kernel/Makefile | 3 arch/arm/mach-pxa/cpufreq-pxa2xx.c | 2 arch/cris/Makefile | 2 arch/cris/kernel/Makefile | 1 arch/mips/Makefile | 27 - arch/mips/kernel/vmlinux.lds.S | 13 arch/powerpc/Makefile | 2 arch/sparc/Makefile | 4 arch/sparc/kernel/Makefile | 6 arch/um/Makefile | 9 arch/um/kernel/Makefile | 3 arch/um/kernel/vmlinux.lds.S | 3 arch/x86/include/asm/paravirt.h | 38 -- arch/xtensa/kernel/Makefile | 3 drivers/char/tpm/tpm.c | 8 drivers/char/tty_buffer.c | 29 - drivers/connector/cn_proc.c | 3 drivers/connector/cn_queue.c | 15 drivers/connector/connector.c | 24 - drivers/i2c/busses/i2c-amd756.c | 2 drivers/i2c/busses/i2c-amd8111.c | 4 drivers/i2c/busses/i2c-i801.c | 4 drivers/i2c/busses/i2c-isch.c | 2 drivers/i2c/busses/i2c-piix4.c | 4 drivers/i2c/busses/i2c-sis96x.c | 2 drivers/i2c/busses/i2c-viapro.c | 2 drivers/macintosh/therm_adt746x.c | 4 drivers/macintosh/therm_pm72.c | 4 drivers/macintosh/windfarm_lm75_sensor.c | 4 drivers/macintosh/windfarm_max6690_sensor.c | 4 drivers/macintosh/windfarm_smu_sat.c | 4 drivers/md/dm-log-userspace-transfer.c | 6 drivers/net/e1000e/82571.c | 4 drivers/net/wireless/iwlwifi/iwl-eeprom.c | 23 - drivers/pci/dmar.c | 22 + drivers/scsi/scsi.c | 11 drivers/scsi/scsi_error.c | 3 drivers/scsi/sg.c | 10 drivers/staging/dst/dcore.c | 8 drivers/staging/pohmelfs/config.c | 6 drivers/staging/rt2860/common/cmm_data_2860.c | 2 drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/digi_acceleport.c | 8 drivers/usb/serial/ftdi_sio.c | 422 +++++++------------------- drivers/usb/serial/generic.c | 2 drivers/usb/serial/ipaq.c | 9 drivers/usb/serial/option.c | 2 drivers/usb/serial/pl2303.c | 8 drivers/usb/serial/usb-serial.c | 6 drivers/usb/storage/transport.c | 46 ++ drivers/video/uvesafb.c | 6 drivers/w1/w1_netlink.c | 3 fs/sysfs/file.c | 14 include/linux/connector.h | 11 include/linux/usb/serial.h | 1 include/net/bluetooth/hci_core.h | 4 kernel/acct.c | 8 kernel/futex.c | 39 +- kernel/trace/trace_events_filter.c | 3 net/bluetooth/hci_conn.c | 17 - net/bluetooth/hci_event.c | 2 net/bluetooth/hidp/core.c | 65 ++-- net/bluetooth/hidp/hidp.h | 2 net/mac80211/rx.c | 10 net/mac80211/sta_info.c | 2 net/mac80211/tx.c | 3 scripts/Makefile.build | 3 sound/aoa/codecs/tas.c | 9 sound/ppc/keywest.c | 12 74 files changed, 525 insertions(+), 546 deletions(-)
Alan Stern (3):
USB: serial: don't call release without attach
USB: ipaq: fix oops when device is plugged in
USB: storage: When a device returns no sense data, call it a Hardware Error
Alexander Duyck (1):
e1000e: swap max hw supported frame size between 82574 and 82583
Benjamin Herrenschmidt (1):
usb-storage: Workaround devices with bogus sense size
Christof Schmitt (1):
SCSI: sg: Free data buffers after calling blk_rq_unmap_user
Darren Hart (2):
futex: Detect mismatched requeue targets
futex: Fix wakeup race by setting TASK_INTERRUPTIBLE before queue_me()
Darren Salt (1):
Staging: rt2860sta: prevent a panic when disabling when associated
David Woodhouse (1):
intel-iommu: Cope with broken HP DC7900 BIOS
Dennis O'Brien (1):
ARM: pxa: workaround errata #37 by not using half turbo switching
Greg Kroah-Hartman (1):
Linux 2.6.31.5
Hannes Reinecke (1):
SCSI: Retry ADD_TO_MLQUEUE return value for EH commands
Jason Gunthorpe (1):
tpm-fixup-pcrs-sysfs-file-update
Jay Sternberg (1):
iwlwifi: incorrect method used for finding valid OTP blocks
Jean Delvare (3):
MAINTAINERS: Fix Riku Voipio's address
macintosh: Don't assume i2c device probing always succeeds
i2c: Hide probe errors caused by ACPI resource conflicts
Jeremy Fitzhardinge (1):
x86/paravirt: Use normal calling sequences for irq enable/disable
Johan Hovold (6):
USB: ftdi_sio: remove tty->low_latency
USB: ftdi_sio: remove unused rx_byte counter
USB: ftdi_sio: clean up read completion handler
USB: ftdi_sio: re-implement read processing
USB: pl2303: fix error characters not being reported to ldisc
USB: digi_acceleport: Fix broken unthrottle.
Johannes Berg (1):
mac80211: fix vlan and optimise RX
Joris van Rantwijk (1):
USB: Fix throttling in generic usbserial driver
Li Zefan (1):
tracing/filters: Fix memory leak when setting a filter
Linus Torvalds (1):
tty: Make flush_to_ldisc() locking more robust
Marcel Holtmann (3):
Bluetooth: Disconnect HIDRAW devices on disconnect
Bluetooth: Add extra device reference counting for connections
Bluetooth: Let HIDP grab the device reference for connections
Martin K. Petersen (1):
SCSI: Fix protection scsi_data_buffer leak
Michal Schmidt (1):
bsdacct: switch credentials for writing to the accounting file
Neil Brown (1):
sysfs: Allow sysfs_notify_dirent to be called from interrupt context.
Peter Magdina (1):
USB: option: Toshiba G450 device id
Philipp Reisner (7):
connector: Keep the skb in cn_callback_data
connector: Provide the sender's credentials to the callback
connector: Removed the destruct_data callback since it is always kfree_skb() dm/connector: Only process connector packages from privileged processes dst/connector: Disallow unpliviged users to configure dst pohmelfs/connector: Disallow unpliviged users to configure pohmelfs uvesafb/connector: Disallow unpliviged users to send netlink packets
Rajiv Andrade (1):
TPM: fix pcrread
Sam Ravnborg (1):
arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0
Takashi Iwai (1):
ALSA: Don't assume i2c device probing always succeeds
Éric Piel (1):
USB: cp210x: Add support for the DW700 UART
Documentation/connector/cn_test.c +1 -3
@@ -32,10 +32,8 @@ static char cn_test_name[] = "cn_test";static struct sock *nls;static struct timer_list cn_test_timer; -void cn_test_callback (void *data) +static void cn_test_callback (struct cn_msg *msg,struct netlink_skb_parms *nsp) { -struct cn_msg *msg = (struct cn_msg *)data; -printk ("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n" , __func__, jiffies, msg->id.idx, msg->id.val, msg->seq, msg->ack, msg->len, (char *)msg->data);
Documentation/connector/connector.txt +4 -4
@@ -23,7 +23,7 @@ handling... Connector allows any kernelspace agents to use netlink based networking for inter-process communication in a significantly easier way: -int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *)); +int cn_add_callback(struct cb_id *id, char *name, void (*callback) (struct cn_msg *, struct netlink_skb_parms *)); void cn_netlink_send(struct cn_msg *msg, u32 __group, int gfp_mask); struct cb_id
@@ -53,15 +53,15 @@ struct cn_msg Connector interfaces. /*****************************************/ -int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *)); +int cn_add_callback(struct cb_id *id, char *name, void (*callback) (struct cn_msg *, struct netlink_skb_parms *)); Registers new callback with connector core. struct cb_id *id - unique connector's user identifier. It must be registered in connector.h for legal in-kernel users. char *name - connector's callback symbolic name. -void (*callback) (void *) - connector's callback. - Argument must be dereferenced to struct cn_msg *. +void (*callback) (struct cn..) - connector's callback. + cn_msg and the sender's credentials void cn_del_callback(struct cb_id *id);
MAINTAINERS +1 -1
@@ -1992,7 +1992,7 @@ S: Maintained F: fs/* FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER -M: Riku Voipio <[email protected]> +M: Riku Voipio <[email protected]> L: [email protected] S: Maintained F: drivers/hwmon/f75375s.c
Makefile +1 -6
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 31 -EXTRAVERSION = .4 +EXTRAVERSION = .5 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
@@ -980,11 +980,6 @@ prepare0: archprepare FORCE # All the preparing.. prepare: prepare0 -# Leave this as default for preprocessing vmlinux.lds.S, which is now -# done in arch/$(ARCH)/kernel/Makefile - -export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH) - # The asm symlink changes when $(ARCH) changes. # Detect this and ask user to run make mrproper # If asm is a stale symlink (point to dir that does not exist) remove it
arch/arm/Makefile +1 -1
@@ -14,7 +14,7 @@ LDFLAGS_vmlinux :=-p --no-undefined -X ifeq ($(CONFIG_CPU_ENDIAN_BE8),y) LDFLAGS_vmlinux += --be8 endif -CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) + OBJCOPYFLAGS :=-O binary -R .note -R .note.gnu.build-id -R .comment -S GZFLAGS :=-9 #KBUILD_CFLAGS +=-pipe
arch/arm/kernel/Makefile +2 -1
@@ -2,7 +2,8 @@ # Makefile for the linux kernel. # -AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET) +CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET) +AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET) ifdef CONFIG_DYNAMIC_FTRACE CFLAGS_REMOVE_ftrace.o = -pg
arch/arm/mach-pxa/cpufreq-pxa2xx.c +1 -1
@@ -155,7 +155,7 @@ MODULE_PARM_DESC(pxa255_turbo_table, "Selects the frequency table (0 = run tablestatic pxa_freqs_t pxa27x_freqs[] = { {104000 ,104000 ,PXA27x_CCCR (1 ,8 ,2 ),0 ,CCLKCFG2 (1 ,0 ,1 ),900000 ,1705000 }, - {156000 ,104000 ,PXA27x_CCCR (1 ,8 ,6 ),0 ,CCLKCFG2 (1 ,1 ,1 ),1000000 ,1705000 }, + {156000 ,104000 ,PXA27x_CCCR (1 ,8 ,3 ),0 ,CCLKCFG2 (1 ,0 ,1 ),1000000 ,1705000 }, {208000 ,208000 ,PXA27x_CCCR (0 ,16 ,2 ),1 ,CCLKCFG2 (0 ,0 ,1 ),1180000 ,1705000 }, {312000 ,208000 ,PXA27x_CCCR (1 ,16 ,3 ),1 ,CCLKCFG2 (1 ,0 ,1 ),1250000 ,1705000 }, {416000 ,208000 ,PXA27x_CCCR (1 ,16 ,4 ),1 ,CCLKCFG2 (1 ,0 ,1 ),1350000 ,1705000 },
arch/cris/Makefile +0 -2
@@ -42,8 +42,6 @@ LD = $(CROSS_COMPILE)ld -mcrislinux OBJCOPYFLAGS := -O binary -R .note -R .comment -S -CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) - KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc) KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc) KBUILD_CPPFLAGS += $(inc)
arch/cris/kernel/Makefile +1 -0
@@ -3,6 +3,7 @@ # Makefile for the linux kernel. # +CPPFLAGS_vmlinux.lds := -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) extra-y := vmlinux.lds obj-y := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o
arch/mips/Makefile +3 -24
@@ -615,16 +615,6 @@ endif cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic drivers-$(CONFIG_PCI) += arch/mips/pci/ -ifdef CONFIG_32BIT -ifdef CONFIG_CPU_LITTLE_ENDIAN -JIFFIES = jiffies_64 -else -JIFFIES = jiffies_64 + 4 -endif -else -JIFFIES = jiffies_64 -endif - # # Automatically detect the build format. By default we choose # the elf format according to the load address.
@@ -648,8 +638,9 @@ ifdef CONFIG_64BIT endif KBUILD_AFLAGS += $(cflags-y) -KBUILD_CFLAGS += $(cflags-y) \ - -D"VMLINUX_LOAD_ADDRESS=$(load-y)" +KBUILD_CFLAGS += $(cflags-y) +KBUILD_CPPFLAGS += -D"VMLINUX_LOAD_ADDRESS=$(load-y)" +KBUILD_CPPFLAGS += -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)" LDFLAGS += -m $(ld-emul)
@@ -664,18 +655,6 @@ endif OBJCOPYFLAGS += --remove-section=.reginfo -# -# Choosing incompatible machines durings configuration will result in -# error messages during linking. Select a default linkscript if -# none has been choosen above. -# - -CPPFLAGS_vmlinux.lds := \ - $(KBUILD_CFLAGS) \ - -D"LOADADDR=$(load-y)" \ - -D"JIFFIES=$(JIFFIES)" \ - -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)" - head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o libs-y += arch/mips/lib/
arch/mips/kernel/vmlinux.lds.S +11 -2
@@ -9,7 +9,16 @@ PHDRS { text PT_LOAD FLAGS(7); /* RWX */ note PT_NOTE FLAGS(4); /* R__ */ } -jiffies = JIFFIES; + +ifdef CONFIG_32BIT + ifdef CONFIG_CPU_LITTLE_ENDIAN + jiffies = jiffies_64; + else + jiffies = jiffies_64 + 4; + endif +else + jiffies = jiffies_64; +endif SECTIONS {
@@ -28,7 +37,7 @@ SECTIONS /* . = 0xa800000000300000; */ . = 0xffffffff80300000; #endif - . = LOADADDR; + . = VMLINUX_LOAD_ADDRESS; /* read-only */ _text = .; /* Text and read-only data */ .text : {
arch/powerpc/Makefile +0 -2
@@ -158,8 +158,6 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ # Default to zImage, override when needed all: zImage -CPPFLAGS_vmlinux.lds := -Upowerpc - BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.% PHONY += $(BOOT_TARGETS)
arch/sparc/Makefile +0 -4
@@ -31,7 +31,6 @@ export BITS := 32 #KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7 KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7 KBUILD_AFLAGS += -m32 -CPPFLAGS_vmlinux.lds += -m32 #LDFLAGS_vmlinux = -N -Ttext 0xf0004000 # Since 2.5.40, the first stage is left not btfix-ed.
@@ -49,9 +48,6 @@ else CHECKFLAGS += -D__sparc__ -D__sparc_v9__ -D__arch64__ -m64 -# Undefine sparc when processing vmlinux.lds - it is used -# And teach CPP we are doing 64 bit builds (for this case) -CPPFLAGS_vmlinux.lds += -m64 -Usparc LDFLAGS := -m elf64_sparc export BITS := 64
arch/sparc/kernel/Makefile +5 -1
@@ -7,7 +7,11 @@ ccflags-y := -Werror extra-y := head_$(BITS).o extra-y += init_task.o -extra-y += vmlinux.lds + +# Undefine sparc when processing vmlinux.lds - it is used +# And teach CPP we are doing $(BITS) builds (for this case) +CPPFLAGS_vmlinux.lds := -Usparc -m$(BITS) +extra-y += vmlinux.lds obj-$(CONFIG_SPARC32) += entry.o wof.o wuf.o obj-$(CONFIG_SPARC32) += etrap_32.o
arch/um/Makefile +4 -5
@@ -96,11 +96,10 @@ CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) $(call cc-option, -fno-stack-protector,) \ $(call cc-option, -fno-stack-protector-all,) -CONFIG_KERNEL_STACK_ORDER ?= 2 -STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] ) - -CPPFLAGS_vmlinux.lds = -U$(SUBARCH) -DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \ - -DELF_FORMAT="$(ELF_FORMAT)" -DKERNEL_STACK_SIZE=$(STACK_SIZE) +# Options used by linker script +export LDS_START := $(START) +export LDS_ELF_ARCH := $(ELF_ARCH) +export LDS_ELF_FORMAT := $(ELF_FORMAT) # The wrappers will select whether using "malloc" or the kernel allocator. LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
arch/um/kernel/Makefile +3 -0
@@ -3,6 +3,9 @@ # Licensed under the GPL # +CPPFLAGS_vmlinux.lds := -U$(SUBARCH) -DSTART=$(LDS_START) \ + -DELF_ARCH=$(LDS_ELF_ARCH) \ + -DELF_FORMAT=$(LDS_ELF_FORMAT) extra-y := vmlinux.lds clean-files :=
arch/um/kernel/vmlinux.lds.S +3 -0
@@ -1,3 +1,6 @@ + +KERNEL_STACK_SIZE = 4096 * (1 << CONFIG_KERNEL_STACK_ORDER); + #ifdef CONFIG_LD_SCRIPT_STATIC #include "uml.lds.S" #else
arch/x86/include/asm/paravirt.h +10 -28
@@ -528,10 +528,11 @@ int paravirt_disable_iospace(void);#define EXTRA_CLOBBERS #define VEXTRA_CLOBBERS #else /* CONFIG_X86_64 */ +/* [re]ax isn't an arg, but the return val */ #define PVOP_VCALL_ARGS \ unsigned long __edi = __edi, __esi = __esi, \ - __edx = __edx, __ecx = __ecx -#define PVOP_CALL_ARGS PVOP_VCALL_ARGS, __eax + __edx = __edx, __ecx = __ecx, __eax = __eax +#define PVOP_CALL_ARGS PVOP_VCALL_ARGS#define PVOP_CALL_ARG1 (x) "D" ((unsigned long)(x))#define PVOP_CALL_ARG2 (x) "S" ((unsigned long)(x))
@@ -543,6 +544,7 @@ int paravirt_disable_iospace(void); "=c" (__ecx)#define PVOP_CALL_CLOBBERS PVOP_VCALL_CLOBBERS, "=a" (__eax) +/* void functions are still allowed [re]ax for scratch */ #define PVOP_VCALLEE_CLOBBERS "=a" (__eax)#define PVOP_CALLEE_CLOBBERS PVOP_VCALLEE_CLOBBERS
@@ -617,8 +619,8 @@ int paravirt_disable_iospace(void); VEXTRA_CLOBBERS, \ pre, post, ##__VA_ARGS__) -#define __PVOP_VCALLEESAVE (rettype, op, pre, post, ...) \ - ____PVOP_CALL(rettype, op.func, CLBR_RET_REG, \ +#define __PVOP_VCALLEESAVE (op, pre, post, ...) \ + ____PVOP_VCALL(op.func, CLBR_RET_REG, \ PVOP_VCALLEE_CLOBBERS, , \ pre, post, ##__VA_ARGS__)
@@ -1565,42 +1567,22 @@ extern struct paravirt_patch_site __parainstructions[],static inline unsigned long __raw_local_save_flags (void ) { -unsigned long f; - - asm volatile(paravirt_alt(PARAVIRT_CALL) - : "=a"(f) - : paravirt_type(pv_irq_ops.save_fl), - paravirt_clobber(CLBR_EAX) - : "memory", "cc"); -return f; + return PVOP_CALLEE0(unsigned long, pv_irq_ops.save_fl); }static inline void raw_local_irq_restore (unsigned long f) { - asm volatile(paravirt_alt(PARAVIRT_CALL) - : "=a"(f) - : PV_FLAGS_ARG(f), - paravirt_type(pv_irq_ops.restore_fl), - paravirt_clobber(CLBR_EAX) - : "memory", "cc"); +PVOP_VCALLEE1 (pv_irq_ops.restore_fl, f); }static inline void raw_local_irq_disable (void ) { - asm volatile(paravirt_alt(PARAVIRT_CALL) - : - : paravirt_type(pv_irq_ops.irq_disable), - paravirt_clobber(CLBR_EAX) - : "memory", "eax", "cc"); +PVOP_VCALLEE0 (pv_irq_ops.irq_disable); }static inline void raw_local_irq_enable (void ) { - asm volatile(paravirt_alt(PARAVIRT_CALL) - : - : paravirt_type(pv_irq_ops.irq_enable), - paravirt_clobber(CLBR_EAX) - : "memory", "eax", "cc"); +PVOP_VCALLEE0 (pv_irq_ops.irq_enable); }static inline unsigned long __raw_local_irq_save (void )
arch/xtensa/kernel/Makefile +2 -1
@@ -27,7 +27,8 @@ sed-y = -e 's/(\(\.[a-z]*it\|\.ref\|\)\.text)/(\1.literal \1.text)/g' \ -e 's/(\(\.text\.[a-z]*\))/(\1.literal \1)/g' quiet_cmd__cpp_lds_S = LDS $@ - cmd__cpp_lds_S = $(CPP) $(cpp_flags) -D__ASSEMBLY__ $< | sed $(sed-y) >$@ + cmd__cpp_lds_S = $(CPP) $(cpp_flags) -P -C -Uxtensa -D__ASSEMBLY__ $< \ + | sed $(sed-y) >$@ $(obj)/vmlinux.lds: $(src)/vmlinux.lds.S FORCE $(call if_changed_dep,_cpp_lds_S)
drivers/char/tpm/tpm.c +3 -5
@@ -696,8 +696,7 @@ int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) cmd.header.in = pcrread_header; cmd.params.pcrread_in.pcr_idx =cpu_to_be32 (pcr_idx); -BUILD_BUG_ON (cmd.header.in.length >READ_PCR_RESULT_SIZE ); - rc =transmit_cmd (chip, &cmd, cmd.header.in.length, + rc =transmit_cmd (chip, &cmd,READ_PCR_RESULT_SIZE ,"attempting to read a pcr value" );if (rc ==0 )
@@ -742,7 +741,7 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read);* the module usage count. */ #define TPM_ORD_PCR_EXTEND cpu_to_be32(20) -#define EXTEND_PCR_SIZE 34 +#define EXTEND_PCR_RESULT_SIZE 34static struct tpm_input_header pcrextend_header = { .tag =TPM_TAG_RQU_COMMAND , .length =cpu_to_be32 (34 ),
@@ -760,10 +759,9 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)return -ENODEV ; cmd.header.in = pcrextend_header; -BUILD_BUG_ON (be32_to_cpu (cmd.header.in.length) >EXTEND_PCR_SIZE ); cmd.params.pcrextend_in.pcr_idx =cpu_to_be32 (pcr_idx);memcpy (cmd.params.pcrextend_in.hash, hash,TPM_DIGEST_SIZE ); - rc =transmit_cmd (chip, &cmd, cmd.header.in.length, + rc =transmit_cmd (chip, &cmd,EXTEND_PCR_RESULT_SIZE ,"attempting extend a PCR value" );module_put (chip->dev->driver->owner);
drivers/char/tty_buffer.c +13 -16
@@ -402,28 +402,26 @@ static void flush_to_ldisc(struct work_struct *work) container_of(work, struct tty_struct, buf.work.work);unsigned long flags;struct tty_ldisc *disc; -struct tty_buffer *tbuf, *head; -char *char_buf; -unsigned char *flag_buf; disc =tty_ldisc_ref (tty);if (disc ==NULL )/* !TTY_LDISC */ return ;spin_lock_irqsave (&tty->buf.lock, flags); -/* So we know a flush is running */ -set_bit (TTY_FLUSHING , &tty->flags); - head = tty->buf.head; -if (head !=NULL ) { - tty->buf.head =NULL ; -for (;;) { -int count = head->commit - head->read; + +if (!test_and_set_bit (TTY_FLUSHING , &tty->flags)) { +struct tty_buffer *head; +while ((head = tty->buf.head) !=NULL ) { +int count; +char *char_buf; +unsigned char *flag_buf; + + count = head->commit - head->read;if (!count) {if (head->next ==NULL )break ; - tbuf = head; - head = head->next; -tty_buffer_free (tty, tbuf); + tty->buf.head = head->next; +tty_buffer_free (tty, head);continue ; }/* Ldisc or user is trying to flush the buffers
@@ -445,9 +443,9 @@ static void flush_to_ldisc(struct work_struct *work) flag_buf, count);spin_lock_irqsave (&tty->buf.lock, flags); } -/* Restore the queue head */ - tty->buf.head = head; +clear_bit (TTY_FLUSHING , &tty->flags); } +/* We may have a deferred request to flush the input buffer, if so pull the chain under the lock and empty the queue */ if (test_bit (TTY_FLUSHPENDING , &tty->flags)) {
@@ -455,7 +453,6 @@ static void flush_to_ldisc(struct work_struct *work)clear_bit (TTY_FLUSHPENDING , &tty->flags);wake_up (&tty->read_wait); } -clear_bit (TTY_FLUSHING , &tty->flags);spin_unlock_irqrestore (&tty->buf.lock, flags);tty_ldisc_deref (disc);
drivers/connector/cn_proc.c +1 -2
@@ -202,9 +202,8 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)* cn_proc_mcast_ctl * @data: message sent from userspace via the connector */ -static void cn_proc_mcast_ctl (void *data) +static void cn_proc_mcast_ctl (struct cn_msg *msg,struct netlink_skb_parms *nsp) { -struct cn_msg *msg = data;enum proc_cn_mcast_op *mc_op =NULL ;int err =0 ;
drivers/connector/cn_queue.c +10 -5
@@ -78,16 +78,20 @@ void cn_queue_wrapper(struct work_struct *work)struct cn_callback_entry *cbq = container_of(work, struct cn_callback_entry, work);struct cn_callback_data *d = &cbq->data; +struct cn_msg *msg =NLMSG_DATA (nlmsg_hdr (d->skb)); +struct netlink_skb_parms *nsp = &NETLINK_CB (d->skb); - d->callback (d->callback_priv); + d->callback (msg, nsp); - d->destruct_data (d->ddata); - d->ddata =NULL ; +kfree_skb (d->skb); + d->skb =NULL ;kfree (d->free); } -static struct cn_callback_entry *cn_queue_alloc_callback_entry (char *name,struct cb_id *id,void (*callback)(void *)) +static struct cn_callback_entry * +cn_queue_alloc_callback_entry (char *name,struct cb_id *id, +void (*callback)(struct cn_msg *,struct netlink_skb_parms *)) {struct cn_callback_entry *cbq;
@@ -120,7 +124,8 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2)return ((i1->idx == i2->idx) && (i1->val == i2->val)); } -int cn_queue_add_callback (struct cn_queue_dev *dev,char *name,struct cb_id *id,void (*callback)(void *)) +int cn_queue_add_callback (struct cn_queue_dev *dev,char *name,struct cb_id *id, +void (*callback)(struct cn_msg *,struct netlink_skb_parms *)) {struct cn_callback_entry *cbq, *__cbq;int found =0 ;
drivers/connector/connector.c +9 -15
@@ -129,21 +129,19 @@ EXPORT_SYMBOL_GPL(cn_netlink_send);/* * Callback helper - queues work and setup destructor for given data. */ -static int cn_call_callback (struct cn_msg *msg,void (*destruct_data)(void *),void *data) +static int cn_call_callback (struct sk_buff *skb) {struct cn_callback_entry *__cbq, *__new_cbq;struct cn_dev *dev = &cdev; +struct cn_msg *msg =NLMSG_DATA (nlmsg_hdr (skb));int err = -ENODEV ;spin_lock_bh (&dev->cbdev->queue_lock);list_for_each_entry (__cbq, &dev->cbdev->queue_list, callback_entry) {if (cn_cb_equal (&__cbq->id.id, &msg->id)) {if (likely (!work_pending (&__cbq->work) && - __cbq->data.ddata ==NULL )) { - __cbq->data.callback_priv = msg; - - __cbq->data.ddata = data; - __cbq->data.destruct_data = destruct_data; + __cbq->data.skb ==NULL )) { + __cbq->data.skb = skb;if (queue_cn_work (__cbq, &__cbq->work)) err =0 ;
@@ -156,10 +154,8 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v __new_cbq =kzalloc (sizeof (struct cn_callback_entry ),GFP_ATOMIC );if (__new_cbq) { d = &__new_cbq->data; - d->callback_priv = msg; + d->skb = skb; d->callback = __cbq->data.callback; - d->ddata = data; - d->destruct_data = destruct_data; d->free = __new_cbq; __new_cbq->pdev = __cbq->pdev;
@@ -191,7 +187,6 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v*/ static void cn_rx_skb (struct sk_buff *__skb) { -struct cn_msg *msg;struct nlmsghdr *nlh;int err;struct sk_buff *skb;
@@ -208,8 +203,7 @@ static void cn_rx_skb(struct sk_buff *__skb)return ; } - msg =NLMSG_DATA (nlh); - err =cn_call_callback (msg, (void (*)(void *))kfree_skb, skb); + err =cn_call_callback (skb);if (err <0 )kfree_skb (skb); }
@@ -269,7 +263,8 @@ static void cn_notify(struct cb_id *id, u32 notify_event)* * May sleep. */ -int cn_add_callback (struct cb_id *id,char *name,void (*callback)(void *)) +int cn_add_callback (struct cb_id *id,char *name, +void (*callback)(struct cn_msg *,struct netlink_skb_parms *)) {int err;struct cn_dev *dev = &cdev;
@@ -351,9 +346,8 @@ static int cn_ctl_msg_equals(struct cn_ctl_msg *m1, struct cn_ctl_msg *m2)* * Used for notification of a request's processing. */ -static void cn_callback (void *data) +static void cn_callback (struct cn_msg *msg,struct netlink_skb_parms *nsp) { -struct cn_msg *msg = data;struct cn_ctl_msg *ctl;struct cn_ctl_entry *ent;u32 size;
drivers/i2c/busses/i2c-amd756.c +1 -1
@@ -364,7 +364,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev, error =acpi_check_region (amd756_ioport,SMB_IOSIZE , amd756_driver.name);if (error) -return error; +return -ENODEV ;if (!request_region (amd756_ioport,SMB_IOSIZE , amd756_driver.name)) { dev_err(&pdev->dev, "SMB region 0x%x already in use!\n",
drivers/i2c/busses/i2c-amd8111.c +3 -1
@@ -376,8 +376,10 @@ static int __devinit amd8111_probe(struct pci_dev *dev, smbus->size =pci_resource_len (dev,0 ); error =acpi_check_resource_conflict (&dev->resource[0 ]); -if (error) +if (error) { + error = -ENODEV ; goto out_kfree; + }if (!request_region (smbus->base, smbus->size, amd8111_driver.name)) { error = -EBUSY ;
drivers/i2c/busses/i2c-i801.c +3 -1
@@ -732,8 +732,10 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id } err =acpi_check_resource_conflict (&dev->resource[SMBBAR ]); -if (err) +if (err) { + err = -ENODEV ; goto exit; + } err =pci_request_region (dev,SMBBAR , i801_driver.name);if (err) {
drivers/i2c/busses/i2c-isch.c +1 -1
@@ -281,7 +281,7 @@ static int __devinit sch_probe(struct pci_dev *dev,return -ENODEV ; }if (acpi_check_region (sch_smba,SMBIOSIZE , sch_driver.name)) -return -EBUSY ; +return -ENODEV ;if (!request_region (sch_smba,SMBIOSIZE , sch_driver.name)) {dev_err (&dev->dev,"SMBus region 0x%x already in use!\n" , sch_smba);
drivers/i2c/busses/i2c-piix4.c +2 -2
@@ -168,7 +168,7 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, }if (acpi_check_region (piix4_smba,SMBIOSIZE , piix4_driver.name)) -return -EBUSY ; +return -ENODEV ;if (!request_region (piix4_smba,SMBIOSIZE , piix4_driver.name)) { dev_err(&PIIX4_dev->dev, "SMBus region 0x%x already in use!\n",
@@ -259,7 +259,7 @@ static int __devinit piix4_setup_sb800(struct pci_dev *PIIX4_dev, piix4_smba = ((smba_en_hi <<8 ) | smba_en_lo) &0xffe0 ;if (acpi_check_region (piix4_smba,SMBIOSIZE , piix4_driver.name)) -return -EBUSY ; +return -ENODEV ;if (!request_region (piix4_smba,SMBIOSIZE , piix4_driver.name)) { dev_err(&PIIX4_dev->dev, "SMBus region 0x%x already in use!\n",
drivers/i2c/busses/i2c-sis96x.c +1 -1
@@ -280,7 +280,7 @@ static int __devinit sis96x_probe(struct pci_dev *dev, retval =acpi_check_resource_conflict (&dev->resource[SIS96x_BAR]);if (retval) -return retval; +return -ENODEV ;/* Everything is happy, let's grab the memory and set things up. */ if (!request_region(sis96x_smbus_base, SMB_IOSIZE,
drivers/i2c/busses/i2c-viapro.c +1 -1
@@ -365,7 +365,7 @@ static int __devinit vt596_probe(struct pci_dev *pdev, found: error =acpi_check_region (vt596_smba,8 , vt596_driver.name);if (error) -return error; +return -ENODEV ;if (!request_region (vt596_smba,8 , vt596_driver.name)) { dev_err(&pdev->dev, "SMBus region 0x%x already in use!\n",
drivers/macintosh/therm_adt746x.c +3 -1
@@ -124,6 +124,8 @@ read_reg(struct thermostat* th, int reg)return data; } +static struct i2c_driver thermostat_driver; +static int attach_thermostat (struct i2c_adapter *adapter) {
@@ -148,7 +150,7 @@ attach_thermostat(struct i2c_adapter *adapter)* Let i2c-core delete that device on driver removal. * This is safe because i2c-core holds the core_lock mutex for us. */ -list_add_tail (&client->detected, &client->driver->clients); +list_add_tail (&client->detected, &thermostat_driver.clients);return 0 ; }
drivers/macintosh/therm_pm72.c +3 -1
@@ -286,6 +286,8 @@ struct fcu_fan_table fcu_fans[] = { }, }; +static struct i2c_driver therm_pm72_driver; +/* * Utility function to create an i2c_client structure and * attach it to one of u3 adapters
@@ -318,7 +320,7 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name)* Let i2c-core delete that device on driver removal. * This is safe because i2c-core holds the core_lock mutex for us. */ -list_add_tail (&clt->detected, &clt->driver->clients); +list_add_tail (&clt->detected, &therm_pm72_driver.clients);return clt; }
drivers/macintosh/windfarm_lm75_sensor.c +3 -1
@@ -115,6 +115,8 @@ static int wf_lm75_probe(struct i2c_client *client,return rc; } +static struct i2c_driver wf_lm75_driver; +static struct i2c_client *wf_lm75_create (struct i2c_adapter *adapter,u8 addr,int ds1775,const char *loc)
@@ -157,7 +159,7 @@ static struct i2c_client *wf_lm75_create(struct i2c_adapter *adapter,* Let i2c-core delete that device on driver removal. * This is safe because i2c-core holds the core_lock mutex for us. */ -list_add_tail (&client->detected, &client->driver->clients); +list_add_tail (&client->detected, &wf_lm75_driver.clients);return client; fail:return NULL ;
drivers/macintosh/windfarm_max6690_sensor.c +3 -1
@@ -88,6 +88,8 @@ static int wf_max6690_probe(struct i2c_client *client,return rc; } +static struct i2c_driver wf_max6690_driver; +static struct i2c_client *wf_max6690_create (struct i2c_adapter *adapter,u8 addr,const char *loc) {
@@ -119,7 +121,7 @@ static struct i2c_client *wf_max6690_create(struct i2c_adapter *adapter,* Let i2c-core delete that device on driver removal. * This is safe because i2c-core holds the core_lock mutex for us. */ -list_add_tail (&client->detected, &client->driver->clients); +list_add_tail (&client->detected, &wf_max6690_driver.clients);return client; fail:
drivers/macintosh/windfarm_smu_sat.c +3 -1
@@ -194,6 +194,8 @@ static struct wf_sensor_ops wf_sat_ops = { .owner = THIS_MODULE, }; +static struct i2c_driver wf_sat_driver; +static void wf_sat_create (struct i2c_adapter *adapter,struct device_node *dev) {struct i2c_board_info info;
@@ -222,7 +224,7 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev)* Let i2c-core delete that device on driver removal. * This is safe because i2c-core holds the core_lock mutex for us. */ -list_add_tail (&client->detected, &client->driver->clients); +list_add_tail (&client->detected, &wf_sat_driver.clients); } static int wf_sat_probe(struct i2c_client *client,
drivers/md/dm-log-userspace-transfer.c +4 -2
@@ -129,11 +129,13 @@ static int fill_pkg(struct cn_msg *msg, struct dm_ulog_request *tfr)* This is the connector callback that delivers data * that was sent from userspace. */ -static void cn_ulog_callback (void *data) +static void cn_ulog_callback (struct cn_msg *msg,struct netlink_skb_parms *nsp) { -struct cn_msg *msg = (struct cn_msg *)data;struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg +1 ); +if (!cap_raised (nsp->eff_cap,CAP_SYS_ADMIN )) +return ; +spin_lock (&receiving_list_lock);if (msg->len ==0 )fill_pkg (msg,NULL );
drivers/net/e1000e/82571.c +2 -2
@@ -1803,7 +1803,7 @@ struct e1000_info e1000_82574_info = { | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD, .pba = 20, - .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN, + .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_82571, .mac_ops = &e82571_mac_ops, .phy_ops = &e82_phy_ops_bm,
@@ -1820,7 +1820,7 @@ struct e1000_info e1000_82583_info = { | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD, .pba = 20, - .max_hw_frame_size = DEFAULT_JUMBO, + .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN, .get_variants = e1000_get_variants_82571, .mac_ops = &e82571_mac_ops, .phy_ops = &e82_phy_ops_bm,
drivers/net/wireless/iwlwifi/iwl-eeprom.c +11 -12
@@ -335,7 +335,6 @@ static int iwl_find_otp_image(struct iwl_priv *priv, u16 *validblockaddr) {u16 next_link_addr =0 , link_value =0 , valid_addr; -int ret =0 ;int usedblocks =0 ;/* set addressing mode to absolute to traverse the link list */
@@ -355,29 +354,29 @@ static int iwl_find_otp_image(struct iwl_priv *priv,* check for more block on the link list */ valid_addr = next_link_addr; - next_link_addr = link_value; + next_link_addr = link_value *sizeof (u16);IWL_DEBUG_INFO (priv,"OTP blocks %d addr 0x%x\n" , usedblocks, next_link_addr);if (iwl_read_otp_word (priv, next_link_addr, &link_value))return -EINVAL ;if (!link_value) {/* -* reach the end of link list, +* reach the end of link list, return success and * set address point to the starting address * of the image */ - goto done; + *validblockaddr = valid_addr; +/* skip first 2 bytes (link list pointer) */ + *validblockaddr +=2 ; +return 0 ; }/* more in the link list, continue */ usedblocks++; - }while (usedblocks < priv->cfg->max_ll_items); -/* OTP full, use last block */ -IWL_DEBUG_INFO (priv,"OTP is full, use last block\n" ); -done: - *validblockaddr = valid_addr; -/* skip first 2 bytes (link list pointer) */ - *validblockaddr +=2 ; -return ret; + }while (usedblocks <= priv->cfg->max_ll_items); + +/* OTP has no valid blocks */ +IWL_DEBUG_INFO (priv,"OTP has no valid blocks\n" ); +return -EINVAL ; }/**
drivers/pci/dmar.c +18 -4
@@ -632,20 +632,31 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) iommu->cap =dmar_readq (iommu->reg +DMAR_CAP_REG ); iommu->ecap =dmar_readq (iommu->reg +DMAR_ECAP_REG ); +if (iommu->cap == (uint64_t )-1 && iommu->ecap == (uint64_t )-1 ) { +/* Promote an attitude of violence to a BIOS engineer today */ +WARN (1 ,"Your BIOS is broken; DMAR reported at address %llx returns all ones!\n" +"BIOS vendor: %s; Ver: %s; Product Version: %s\n" , + drhd->reg_base_addr, +dmi_get_system_info (DMI_BIOS_VENDOR ), +dmi_get_system_info (DMI_BIOS_VERSION ), +dmi_get_system_info (DMI_PRODUCT_VERSION )); + goto err_unmap; + } +#ifdef CONFIG_DMAR agaw =iommu_calculate_agaw (iommu);if (agaw <0 ) {printk (KERN_ERR "Cannot get a valid agaw for iommu (seq_id = %d)\n" , iommu->seq_id); - goto error; + goto err_unmap; } msagaw =iommu_calculate_max_sagaw (iommu);if (msagaw <0 ) {printk (KERN_ERR "Cannot get a valid max agaw for iommu (seq_id = %d)\n" , iommu->seq_id); - goto error; + goto err_unmap; }#endif iommu->agaw = agaw;
@@ -665,7 +676,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) } ver =readl (iommu->reg +DMAR_VER_REG ); - pr_debug("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n", + pr_info("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n", (unsigned long long)drhd->reg_base_addr, DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver), (unsigned long long)iommu->cap,
@@ -675,7 +686,10 @@ int alloc_iommu(struct dmar_drhd_unit *drhd) drhd->iommu = iommu;return 0 ; -error: + + err_unmap: +iounmap (iommu->reg); + error:kfree (iommu);return -1 ; }
drivers/scsi/scsi.c +7 -4
@@ -241,10 +241,7 @@ scsi_host_alloc_command(struct Scsi_Host *shost, gfp_t gfp_mask)*/ struct scsi_cmnd *__scsi_get_command (struct Scsi_Host *shost,gfp_t gfp_mask) { -struct scsi_cmnd *cmd; -unsigned char *buf; - - cmd =scsi_host_alloc_command (shost, gfp_mask); +struct scsi_cmnd *cmd =scsi_host_alloc_command (shost, gfp_mask);if (unlikely (!cmd)) {unsigned long flags;
@@ -258,9 +255,15 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)spin_unlock_irqrestore (&shost->free_list_lock, flags);if (cmd) { +void *buf, *prot; + buf = cmd->sense_buffer; + prot = cmd->prot_sdb; +memset (cmd,0 ,sizeof (*cmd)); + cmd->sense_buffer = buf; + cmd->prot_sdb = prot; } }
drivers/scsi/scsi_error.c +3 -0
@@ -721,6 +721,9 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,case NEEDS_RETRY :case FAILED :break ; +case ADD_TO_MLQUEUE : + rtn =NEEDS_RETRY ; +break ;default : rtn =FAILED ;break ;
drivers/scsi/sg.c +5 -5
@@ -1708,11 +1708,6 @@ static int sg_finish_rem_req(Sg_request * srp)Sg_scatter_hold *req_schp = &srp->data;SCSI_LOG_TIMEOUT (4 ,printk ("sg_finish_rem_req: res_used=%d\n" , (int ) srp->res_used)); -if (srp->res_used) -sg_unlink_reserve (sfp, srp); -else -sg_remove_scat (req_schp); -if (srp->rq) {if (srp->bio) ret =blk_rq_unmap_user (srp->bio);
@@ -1720,6 +1715,11 @@ static int sg_finish_rem_req(Sg_request * srp)blk_put_request (srp->rq); } +if (srp->res_used) +sg_unlink_reserve (sfp, srp); +else +sg_remove_scat (req_schp); +sg_remove_request (sfp, srp);return ret;
drivers/staging/dst/dcore.c +6 -2
@@ -846,15 +846,19 @@ static dst_command_func dst_commands[] = {/* * Configuration parser. */ -static void cn_dst_callback (void *data) +static void cn_dst_callback (struct cn_msg *msg,struct netlink_skb_parms *nsp) {struct dst_ctl *ctl; -struct cn_msg *msg = data;int err;struct dst_ctl_ack ack;struct dst_node *n =NULL , *tmp;unsigned int hash; +if (!cap_raised (nsp->eff_cap,CAP_SYS_ADMIN )) { + err = -EPERM ; + goto out; + } +if (msg->len <sizeof (struct dst_ctl )) { err = -EBADMSG ; goto out;
drivers/staging/pohmelfs/config.c +4 -2
@@ -446,11 +446,13 @@ out_unlock:return err; } -static void pohmelfs_cn_callback (void *data) +static void pohmelfs_cn_callback (struct cn_msg *msg,struct netlink_skb_parms *nsp) { -struct cn_msg *msg = data;int err; +if (!cap_raised (nsp->eff_cap,CAP_SYS_ADMIN )) +return ; +switch (msg->flags) {case POHMELFS_FLAGS_ADD :case POHMELFS_FLAGS_DEL :
drivers/staging/rt2860/common/cmm_data_2860.c +2 -0
@@ -363,6 +363,8 @@ int RtmpPCIMgmtKickOut(ULONG SwIdx = pAd->MgmtRing.TxCpuIdx; pTxD = (PTXD_STRUC ) pAd->MgmtRing.Cell[SwIdx].AllocVa; +if (!pTxD) +return 0 ; pAd->MgmtRing.Cell[SwIdx].pNdisPacket = pPacket; pAd->MgmtRing.Cell[SwIdx].pNextNdisPacket =NULL ;
drivers/usb/serial/cp210x.c +1 -0
@@ -114,6 +114,7 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */ { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ + { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ { } /* Terminating Entry */ };
drivers/usb/serial/digi_acceleport.c +4 -4
@@ -899,16 +899,16 @@ static void digi_rx_unthrottle(struct tty_struct *tty)spin_lock_irqsave (&priv->dp_port_lock, flags); -/* turn throttle off */ - priv->dp_throttled =0 ; - priv->dp_throttle_restart =0 ; -/* restart read chain */ if (priv->dp_throttle_restart) { port->read_urb->dev = port->serial->dev; ret =usb_submit_urb (port->read_urb,GFP_ATOMIC ); } +/* turn throttle off */ + priv->dp_throttled =0 ; + priv->dp_throttle_restart =0 ; +spin_unlock_irqrestore (&priv->dp_port_lock, flags);if (ret)
drivers/usb/serial/ftdi_sio.c +129 -293
535 lines not on this page · raw message
drivers/usb/serial/generic.c +1 -1
@@ -530,7 +530,7 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty)if (was_throttled) {/* Resume reading from device */ -usb_serial_generic_resubmit_read_urb (port,GFP_KERNEL ); +flush_and_resubmit_read_urb (port); } }
drivers/usb/serial/ipaq.c +9 -0
@@ -971,6 +971,15 @@ static int ipaq_calc_num_ports(struct usb_serial *serial)static int ipaq_startup (struct usb_serial *serial) {dbg ("%s" , __func__); + +/* Some of the devices in ipaq_id_table[] are composite, and we +* shouldn't bind to all the interfaces. This test will rule out +* some obviously invalid possibilities. +*/ +if (serial->num_bulk_in < serial->num_ports || + serial->num_bulk_out < serial->num_ports) +return -ENODEV ; +if (serial->dev->actconfig->desc.bConfigurationValue !=1 ) {/* * FIXME: HP iPaq rx3715, possibly others, have 1 config that
drivers/usb/serial/option.c +2 -0
@@ -319,6 +319,7 @@ static int option_resume(struct usb_serial *serial);/* TOSHIBA PRODUCTS */ #define TOSHIBA_VENDOR_ID 0x0930#define TOSHIBA_PRODUCT_HSDPA_MINICARD 0x1302 +#define TOSHIBA_PRODUCT_G450 0x0d45#define ALINK_VENDOR_ID 0x1e0e#define ALINK_PRODUCT_3GU 0x9200
@@ -582,6 +583,7 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4523) }, { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4515) }, { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4519) }, + { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_G450) }, { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */ { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
drivers/usb/serial/pl2303.c +5 -3
@@ -995,13 +995,15 @@ static void pl2303_push_data(struct tty_struct *tty,/* overrun is special, not associated with a char */ if (line_status &UART_OVERRUN_ERROR )tty_insert_flip_char (tty,0 ,TTY_OVERRUN ); -if (port->console && port->sysrq) { + +if (tty_flag ==TTY_NORMAL && !(port->console && port->sysrq)) +tty_insert_flip_string (tty, data, urb->actual_length); +else {int i;for (i =0 ; i < urb->actual_length; ++i)if (!usb_serial_handle_sysrq_char (tty, port, data[i]))tty_insert_flip_char (tty, data[i], tty_flag); - }else -tty_insert_flip_string (tty, data, urb->actual_length); + }tty_flip_buffer_push (tty); }
drivers/usb/serial/usb-serial.c +5 -1
@@ -155,7 +155,8 @@ static void destroy_serial(struct kref *kref)if (serial->minor !=SERIAL_TTY_NO_MINOR )return_serial (serial); - serial->type->release (serial); +if (serial->attached) + serial->type->release (serial);/* Now that nothing is using the ports, they can be freed */ for (i =0 ; i < serial->num_port_pointers; ++i) {
@@ -1060,12 +1061,15 @@ int usb_serial_probe(struct usb_interface *interface,module_put (type->driver.owner);if (retval <0 ) goto probe_error; + serial->attached =1 ;if (retval >0 ) {/* quietly accept this device, but don't bind to a serial port as it's about to disappear */ serial->num_ports =0 ; goto exit; } + }else { + serial->attached =1 ; }if (get_free_serial (serial, num_ports, &minor) ==NULL ) {
drivers/usb/storage/transport.c +38 -8
68 lines not on this page · raw message
drivers/video/uvesafb.c +4 -2
@@ -67,12 +67,14 @@ static DEFINE_MUTEX(uvfb_lock);* find the kernel part of the task struct, copy the registers and * the buffer contents and then complete the task. */ -static void uvesafb_cn_callback (void *data) +static void uvesafb_cn_callback (struct cn_msg *msg,struct netlink_skb_parms *nsp) { -struct cn_msg *msg = data;struct uvesafb_task *utask;struct uvesafb_ktask *task; +if (!cap_raised (nsp->eff_cap,CAP_SYS_ADMIN )) +return ; +if (msg->seq >=UVESAFB_TASKS_MAX )return ;
drivers/w1/w1_netlink.c +1 -2
@@ -306,9 +306,8 @@ static int w1_netlink_send_error(struct cn_msg *rcmsg, struct w1_netlink_msg *rmreturn error; } -static void w1_cn_callback (void *data) +static void w1_cn_callback (struct cn_msg *msg,struct netlink_skb_parms *nsp) { -struct cn_msg *msg = data;struct w1_netlink_msg *m = (struct w1_netlink_msg *)(msg +1 );struct w1_netlink_cmd *cmd;struct w1_slave *sl;
fs/sysfs/file.c +8 -6
@@ -268,7 +268,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,struct sysfs_open_dirent *od, *new_od =NULL ; retry: -spin_lock (&sysfs_open_dirent_lock); +spin_lock_irq (&sysfs_open_dirent_lock);if (!sd->s_attr.open && new_od) { sd->s_attr.open = new_od;
@@ -281,7 +281,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,list_add_tail (&buffer->list, &od->buffers); } -spin_unlock (&sysfs_open_dirent_lock); +spin_unlock_irq (&sysfs_open_dirent_lock);if (od) {kfree (new_od);
@@ -315,8 +315,9 @@ static void sysfs_put_open_dirent(struct sysfs_dirent *sd, struct sysfs_buffer *buffer) {struct sysfs_open_dirent *od = sd->s_attr.open; +unsigned long flags; -spin_lock (&sysfs_open_dirent_lock); +spin_lock_irqsave (&sysfs_open_dirent_lock, flags);list_del (&buffer->list);if (atomic_dec_and_test (&od->refcnt))
@@ -324,7 +325,7 @@ static void sysfs_put_open_dirent(struct sysfs_dirent *sd,else od =NULL ; -spin_unlock (&sysfs_open_dirent_lock); +spin_unlock_irqrestore (&sysfs_open_dirent_lock, flags);kfree (od); }
@@ -456,8 +457,9 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)void sysfs_notify_dirent (struct sysfs_dirent *sd) {struct sysfs_open_dirent *od; +unsigned long flags; -spin_lock (&sysfs_open_dirent_lock); +spin_lock_irqsave (&sysfs_open_dirent_lock, flags); od = sd->s_attr.open;if (od) {
@@ -465,7 +467,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)wake_up_interruptible (&od->poll); } -spin_unlock (&sysfs_open_dirent_lock); +spin_unlock_irqrestore (&sysfs_open_dirent_lock, flags); }EXPORT_SYMBOL_GPL (sysfs_notify_dirent);
include/linux/connector.h +4 -7
@@ -132,11 +132,8 @@ struct cn_callback_id { };struct cn_callback_data { -void (*destruct_data) (void *); -void *ddata; - -void *callback_priv; -void (*callback) (void *); +struct sk_buff *skb; +void (*callback) (struct cn_msg *,struct netlink_skb_parms *);void *free; };
@@ -167,11 +164,11 @@ struct cn_dev {struct cn_queue_dev *cbdev; }; -int cn_add_callback (struct cb_id *,char *,void (*callback) (void *)); +int cn_add_callback (struct cb_id *,char *,void (*callback) (struct cn_msg *,struct netlink_skb_parms *));void cn_del_callback (struct cb_id *);int cn_netlink_send (struct cn_msg *,u32 ,gfp_t ); -int cn_queue_add_callback (struct cn_queue_dev *dev,char *name,struct cb_id *id,void (*callback)(void *)); +int cn_queue_add_callback (struct cn_queue_dev *dev,char *name,struct cb_id *id,void (*callback)(struct cn_msg *,struct netlink_skb_parms *));void cn_queue_del_callback (struct cn_queue_dev *dev,struct cb_id *id);int queue_cn_work (struct cn_callback_entry *cbq,struct work_struct *work);
include/linux/usb/serial.h +1 -0
@@ -148,6 +148,7 @@ struct usb_serial {struct usb_interface *interface; unsigned char disconnected:1; unsigned char suspending:1; + unsigned char attached:1;unsigned char minor;unsigned char num_ports;unsigned char num_port_pointers;
include/net/bluetooth/hci_core.h +4 -0
@@ -187,6 +187,7 @@ struct hci_conn {struct work_struct work_del;struct device dev; +atomic_t devref;struct hci_dev *hdev;void *l2cap_data;
@@ -339,6 +340,9 @@ int hci_conn_switch_role(struct hci_conn *conn, __u8 role);void hci_conn_enter_active_mode (struct hci_conn *conn);void hci_conn_enter_sniff_mode (struct hci_conn *conn); +void hci_conn_hold_device (struct hci_conn *conn); +void hci_conn_put_device (struct hci_conn *conn); +static inline void hci_conn_hold (struct hci_conn *conn) {atomic_inc (&conn->refcnt);
kernel/acct.c +7 -1
@@ -491,13 +491,17 @@ static void do_acct_process(struct bsd_acct_struct *acct,u64 run_time;struct timespec uptime;struct tty_struct *tty; +const struct cred *orig_cred; + +/* Perform file operations on behalf of whoever enabled accounting */ + orig_cred =override_creds (file->f_cred);/* * First check to see if there is enough free_space to continue * the process accounting system. */ if (!check_free_space (acct, file)) -return ; + goto out;/* * Fill the accounting struct with the needed info as recorded
@@ -578,6 +582,8 @@ static void do_acct_process(struct bsd_acct_struct *acct, sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE ].rlim_cur = flim;set_fs (fs); +out: +revert_creds (orig_cred); }/**
kernel/futex.c +23 -16
@@ -115,6 +115,9 @@ struct futex_q {/* rt_waiter storage for requeue_pi: */ struct rt_mutex_waiter *rt_waiter; +/* The expected requeue pi target futex key: */ +union futex_key *requeue_pi_key; +/* Bitset for the optional bitmasked wakeup */ u32 bitset; };
@@ -1089,6 +1092,10 @@ static int futex_proxy_trylock_atomic(u32 __user *pifutex,if (!top_waiter)return 0 ; +/* Ensure we requeue to the expected futex. */ +if (!match_futex (top_waiter->requeue_pi_key, key2)) +return -EINVAL ; +/* * Try to take the lock for top_waiter. Set the FUTEX_WAITERS bit in * the contended case or if set_waiters is 1. The pi_state is returned
@@ -1276,6 +1283,12 @@ retry_private:continue ; } +/* Ensure we requeue to the expected futex for requeue_pi. */ +if (requeue_pi && !match_futex (this->requeue_pi_key, &key2)) { + ret = -EINVAL ; +break ; + } +/* * Requeue nr_requeue waiters and possibly one more in the case * of requeue_pi if we couldn't acquire the lock atomically.
@@ -1625,17 +1638,8 @@ out:static void futex_wait_queue_me (struct futex_hash_bucket *hb,struct futex_q *q,struct hrtimer_sleeper *timeout) { -queue_me (q, hb); - -/* -* There might have been scheduling since the queue_me(), as we -* cannot hold a spinlock across the get_user() in case it -* faults, and we cannot just set TASK_INTERRUPTIBLE state when -* queueing ourselves into the futex hash. This code thus has to -* rely on the futex_wake() code removing us from hash when it -* wakes us up. -*/ set_current_state (TASK_INTERRUPTIBLE ); +queue_me (q, hb);/* Arm the timer */ if (timeout) {
@@ -1645,8 +1649,8 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q, }/* -* !plist_node_empty() is safe here without any lock. -* q.lock_ptr != 0 is not safe, because of ordering against wakeup. +* If we have been removed from the hash list, then another task +* has tried to wake us, and we can skip the call to schedule(). */ if (likely (!plist_node_empty (&q->list))) {/*
@@ -1751,6 +1755,7 @@ static int futex_wait(u32 __user *uaddr, int fshared, q.pi_state =NULL ; q.bitset = bitset; q.rt_waiter =NULL ; + q.requeue_pi_key =NULL ;if (abs_time) { to = &timeout;
@@ -1858,6 +1863,7 @@ static int futex_lock_pi(u32 __user *uaddr, int fshared, q.pi_state =NULL ; q.rt_waiter =NULL ; + q.requeue_pi_key =NULL ; retry: q.key =FUTEX_KEY_INIT ; ret =get_futex_key (uaddr, fshared, &q.key,VERIFY_WRITE );
@@ -2168,15 +2174,16 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared,debug_rt_mutex_init_waiter (&rt_waiter); rt_waiter.task =NULL ; - q.pi_state =NULL ; - q.bitset = bitset; - q.rt_waiter = &rt_waiter; - key2 =FUTEX_KEY_INIT ; ret =get_futex_key (uaddr2, fshared, &key2,VERIFY_WRITE );if (unlikely (ret !=0 )) goto out; + q.pi_state =NULL ; + q.bitset = bitset; + q.rt_waiter = &rt_waiter; + q.requeue_pi_key = &key2; +/* Prepare to wait on uaddr. */ ret =futex_wait_setup (uaddr, val, fshared, &q, &hb);if (ret)
kernel/trace/trace_events_filter.c +2 -1
@@ -844,8 +844,9 @@ static void postfix_clear(struct filter_parse_state *ps)while (!list_empty (&ps->postfix)) { elt = list_first_entry(&ps->postfix, struct postfix_elt, list); -kfree (elt->operand);list_del (&elt->list); +kfree (elt->operand); +kfree (elt); } }
net/bluetooth/hci_conn.c +16 -1
@@ -246,6 +246,8 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)if (hdev->notify) hdev->notify (hdev,HCI_NOTIFY_CONN_ADD ); +atomic_set (&conn->devref,0 ); +hci_conn_init_sysfs (conn);tasklet_enable (&hdev->tx_task);
@@ -288,7 +290,7 @@ int hci_conn_del(struct hci_conn *conn)skb_queue_purge (&conn->data_q); -hci_conn_del_sysfs (conn); +hci_conn_put_device (conn);hci_dev_put (hdev);
@@ -583,6 +585,19 @@ void hci_conn_check_pending(struct hci_dev *hdev)hci_dev_unlock (hdev); } +void hci_conn_hold_device (struct hci_conn *conn) +{ +atomic_inc (&conn->devref); +} +EXPORT_SYMBOL (hci_conn_hold_device); + +void hci_conn_put_device (struct hci_conn *conn) +{ +if (atomic_dec_and_test (&conn->devref)) +hci_conn_del_sysfs (conn); +} +EXPORT_SYMBOL (hci_conn_put_device); +int hci_get_conn_list (void __user *arg) {struct hci_conn_list_req req, *cl;
net/bluetooth/hci_event.c +2 -0
@@ -887,6 +887,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s }else conn->state =BT_CONNECTED ; +hci_conn_hold_device (conn);hci_conn_add_sysfs (conn);if (test_bit (HCI_AUTH , &hdev->flags))
@@ -1693,6 +1694,7 @@ static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_bu conn->handle =__le16_to_cpu (ev->handle); conn->state =BT_CONNECTED ; +hci_conn_hold_device (conn);hci_conn_add_sysfs (conn);break ;
net/bluetooth/hidp/core.c +44 -21
154 lines not on this page · raw message
net/bluetooth/hidp/hidp.h +2 -0
@@ -126,6 +126,8 @@ int hidp_get_conninfo(struct hidp_conninfo *ci);struct hidp_session {struct list_head list; +struct hci_conn *conn; +struct socket *ctrl_sock;struct socket *intr_sock;
net/mac80211/rx.c +8 -2
@@ -2155,11 +2155,17 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, skb = rx.skb; -list_for_each_entry_rcu (sdata, &local->interfaces, list) { +if (rx.sdata &&ieee80211_is_data (hdr->frame_control)) { + rx.flags |=IEEE80211_RX_RA_MATCH ; + prepares =prepare_for_handlers (rx.sdata, &rx, hdr); +if (prepares) + prev = rx.sdata; + } else list_for_each_entry_rcu(sdata, &local->interfaces, list) {if (!netif_running (sdata->dev))continue ; -if (sdata->vif.type ==NL80211_IFTYPE_MONITOR ) +if (sdata->vif.type ==NL80211_IFTYPE_MONITOR || + sdata->vif.type ==NL80211_IFTYPE_AP_VLAN )continue ; rx.flags |=IEEE80211_RX_RA_MATCH ;
net/mac80211/sta_info.c +2 -0
@@ -360,6 +360,7 @@ int sta_info_insert(struct sta_info *sta) u.ap);drv_sta_notify (local, &sdata->vif,STA_NOTIFY_ADD , &sta->sta); + sdata = sta->sdata; }#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
@@ -494,6 +495,7 @@ static void __sta_info_unlink(struct sta_info **sta)drv_sta_notify (local, &sdata->vif,STA_NOTIFY_REMOVE , &(*sta)->sta); + sdata = (*sta)->sdata; }if (ieee80211_vif_is_mesh (&sdata->vif)) {
net/mac80211/tx.c +2 -1
@@ -1736,7 +1736,8 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,if (!is_multicast_ether_addr (hdr.addr1)) {rcu_read_lock (); sta =sta_info_get (local, hdr.addr1); -if (sta) +/* XXX: in the future, use sdata to look up the sta */ +if (sta && sta->sdata == sdata) sta_flags =get_sta_flags (sta);rcu_read_unlock (); }
scripts/Makefile.build +2 -1
@@ -269,7 +269,8 @@ targets += $(extra-y) $(MAKECMDGOALS) $(always) # Linker scripts preprocessor (.lds.S -> .lds) # --------------------------------------------------------------------------- quiet_cmd_cpp_lds_S = LDS $@ - cmd_cpp_lds_S = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -o $@ $< + cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \ + -D__ASSEMBLY__ -o $@ $< $(obj)/%.lds: $(src)/%.lds.S FORCE $(call if_changed_dep,cpp_lds_S)
sound/aoa/codecs/tas.c +9 -0
@@ -897,6 +897,15 @@ static int tas_create(struct i2c_adapter *adapter, client =i2c_new_device (adapter, &info);if (!client)return -ENODEV ; +/* +* We know the driver is already loaded, so the device should be +* already bound. If not it means binding failed, and then there +* is no point in keeping the device instantiated. +*/ +if (!client->driver) { +i2c_unregister_device (client); +return -ENODEV ; + }/* * Let i2c-core delete that device on driver removal.
sound/ppc/keywest.c +12 -0
@@ -59,6 +59,18 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)strlcpy (info.type,"keywest" ,I2C_NAME_SIZE ); info.addr = keywest_ctx->addr; keywest_ctx->client =i2c_new_device (adapter, &info); +if (!keywest_ctx->client) +return -ENODEV ; +/* +* We know the driver is already loaded, so the device should be +* already bound. If not it means binding failed, and then there +* is no point in keeping the device instantiated. +*/ +if (!keywest_ctx->client->driver) { +i2c_unregister_device (keywest_ctx->client); + keywest_ctx->client =NULL ; +return -ENODEV ; + }/* * Let i2c-core delete that device on driver removal.