Linux 3.0.54
Greg KH
maintainerI'm announcing the release of the 3.0.54 kernel.
All users of the 3.0 kernel series must upgrade.
The updated 3.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/dvb/get_dvb_firmware | 2 - Documentation/networking/ifenslave.c | 2 + Makefile | 2 - arch/parisc/kernel/signal32.c | 6 +++- arch/parisc/kernel/sys_parisc.c | 2 + arch/sparc/kernel/signal_64.c | 4 --- arch/x86/include/asm/ptrace.h | 15 +++--------- arch/x86/kernel/cpu/mcheck/therm_throt.c | 29 +++++------------------ arch/x86/kernel/microcode_amd.c | 4 +++ arch/x86/kernel/ptrace.c | 28 ++++++++++++++++++++++ drivers/ata/sata_svw.c | 35 ++++++++++++++++++++++++++++ drivers/block/DAC960.c | 18 ++++++++------ drivers/gpu/drm/radeon/radeon_agp.c | 5 +++- drivers/input/mouse/bcm5974.c | 3 ++ drivers/isdn/gigaset/bas-gigaset.c | 19 ++++++++++++--- drivers/md/dm.c | 8 +++++- drivers/mmc/host/sdhci-s3c.c | 2 - drivers/mtd/devices/slram.c | 2 - drivers/net/ixgbe/ixgbe_82599.c | 2 + drivers/net/ixgbe/ixgbe_common.c | 1 drivers/net/ixgbe/ixgbe_main.c | 6 ++++ drivers/net/ixgbe/ixgbe_type.h | 3 ++ drivers/net/wireless/mwifiex/sdio.c | 11 ++++---- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 drivers/platform/x86/acer-wmi.c | 1 drivers/scsi/isci/request.c | 2 - drivers/usb/serial/mct_u232.c | 14 ++++++----- drivers/video/riva/fbdev.c | 5 +--- fs/jbd/transaction.c | 2 + kernel/futex.c | 18 +++++++++++++- kernel/watchdog.c | 4 +-- net/can/bcm.c | 3 ++ net/mac80211/ibss.c | 8 +++--- sound/pci/hda/patch_realtek.c | 4 +++ sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 - sound/pcmcia/vx/vxpocket.c | 2 - sound/usb/midi.c | 8 ++++-- 37 files changed, 202 insertions(+), 81 deletions(-)
Al Viro (2):
PARISC: fix user-triggerable panic on parisc
sparc64: not any error from do_sigaltstack() should fail rt_sigreturn()
Albert Pool (1):
rtlwifi: rtl8192cu: Add new USB ID
Bing Zhao (1):
mwifiex: report error to MMC core if we cannot suspend
Boris Ostrovsky (1):
x86, microcode, AMD: Add support for family 16h processors
Chuansheng Liu (1):
watchdog: using u64 in get_sample_period()
Clemens Ladisch (1):
ALSA: ua101, usx2y: fix broken MIDI output
Danny Kukawka (3):
drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning drivers/block/DAC960: fix -Wuninitialized warning riva/fbdev: fix several -Wuninitialized
Darren Hart (1):
futex: avoid wake_futex() for a PI futex_q
David Henningsson (1):
ALSA: hda - Add support for Realtek ALC292
David Milburn (1):
sata_svw: check DMA start bit before reset
David S. Miller (1):
ifenslave: Fix unused variable warnings.
Duncan Roe (1):
ALSA: hda - Fix missing beep on ASUS X43U notebook
Emil Tantilov (2):
ixgbe: add support for new 82599 device
ixgbe: add support for new 82599 device id
Fenghua Yu (1):
x86, mce, therm_throt: Don't report power limit and package level thermal throttle events in mcelog
Greg Kroah-Hartman (1):
Linux 3.0.54
Jaehoon Chung (1):
mmc: sdhci-s3c: fix the wrong number of max bus clocks
James Bottomley (1):
PARISC: fix virtual aliasing issue in get_shared_area()
Jan Kara (1):
jbd: Fix lock ordering bug in journal_unmap_buffer()
Jens Axboe (1):
dm: fix deadlock with request based dm and queue request_fn recursion
Jiri Engelthaler (1):
mtd: slram: invalid checking of absolute end address
Johan Hovold (1):
USB: mct_u232: fix broken close
Jussi Pakkanen (1):
Input: bcm5974 - set BUTTONPAD property
Kailang Yang (1):
ALSA: hda - Add new codec ALC283 ALC290 support
Maciej Patelczyk (1):
SCSI: isci: copy fis 0x34 response into proper buffer
Mauro Carvalho Chehab (1):
get_dvb_firmware: fix download site for tda10046 firmware
Merlin Schumacher (1):
acer-wmi: support for P key on TM8372
Oliver Hartkopp (1):
can: bcm: initialize ifindex for timeouts without previous frame reception
Paul Bolle (1):
radeon: add AGPMode 1 quirk for RV250
Robert Richter (1):
x86-32: Fix invalid stack address while in softirq
Simon Wunderlich (1):
mac80211: deinitialize ibss-internals after emptiness check
Takashi Iwai (1):
ALSA: pcmcia - Use pcmcia_request_irq()
Tilman Schmidt (1):
bas_gigaset: fix pre_reset handling
[email protected] (1):
ixgbe: add support for X540-AT1
Greg KH
maintainerDocumentation/dvb/get_dvb_firmware +1 -1
@@ -114,7 +114,7 @@ sub tda10045 { sub tda10046 { my $sourcefile = "TT_PCI_2.19h_28_11_2006.zip"; - my $url = "http://www.tt-download.com/download/updates/219/$sourcefile"; + my $url = "http://technotrend.com.ua/download/software/219/$sourcefile"; my $hash = "6a7e1e2f2644b162ff0502367553c72d"; my $outfile = "dvb-fe-tda10046.fw"; my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
Documentation/networking/ifenslave.c +2 -0
@@ -539,12 +539,14 @@ static int if_getconfig(char *ifname) metric =0 ; }else metric = ifr.ifr_metric; +printf ("The result of SIOCGIFMETRIC is %d\n" , metric);strcpy (ifr.ifr_name, ifname);if (ioctl (skfd,SIOCGIFMTU , &ifr) <0 ) mtu =0 ;else mtu = ifr.ifr_mtu; +printf ("The result of SIOCGIFMTU is %d\n" , mtu);strcpy (ifr.ifr_name, ifname);if (ioctl (skfd,SIOCGIFDSTADDR , &ifr) <0 ) {
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 53 +SUBLEVEL = 54 EXTRAVERSION = NAME = Sneaky Weasel
arch/parisc/kernel/signal32.c +4 -2
@@ -67,7 +67,8 @@ put_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz) {compat_sigset_t s; -if (sz !=sizeof *set)panic ("put_sigset32()" ); +if (sz !=sizeof *set) +return -EINVAL ;sigset_64to32 (&s, set);return copy_to_user (up, &s,sizeof s);
@@ -79,7 +80,8 @@ get_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz)compat_sigset_t s;int r; -if (sz !=sizeof *set)panic ("put_sigset32()" ); +if (sz !=sizeof *set) +return -EINVAL ;if ((r =copy_from_user (&s, up, sz)) ==0 ) {sigset_32to64 (set, &s);
arch/parisc/kernel/sys_parisc.c +2 -0
@@ -73,6 +73,8 @@ static unsigned long get_shared_area(struct address_space *mapping,struct vm_area_struct *vma;int offset = mapping ?get_offset (mapping) :0 ; + offset = (offset + (pgoff <<PAGE_SHIFT )) &0x3FF000 ; + addr =DCACHE_ALIGN (addr - offset) + offset;for (vma =find_vma (current->mm, addr); ; vma = vma->vm_next) {
arch/sparc/kernel/signal_64.c +1 -3
@@ -309,9 +309,7 @@ void do_rt_sigreturn(struct pt_regs *regs) err |=restore_fpu_state (regs, fpu_save); err |=__copy_from_user (&set, &sf->mask,sizeof (sigset_t)); - err |=do_sigaltstack (&sf->stack,NULL , (unsigned long )sf); - -if (err) +if (err ||do_sigaltstack (&sf->stack,NULL , (unsigned long )sf) == -EFAULT ) goto segv; err |=__get_user (rwin_save, &sf->rwin_save);
arch/x86/include/asm/ptrace.h +4 -11
@@ -187,21 +187,14 @@ static inline int v8086_mode(struct pt_regs *regs)#endif } -/* -* X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode -* when it traps. The previous stack will be directly underneath the saved -* registers, and 'sp/ss' won't even have been saved. Thus the '®s->sp'. -* -* This is valid only for kernel mode traps. -*/ -static inline unsigned long kernel_stack_pointer (struct pt_regs *regs) -{#ifdef CONFIG_X86_32 -return (unsigned long )(®s->sp); +extern unsigned long kernel_stack_pointer (struct pt_regs *regs);#else +static inline unsigned long kernel_stack_pointer (struct pt_regs *regs) +{return regs->sp; -#endif } +#endif #define GET_IP (regs) ((regs)->ip)#define GET_FP (regs) ((regs)->bp)
arch/x86/kernel/cpu/mcheck/therm_throt.c +7 -22
@@ -322,17 +322,6 @@ device_initcall(thermal_throttle_init_device);#endif /* CONFIG_SYSFS */ -/* -* Set up the most two significant bit to notify mce log that this thermal -* event type. -* This is a temp solution. May be changed in the future with mce log -* infrasture. -*/ -#define CORE_THROTTLED (0) -#define CORE_POWER_LIMIT ((__u64)1 << 62) -#define PACKAGE_THROTTLED ((__u64)2 << 62) -#define PACKAGE_POWER_LIMIT ((__u64)3 << 62) -static void notify_thresholds (__u64 msr_val) {/* check whether the interrupt handler is defined;
@@ -362,27 +351,23 @@ static void intel_thermal_interrupt(void)if (therm_throt_process (msr_val &THERM_STATUS_PROCHOT ,THERMAL_THROTTLING_EVENT ,CORE_LEVEL ) !=0 ) -mce_log_therm_throt_event (CORE_THROTTLED | msr_val); +mce_log_therm_throt_event (msr_val);if (this_cpu_has (X86_FEATURE_PLN )) -if (therm_throt_process (msr_val &THERM_STATUS_POWER_LIMIT , +therm_throt_process (msr_val &THERM_STATUS_POWER_LIMIT ,POWER_LIMIT_EVENT , -CORE_LEVEL ) !=0 ) -mce_log_therm_throt_event (CORE_POWER_LIMIT | msr_val); +CORE_LEVEL );if (this_cpu_has (X86_FEATURE_PTS )) {rdmsrl (MSR_IA32_PACKAGE_THERM_STATUS , msr_val); -if (therm_throt_process (msr_val &PACKAGE_THERM_STATUS_PROCHOT , +therm_throt_process (msr_val &PACKAGE_THERM_STATUS_PROCHOT ,THERMAL_THROTTLING_EVENT , -PACKAGE_LEVEL ) !=0 ) -mce_log_therm_throt_event (PACKAGE_THROTTLED | msr_val); +PACKAGE_LEVEL );if (this_cpu_has (X86_FEATURE_PLN )) -if (therm_throt_process (msr_val & +therm_throt_process (msr_val &PACKAGE_THERM_STATUS_POWER_LIMIT ,POWER_LIMIT_EVENT , -PACKAGE_LEVEL ) !=0 ) -mce_log_therm_throt_event (PACKAGE_POWER_LIMIT - | msr_val); +PACKAGE_LEVEL ); } }
arch/x86/kernel/microcode_amd.c +4 -0
@@ -162,6 +162,7 @@ static unsigned int verify_ucode_size(int cpu, const u8 *buf, unsigned int size)#define F1XH_MPB_MAX_SIZE 2048#define F14H_MPB_MAX_SIZE 1824#define F15H_MPB_MAX_SIZE 4096 +#define F16H_MPB_MAX_SIZE 3458switch (c->x86) {case 0x14 :
@@ -170,6 +171,9 @@ static unsigned int verify_ucode_size(int cpu, const u8 *buf, unsigned int size)case 0x15 : max_size =F15H_MPB_MAX_SIZE ;break ; +case 0x16 : + max_size =F16H_MPB_MAX_SIZE ; +break ;default : max_size =F1XH_MPB_MAX_SIZE ;break ;
arch/x86/kernel/ptrace.c +28 -0
@@ -164,6 +164,34 @@ static inline bool invalid_selector(u16 value)#define FLAG_MASK FLAG_MASK_32 +/* +* X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode +* when it traps. The previous stack will be directly underneath the saved +* registers, and 'sp/ss' won't even have been saved. Thus the '®s->sp'. +* +* Now, if the stack is empty, '®s->sp' is out of range. In this +* case we try to take the previous stack. To always return a non-null +* stack pointer we fall back to regs as stack if no previous stack +* exists. +* +* This is valid only for kernel mode traps. +*/ +unsigned long kernel_stack_pointer (struct pt_regs *regs) +{ +unsigned long context = (unsigned long )regs & ~(THREAD_SIZE -1 ); +unsigned long sp = (unsigned long )®s->sp; +struct thread_info *tinfo; + +if (context == (sp & ~(THREAD_SIZE -1 ))) +return sp; + + tinfo = (struct thread_info *)context; +if (tinfo->previous_esp) +return tinfo->previous_esp; + +return (unsigned long )regs; +} +static unsigned long *pt_regs_access (struct pt_regs *regs,unsigned long regno) {BUILD_BUG_ON (offsetof(struct pt_regs , bx) !=0 );
drivers/ata/sata_svw.c +35 -0
@@ -142,6 +142,39 @@ static int k2_sata_scr_write(struct ata_link *link,return 0 ; } +static int k2_sata_softreset (struct ata_link *link, +unsigned int *class,unsigned long deadline) +{ +u8 dmactl; +void __iomem *mmio = link->ap->ioaddr.bmdma_addr; + + dmactl =readb (mmio +ATA_DMA_CMD ); + +/* Clear the start bit */ +if (dmactl &ATA_DMA_START ) { + dmactl &= ~ATA_DMA_START ; +writeb (dmactl, mmio +ATA_DMA_CMD ); + } + +return ata_sff_softreset (link, class, deadline); +} + +static int k2_sata_hardreset (struct ata_link *link, +unsigned int *class,unsigned long deadline) +{ +u8 dmactl; +void __iomem *mmio = link->ap->ioaddr.bmdma_addr; + + dmactl =readb (mmio +ATA_DMA_CMD ); + +/* Clear the start bit */ +if (dmactl &ATA_DMA_START ) { + dmactl &= ~ATA_DMA_START ; +writeb (dmactl, mmio +ATA_DMA_CMD ); + } + +return sata_sff_hardreset (link, class, deadline); +}static void k2_sata_tf_load (struct ata_port *ap,const struct ata_taskfile *tf) {
@@ -346,6 +379,8 @@ static struct scsi_host_template k2_sata_sht = {static struct ata_port_operations k2_sata_ops = { .inherits = &ata_bmdma_port_ops, + .softreset = k2_sata_softreset, + .hardreset = k2_sata_hardreset, .sff_tf_load = k2_sata_tf_load, .sff_tf_read = k2_sata_tf_read, .sff_check_status = k2_stat_check_status,
drivers/block/DAC960.c +10 -8
@@ -1177,7 +1177,8 @@ static bool DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_Tint TimeoutCounter;int i; - +memset (&CommandMailbox,0 ,sizeof (DAC960_V1_CommandMailbox_T)); +if (pci_set_dma_mask (Controller->PCIDevice,DMA_BIT_MASK (32 )))return DAC960_Failure (Controller,"DMA mask out of range" ); Controller->BounceBufferLimit =DMA_BIT_MASK (32 );
@@ -4627,7 +4628,8 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)DAC960_Controller_T *Controller = Command->Controller;DAC960_CommandType_T CommandType = Command->CommandType;DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox; -DAC960_V2_IOCTL_Opcode_T CommandOpcode = CommandMailbox->Common.IOCTL_Opcode; +DAC960_V2_IOCTL_Opcode_T IOCTLOpcode = CommandMailbox->Common.IOCTL_Opcode; +DAC960_V2_CommandOpcode_T CommandOpcode = CommandMailbox->SCSI_10.CommandOpcode;DAC960_V2_CommandStatus_T CommandStatus = Command->V2.CommandStatus; if (CommandType == DAC960_ReadCommand ||
@@ -4699,7 +4701,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command) {if (Controller->ShutdownMonitoringTimer)return ; -if (CommandOpcode == DAC960_V2_GetControllerInfo) +if (IOCTLOpcode == DAC960_V2_GetControllerInfo) {DAC960_V2_ControllerInfo_T *NewControllerInfo = Controller->V2.NewControllerInformation;
@@ -4719,14 +4721,14 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)memcpy (ControllerInfo, NewControllerInfo,sizeof (DAC960_V2_ControllerInfo_T)); } -else if (CommandOpcode == DAC960_V2_GetEvent) +else if (IOCTLOpcode == DAC960_V2_GetEvent) {if (CommandStatus == DAC960_V2_NormalCompletion) {DAC960_V2_ReportEvent (Controller, Controller->V2.Event); } Controller->V2.NextEventSequenceNumber++; } -else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid && +else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid && CommandStatus == DAC960_V2_NormalCompletion) { DAC960_V2_PhysicalDeviceInfo_T *NewPhysicalDeviceInfo =
@@ -4915,7 +4917,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command) NewPhysicalDeviceInfo->LogicalUnit++; Controller->V2.PhysicalDeviceIndex++; } -else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid) +else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid) {unsigned int DeviceIndex; for (DeviceIndex = Controller->V2.PhysicalDeviceIndex;
@@ -4938,7 +4940,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command) } Controller->V2.NeedPhysicalDeviceInformation = false; } -else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid && +else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid && CommandStatus == DAC960_V2_NormalCompletion) { DAC960_V2_LogicalDeviceInfo_T *NewLogicalDeviceInfo =
@@ -5065,7 +5067,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command) [LogicalDeviceNumber] = true; NewLogicalDeviceInfo->LogicalDeviceNumber++; } -else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid) +else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid) {int LogicalDriveNumber; for (LogicalDriveNumber = 0;
drivers/gpu/drm/radeon/radeon_agp.c +4 -1
@@ -70,9 +70,12 @@ static struct radeon_agpmode_quirk radeon_agpmode_quirk_list[] = {/* Intel 82830 830 Chipset Host Bridge / Mobility M6 LY Needs AGPMode 2 (fdo #17360)*/ {PCI_VENDOR_ID_INTEL ,0x3575 ,PCI_VENDOR_ID_ATI ,0x4c59 , PCI_VENDOR_ID_DELL, 0x00e3, 2}, -/* Intel 82852/82855 host bridge / Mobility FireGL 9000 R250 Needs AGPMode 1 (lp #296617) */ +/* Intel 82852/82855 host bridge / Mobility FireGL 9000 RV250 Needs AGPMode 1 (lp #296617) */ { PCI_VENDOR_ID_INTEL, 0x3580, PCI_VENDOR_ID_ATI, 0x4c66, PCI_VENDOR_ID_DELL, 0x0149, 1}, +/* Intel 82855PM host bridge / Mobility FireGL 9000 RV250 Needs AGPMode 1 for suspend/resume */ + { PCI_VENDOR_ID_INTEL, 0x3340, PCI_VENDOR_ID_ATI, 0x4c66, + PCI_VENDOR_ID_IBM, 0x0531, 1},/* Intel 82852/82855 host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (deb #467460) */ { PCI_VENDOR_ID_INTEL, 0x3580, PCI_VENDOR_ID_ATI, 0x4e50, 0x1025, 0x0061, 1},
drivers/input/mouse/bcm5974.c +3 -0
@@ -373,6 +373,9 @@ static void setup_events_to_report(struct input_dev *input_dev,__set_bit (BTN_TOOL_QUADTAP , input_dev->keybit);__set_bit (BTN_LEFT , input_dev->keybit); +if (cfg->caps &HAS_INTEGRATED_BUTTON ) +__set_bit (INPUT_PROP_BUTTONPAD , input_dev->propbit); +input_set_events_per_packet (input_dev,60 ); }
drivers/isdn/gigaset/bas-gigaset.c +16 -3
@@ -616,7 +616,13 @@ static void int_in_work(struct work_struct *work)if (rc ==0 )/* success, resubmit interrupt read URB */ rc =usb_submit_urb (urb,GFP_ATOMIC ); -if (rc !=0 && rc != -ENODEV ) { + +switch (rc) { +case 0 :/* success */ +case -ENODEV :/* device gone */ +case -EINVAL :/* URB already resubmitted, or terminal badness */ +break ; +default :/* failure: try to recover by resetting the device */ dev_err (cs->dev,"clear halt failed: %s\n" ,get_usb_rcmsg (rc)); rc =usb_lock_device_for_reset (ucs->udev, ucs->interface);if (rc ==0 ) {
@@ -2437,7 +2443,9 @@ static void gigaset_disconnect(struct usb_interface *interface) }/* gigaset_suspend -* This function is called before the USB connection is suspended. +* This function is called before the USB connection is suspended +* or before the USB device is reset. +* In the latter case, message == PMSG_ON. */ static int gigaset_suspend (struct usb_interface *intf,pm_message_t message) {
@@ -2493,7 +2501,12 @@ static int gigaset_suspend(struct usb_interface *intf, pm_message_t message)del_timer_sync (&ucs->timer_atrdy);del_timer_sync (&ucs->timer_cmd_in);del_timer_sync (&ucs->timer_int_in); -cancel_work_sync (&ucs->int_in_wq); + +/* don't try to cancel int_in_wq from within reset as it +* might be the one requesting the reset +*/ +if (message.event !=PM_EVENT_ON ) +cancel_work_sync (&ucs->int_in_wq);gig_dbg (DEBUG_SUSPEND ,"suspend complete" );return 0 ;
drivers/md/dm.c +7 -1
@@ -745,8 +745,14 @@ static void rq_completed(struct mapped_device *md, int rw, int run_queue)if (!md_in_flight (md))wake_up (&md->wait); +/* +* Run this off this callpath, as drivers could invoke end_io while +* inside their request_fn (and holding the queue lock). Calling +* back into ->request_fn() could deadlock attempting to grab the +* queue lock again. +*/ if (run_queue) -blk_run_queue (md->queue); +blk_run_queue_async (md->queue);/* * dm_put() must be at the end of this function. See the comment above
drivers/mmc/host/sdhci-s3c.c +1 -1
@@ -589,7 +589,7 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev)sdhci_remove_host (host,1 ); -for (ptr =0 ; ptr <3 ; ptr++) { +for (ptr =0 ; ptr <MAX_BUS_CLK ; ptr++) {if (sc->clk_bus[ptr]) {clk_disable (sc->clk_bus[ptr]);clk_put (sc->clk_bus[ptr]);
drivers/mtd/devices/slram.c +1 -1
@@ -266,7 +266,7 @@ static int parse_cmdline(char *devname, char *szstart, char *szlength)if (*(szlength) !='+' ) { devlength =simple_strtoul (szlength, &buffer,0 ); - devlength =handle_unit (devlength, buffer) - devstart; + devlength =handle_unit (devlength, buffer);if (devlength < devstart) goto err_out;
drivers/net/ixgbe/ixgbe_82599.c +2 -0
@@ -360,6 +360,8 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)case IXGBE_DEV_ID_82599_SFP_FCOE :case IXGBE_DEV_ID_82599_SFP_EM :case IXGBE_DEV_ID_82599_SFP_SF2 : +case IXGBE_DEV_ID_82599EN_SFP : +case IXGBE_DEV_ID_82599_SFP_SF_QP : media_type = ixgbe_media_type_fiber;break ;case IXGBE_DEV_ID_82599_CX4 :
drivers/net/ixgbe/ixgbe_common.c +1 -0
@@ -3181,6 +3181,7 @@ static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)switch (hw->device_id) {case IXGBE_DEV_ID_X540T : +case IXGBE_DEV_ID_X540T1 :return 0 ;case IXGBE_DEV_ID_82599_T3_LOM :return 0 ;
drivers/net/ixgbe/ixgbe_main.c +6 -0
@@ -129,6 +129,12 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { board_82599 }, {PCI_VDEVICE (INTEL ,IXGBE_DEV_ID_82599_LS ), board_82599 }, + {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599EN_SFP), + board_82599 }, + {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP), + board_82599 }, + {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T1), + board_X540 },/* required last entry */ {0, }
drivers/net/ixgbe/ixgbe_type.h +3 -0
@@ -59,11 +59,14 @@#define IXGBE_SUBDEV_ID_82599_SFP 0x11A9#define IXGBE_DEV_ID_82599_SFP_EM 0x1507#define IXGBE_DEV_ID_82599_SFP_SF2 0x154D +#define IXGBE_DEV_ID_82599EN_SFP 0x1557#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC#define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8#define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ 0x000C#define IXGBE_DEV_ID_82599_LS 0x154F +#define IXGBE_DEV_ID_82599_SFP_SF_QP 0x154A#define IXGBE_DEV_ID_X540T 0x1528 +#define IXGBE_DEV_ID_X540T1 0x1560/* General Registers */ #define IXGBE_CTRL 0x00000
drivers/net/wireless/mwifiex/sdio.c +6 -5
@@ -122,7 +122,6 @@ static int mwifiex_sdio_suspend(struct device *dev)struct sdio_mmc_card *card;struct mwifiex_adapter *adapter;mmc_pm_flag_t pm_flag =0 ; -int hs_actived =0 ;int i;int ret =0 ;
@@ -149,12 +148,14 @@ static int mwifiex_sdio_suspend(struct device *dev) adapter = card->adapter;/* Enable the Host Sleep */ - hs_actived =mwifiex_enable_hs (adapter); -if (hs_actived) { -pr_debug ("cmd: suspend with MMC_PM_KEEP_POWER\n" ); - ret =sdio_set_host_pm_flags (func,MMC_PM_KEEP_POWER ); +if (!mwifiex_enable_hs (adapter)) { +dev_err (adapter->dev,"cmd: failed to suspend\n" ); +return -EFAULT ; } +dev_dbg (adapter->dev,"cmd: suspend with MMC_PM_KEEP_POWER\n" ); + ret =sdio_set_host_pm_flags (func,MMC_PM_KEEP_POWER ); +/* Indicate device suspended */ adapter->is_suspended = true;
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 -0
@@ -295,6 +295,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {/*=== Customer ID ===*/ /****** 8188CU ********/ {RTL_USB_DEVICE(0x050d, 0x1102, rtl92cu_hal_cfg)}, /*Belkin - Edimax*/ + {RTL_USB_DEVICE(0x050d, 0x11f2, rtl92cu_hal_cfg)}, /*Belkin - ISY*/ {RTL_USB_DEVICE(0x06f8, 0xe033, rtl92cu_hal_cfg)}, /*Hercules - Edimax*/ {RTL_USB_DEVICE(0x07b8, 0x8188, rtl92cu_hal_cfg)}, /*Abocom - Abocom*/ {RTL_USB_DEVICE(0x07b8, 0x8189, rtl92cu_hal_cfg)}, /*Funai - Abocom*/
drivers/platform/x86/acer-wmi.c +1 -0
@@ -104,6 +104,7 @@ static const struct key_entry acer_wmi_keymap[] = { {KE_KEY, 0x22, {KEY_PROG2} }, /* Arcade */ {KE_KEY, 0x23, {KEY_PROG3} }, /* P_Key */ {KE_KEY, 0x24, {KEY_PROG4} }, /* Social networking_Key */ + {KE_KEY, 0x29, {KEY_PROG3} }, /* P_Key for TM8372 */ {KE_IGNORE, 0x41, {KEY_MUTE} }, {KE_IGNORE, 0x42, {KEY_PREVIOUSSONG} }, {KE_IGNORE, 0x43, {KEY_NEXTSONG} },
drivers/scsi/isci/request.c +1 -1
@@ -1693,7 +1693,7 @@ sci_io_request_frame_handler(struct isci_request *ireq, frame_index, (void **)&frame_buffer); -sci_controller_copy_sata_response (&ireq->stp.req, +sci_controller_copy_sata_response (&ireq->stp.rsp, frame_header, frame_buffer);
drivers/usb/serial/mct_u232.c +8 -6
@@ -577,12 +577,14 @@ static void mct_u232_close(struct usb_serial_port *port) {dbg ("%s port %d" , __func__, port->number); -if (port->serial->dev) { -/* shutdown our urbs */ -usb_kill_urb (port->write_urb); -usb_kill_urb (port->read_urb); -usb_kill_urb (port->interrupt_in_urb); - } +/* +* Must kill the read urb as it is actually an interrupt urb, which +* generic close thus fails to kill. +*/ +usb_kill_urb (port->read_urb); +usb_kill_urb (port->interrupt_in_urb); + +usb_serial_generic_close (port); }/* mct_u232_close */
drivers/video/riva/fbdev.c +2 -3
@@ -1816,6 +1816,8 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var, specs->modedb, specs->modedb_len, NULL, 8); }else if (specs->modedb !=NULL ) { +/* get first mode in database as fallback */ + modedb = specs->modedb[0 ];/* get preferred timing */ if (info->monspecs.misc &FB_MISC_1ST_DETAIL ) {int i;
@@ -1826,9 +1828,6 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var,break ; } } - }else { -/* otherwise, get first mode in database */ - modedb = specs->modedb[0 ]; } var->bits_per_pixel =8 ;riva_update_var (var, &modedb);
fs/jbd/transaction.c +2 -0
@@ -1955,7 +1955,9 @@ retry:spin_unlock (&journal->j_list_lock);jbd_unlock_bh_state (bh);spin_unlock (&journal->j_state_lock); +unlock_buffer (bh);log_wait_commit (journal, tid); +lock_buffer (bh); goto retry; }/*
kernel/futex.c +17 -1
@@ -843,6 +843,9 @@ static void wake_futex(struct futex_q *q) {struct task_struct *p = q->task; +if (WARN (q->pi_state || q->rt_waiter,"refusing to wake PI futex\n" )) +return ; +/* * We set q->lock_ptr = NULL _before_ we wake up the task. If * a non-futex wake up happens on another CPU then the task
@@ -1078,6 +1081,10 @@ retry_private:plist_for_each_entry_safe (this, next, head, list) {if (match_futex (&this->key, &key1)) { +if (this->pi_state || this->rt_waiter) { + ret = -EINVAL ; + goto out_unlock; + }wake_futex (this);if (++ret >= nr_wake)break ;
@@ -1090,6 +1097,10 @@ retry_private: op_ret =0 ;plist_for_each_entry_safe (this, next, head, list) {if (match_futex (&this->key, &key2)) { +if (this->pi_state || this->rt_waiter) { + ret = -EINVAL ; + goto out_unlock; + }wake_futex (this);if (++op_ret >= nr_wake2)break ;
@@ -1098,6 +1109,7 @@ retry_private: ret += op_ret; } +out_unlock:double_unlock_hb (hb1, hb2); out_put_keys:put_futex_key (&key2);
@@ -1387,9 +1399,13 @@ retry_private:/* * FUTEX_WAIT_REQEUE_PI and FUTEX_CMP_REQUEUE_PI should always * be paired with each other and no other futex ops. +* +* We should never be requeueing a futex_q with a pi_state, +* which is awaiting a futex_unlock_pi(). */ if ((requeue_pi && !this->rt_waiter) || - (!requeue_pi && this->rt_waiter)) { + (!requeue_pi && this->rt_waiter) || + this->pi_state) { ret = -EINVAL ;break ; }
kernel/watchdog.c +2 -2
@@ -113,7 +113,7 @@ static unsigned long get_timestamp(int this_cpu)return cpu_clock (this_cpu) >>30LL ;/* 2^30 ~= 10^9 */ } -static unsigned long get_sample_period (void ) +static u64 get_sample_period (void ) {/* * convert watchdog_thresh from seconds to ns
@@ -121,7 +121,7 @@ static unsigned long get_sample_period(void)* increment before the hardlockup detector generates * a warning */ -return get_softlockup_thresh () * (NSEC_PER_SEC /5 ); +return get_softlockup_thresh () * ((u64 )NSEC_PER_SEC /5 ); }/* Commands for resetting the watchdog */
net/can/bcm.c +3 -0
@@ -1085,6 +1085,9 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, op->sk = sk; op->ifindex = ifindex; +/* ifindex for timeout events w/o previous frame reception */ + op->rx_ifindex = ifindex; +/* initialize uninitialized (kzalloc) structure */ hrtimer_init (&op->timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); op->timer.function = bcm_rx_timeout_handler;
net/mac80211/ibss.c +4 -4
@@ -965,10 +965,6 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)mutex_lock (&sdata->u.ibss.mtx); - sdata->u.ibss.state =IEEE80211_IBSS_MLME_SEARCH ; -memset (sdata->u.ibss.bssid,0 ,ETH_ALEN ); - sdata->u.ibss.ssid_len =0 ; - active_ibss =ieee80211_sta_active_ibss (sdata);if (!active_ibss && !is_zero_ether_addr (ifibss->bssid)) {
@@ -989,6 +985,10 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) } } + ifibss->state =IEEE80211_IBSS_MLME_SEARCH ; +memset (ifibss->bssid,0 ,ETH_ALEN ); + ifibss->ssid_len =0 ; +sta_info_flush (sdata->local, sdata);/* remove beacon */
sound/pci/hda/patch_realtek.c +4 -0
@@ -5967,6 +5967,7 @@ static void fillup_priv_adc_nids(struct hda_codec *codec, const hda_nid_t *nids, ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 3, idx, dir))static const struct snd_pci_quirk beep_white_list[] = { +SND_PCI_QUIRK (0x1043 ,0x103c ,"ASUS" ,1 ),SND_PCI_QUIRK (0x1043 ,0x829f ,"ASUS" ,1 ),SND_PCI_QUIRK (0x1043 ,0x83ce ,"EeePC" ,1 ),SND_PCI_QUIRK (0x1043 ,0x831a ,"EeePC" ,1 ),
@@ -20134,6 +20135,9 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = { { .id = 0x10ec0276, .name = "ALC276", .patch = patch_alc269 }, { .id = 0x10ec0280, .name = "ALC280", .patch = patch_alc269 }, { .id = 0x10ec0282, .name = "ALC282", .patch = patch_alc269 }, + { .id = 0x10ec0283, .name = "ALC283", .patch = patch_alc269 }, + { .id = 0x10ec0290, .name = "ALC290", .patch = patch_alc269 }, + { .id = 0x10ec0292, .name = "ALC292", .patch = patch_alc269 }, { .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660", .patch = patch_alc861 }, { .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },
sound/pcmcia/pdaudiocf/pdaudiocf.c +1 -1
@@ -223,7 +223,7 @@ static int pdacf_config(struct pcmcia_device *link)if (ret) goto failed; - ret =pcmcia_request_exclusive_irq (link, pdacf_interrupt); + ret =pcmcia_request_irq (link, pdacf_interrupt);if (ret) goto failed;
sound/pcmcia/vx/vxpocket.c +1 -1
@@ -229,7 +229,7 @@ static int vxpocket_config(struct pcmcia_device *link)if (ret) goto failed; - ret =pcmcia_request_exclusive_irq (link, snd_vx_irq_handler); + ret =pcmcia_request_irq (link, snd_vx_irq_handler);if (ret) goto failed;
sound/usb/midi.c +6 -2
@@ -147,6 +147,7 @@ struct snd_usb_midi_out_endpoint {struct snd_usb_midi_out_endpoint * ep;struct snd_rawmidi_substream *substream;int active; +bool autopm_reference;uint8_t cable;/* cable number << 4 */ uint8_t state;#define STATE_UNKNOWN 0
@@ -1059,7 +1060,8 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)return -ENXIO ; } err =usb_autopm_get_interface (umidi->iface); -if (err <0 ) + port->autopm_reference = err >=0 ; +if (err <0 && err != -EACCES )return -EIO ; substream->runtime->private_data = port; port->state =STATE_UNKNOWN ;
@@ -1070,9 +1072,11 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)static int snd_usbmidi_output_close (struct snd_rawmidi_substream *substream) {struct snd_usb_midi * umidi = substream->rmidi->private_data; +struct usbmidi_out_port *port = substream->runtime->private_data;substream_open (substream,0 ); -usb_autopm_put_interface (umidi->iface); +if (port->autopm_reference) +usb_autopm_put_interface (umidi->iface);return 0 ; }