Linux 3.4.59
Greg KH
maintainerI'm announcing the release of the 3.4.59 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.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
------------
Makefile | 2 arch/alpha/Makefile | 2 arch/arm/kernel/perf_event.c | 10 +++- arch/cris/arch-v10/lib/Makefile | 3 - arch/cris/include/asm/posix_types.h | 2 arch/cris/kernel/vmlinux.lds.S | 1 arch/frv/include/asm/thread_info.h | 2 arch/frv/kernel/process.c | 15 ------ arch/m68k/emu/natfeat.c | 23 ++++++++-- arch/m68k/include/asm/div64.h | 9 ++- arch/microblaze/configs/mmu_defconfig | 49 ++++++++++++++------- arch/microblaze/configs/nommu_defconfig | 71 ++++++++++++++++++------------- arch/mips/Kconfig | 2 arch/mips/include/asm/io.h | 5 ++ arch/mips/include/asm/page.h | 17 +++---- arch/powerpc/mm/numa.c | 2 arch/sparc/lib/Makefile | 2 arch/sparc/lib/ucmpdi2.c | 19 ++++++++ arch/xtensa/kernel/Makefile | 1 arch/xtensa/kernel/vmlinux.lds.S | 3 - arch/xtensa/mm/init.c | 6 +- drivers/gpu/drm/i915/intel_lvds.c | 8 --- drivers/hid/hid-microsoft.c | 6 +- drivers/md/raid1.c | 22 ++++----- drivers/md/raid10.c | 14 +++--- drivers/net/can/usb/peak_usb/pcan_usb.c | 2 drivers/net/wireless/iwlegacy/4965-mac.c | 16 +++--- drivers/net/wireless/iwlegacy/common.c | 1 drivers/usb/core/quirks.c | 6 ++ drivers/usb/serial/mos7720.c | 21 ++++++--- fs/ext4/ext4_jbd2.c | 8 +-- fs/proc/task_mmu.c | 8 +-- include/linux/hugetlb.h | 16 ++++++ kernel/futex.c | 3 - mm/hugetlb.c | 17 +++++++ mm/nommu.c | 10 ++++ net/key/af_key.c | 1 sound/oss/Kconfig | 1 38 files changed, 261 insertions(+), 145 deletions(-)
Andreas Schwab (1):
m68k: Truncate base in do_div()
Benjamin Herrenschmidt (1):
powerpc/numa: Avoid stupid uninitialized warning from gcc
Daniel Vetter (1):
drm/i915/lvds: ditch ->prepare special case
David S. Miller (1):
sparc32: Add ucmpdi2.o to obj-y instead of lib-y.
Geert Uytterhoeven (2):
xtensa: replace xtensa-specific _f{data,text} by _s{data,text} m68k/atari: ARAnyM - Fix NatFeat module support
Greg Kroah-Hartman (1):
Linux 3.4.59
Jan Kara (1):
jbd2: Fix use after free after error in jbd2_journal_dirty_metadata()
Jesper Nilsson (1):
CRIS: Add _sdata to vmlinux.lds.S
Jiri Slaby (2):
HID: microsoft: do not use compound literal - fix build
cris: posix_types.h, include asm-generic/posix_types.h
Johan Hovold (1):
USB: mos7720: fix broken control requests
Linus Torvalds (1):
vm: add no-mmu vm_iomap_memory() stub
Markos Chandras (1):
MIPS: Expose missing pci_io{map,unmap} declarations
Max Filippov (1):
xtensa: fix linker script transformation for .text.unlikely
Michal Simek (1):
microblaze: Update microblaze defconfigs
NeilBrown (1):
md/raid1,raid10: use freeze_array in place of raise_barrier in various places.
Nicolas Dichtel (1):
af_key: initialize satype in key_notify_policy_flush()
Oliver Neukum (1):
usb: add two quirky touchscreen
Paul Bolle (1):
sound: Fix make allmodconfig on MIPS correctly
Paul Gortmaker (1):
cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile
Ralf Baechle (1):
MIPS: Rewrite pfn_valid to work in modules, too.
Sam Ravnborg (1):
sparc32: add ucmpdi2
Stanislaw Gruszka (2):
iwl4965: set power mode early
iwl4965: reset firmware after rfkill off
Stephane Grosjean (1):
can: pcan_usb: fix wrong memcpy() bytes length
Stephen Boyd (1):
perf/arm: Fix armpmu_map_hw_event()
Takashi Iwai (1):
sound: Fix make allmodconfig on MIPS
Thomas Gleixner (2):
frv: Use correct size for task_struct allocation
frv: Use core allocator for task_struct
Will Deacon (2):
alpha: makefile: don't enforce small data model for kernel builds
ARM: 7809/1: perf: fix event validation for software group leaders
Zhang Yi (1):
futex: Take hugepages into account when generating futex_key
yonghua zheng (1):
fs/proc/task_mmu.c: fix buffer overflow in add_page_map()
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 58 +SUBLEVEL = 59 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/alpha/Makefile +1 -1
@@ -12,7 +12,7 @@ NM := $(NM) -B LDFLAGS_vmlinux := -static -N #-relax CHECKFLAGS += -D__alpha__ -m64 -cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data +cflags-y := -pipe -mno-fp-regs -ffixed-8 cflags-y += $(call cc-option, -fno-jump-tables) cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4
arch/arm/kernel/perf_event.c +9 -1
@@ -109,7 +109,12 @@ armpmu_map_cache_event(const unsigned (*cache_map)static int armpmu_map_event (const unsigned (*event_map)[PERF_COUNT_HW_MAX ],u64 config) { -int mapping = (*event_map)[config]; +int mapping; + +if (config >=PERF_COUNT_HW_MAX ) +return -ENOENT ; + + mapping = (*event_map)[config];return mapping ==HW_OP_UNSUPPORTED ? -ENOENT : mapping; }
@@ -319,6 +324,9 @@ validate_event(struct pmu_hw_events *hw_events,struct hw_perf_event fake_event = event->hw;struct pmu *leader_pmu = event->group_leader->pmu; +if (is_software_event (event)) +return 1 ; +if (event->pmu != leader_pmu || event->state <PERF_EVENT_STATE_OFF )return 1 ;
arch/cris/arch-v10/lib/Makefile +0 -3
@@ -2,8 +2,5 @@ # Makefile for Etrax-specific library files.. # - -EXTRA_AFLAGS := -traditional - lib-y = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
arch/cris/include/asm/posix_types.h +2 -0
@@ -33,4 +33,6 @@ typedef int __kernel_ptrdiff_t;typedef unsigned short __kernel_old_dev_t ;#define __kernel_old_dev_t __kernel_old_dev_t +#include <asm-generic/posix_types.h> +#endif /* __ARCH_CRIS_POSIX_TYPES_H */
arch/cris/kernel/vmlinux.lds.S +1 -0
@@ -52,6 +52,7 @@ SECTIONS EXCEPTION_TABLE(4) + _sdata = .; RODATA . = ALIGN (4);
arch/frv/include/asm/thread_info.h +0 -2
@@ -21,8 +21,6 @@#define THREAD_SIZE 8192 -#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR -/* * low level task data that entry.S needs immediate access to * - this struct should fit entirely inside of one cache line
arch/frv/kernel/process.c +0 -15
@@ -44,21 +44,6 @@ asmlinkage void ret_from_fork(void);void (*pm_power_off)(void );EXPORT_SYMBOL (pm_power_off); -struct task_struct *alloc_task_struct_node (int node) -{ -struct task_struct *p =kmalloc_node (THREAD_SIZE ,GFP_KERNEL , node); - -if (p) -atomic_set ((atomic_t *)(p+1 ),1 ); -return p; -} - -void free_task_struct (struct task_struct *p) -{ -if (atomic_dec_and_test ((atomic_t *)(p+1 ))) -kfree (p); -} -static void core_sleep_idle (void ) {#ifdef LED_DEBUG_SLEEP
arch/m68k/emu/natfeat.c +19 -4
@@ -18,9 +18,11 @@#include <asm/machdep.h> #include <asm/natfeat.h> +extern long nf_get_id2 (const char *feature_name); + asm("\n" -" .global nf_get_id,nf_call\n" -"nf_get_id:\n" +" .global nf_get_id2,nf_call\n" +"nf_get_id2:\n" " .short 0x7300\n" " rts\n" "nf_call:\n"
@@ -29,12 +31,25 @@ asm("\n""1: moveq.l #0,%d0\n" " rts\n" " .section __ex_table,\"a\"\n" -" .long nf_get_id,1b\n" +" .long nf_get_id2,1b\n" " .long nf_call,1b\n" " .previous"); -EXPORT_SYMBOL_GPL (nf_get_id);EXPORT_SYMBOL_GPL (nf_call); +long nf_get_id (const char *feature_name) +{ +/* feature_name may be in vmalloc()ed memory, so make a copy */ +char name_copy[32 ]; +size_t n; + + n =strlcpy (name_copy, feature_name,sizeof (name_copy)); +if (n >=sizeof (name_copy)) +return 0 ; + +return nf_get_id2 (name_copy); +} +EXPORT_SYMBOL_GPL (nf_get_id); +void nfprint (const char *fmt, ...) {static char buf[256 ];
arch/m68k/include/asm/div64.h +5 -4
@@ -15,16 +15,17 @@unsigned long long n64; \ } __n; \unsigned long __rem, __upper; \ +unsigned long __base = (base); \ \ __n.n64 = (n); \if ((__upper = __n.n32[0 ])) { \ asm ("divul.l %2,%1:%0" \ - :"=d" (__n.n32[0 ]),"=d" (__upper) \ - :"d" (base),"0" (__n.n32[0 ])); \ + :"=d" (__n.n32[0 ]),"=d" (__upper) \ + :"d" (__base),"0" (__n.n32[0 ])); \ } \ asm ("divu.l %2,%1:%0" \ - :"=d" (__n.n32[1 ]),"=d" (__rem) \ - :"d" (base),"1" (__upper),"0" (__n.n32[1 ])); \ + :"=d" (__n.n32[1 ]),"=d" (__rem) \ + :"d" (__base),"1" (__upper),"0" (__n.n32[1 ])); \ (n) = __n.n64; \ __rem; \ })
arch/microblaze/configs/mmu_defconfig +33 -16
91 lines not on this page · raw message
arch/microblaze/configs/nommu_defconfig +42 -29
124 lines not on this page · raw message
arch/mips/Kconfig +1 -1
@@ -24,6 +24,7 @@ config MIPS select HAVE_GENERIC_HARDIRQS select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW + select GENERIC_PCI_IOMAP select HAVE_ARCH_JUMP_LABEL select IRQ_FORCED_THREADING select HAVE_MEMBLOCK
@@ -2356,7 +2357,6 @@ config PCI bool "Support for PCI controller" depends on HW_HAS_PCI select PCI_DOMAINS - select GENERIC_PCI_IOMAP select NO_GENERIC_PCI_IOPORT_MAP help Find out whether you have a PCI motherboard. PCI is the name of a
arch/mips/include/asm/io.h +5 -0
@@ -168,6 +168,11 @@ static inline void * isa_bus_to_virt(unsigned long address)extern void __iomem *__ioremap (phys_t offset,phys_t size,unsigned long flags);extern void __iounmap (const volatile void __iomem *addr); +#ifndef CONFIG_PCI +struct pci_dev ; +static inline void pci_iounmap (struct pci_dev *dev,void __iomem *addr) {} +#endif +static inline void __iomem *__ioremap_mode (phys_t offset,unsigned long size,unsigned long flags) {
arch/mips/include/asm/page.h +9 -8
@@ -175,14 +175,15 @@ typedef struct { unsigned long pgprot; } pgprot_t;#ifdef CONFIG_FLATMEM -#define pfn_valid(pfn) \ -({ \ - unsigned long __pfn = (pfn); \ - /* avoid <linux/bootmem.h> include hell */ \ - extern unsigned long min_low_pfn; \ - \ - __pfn >= min_low_pfn && __pfn < max_mapnr; \ -}) +#ifndef __ASSEMBLY__ +static inline int pfn_valid (unsigned long pfn) +{ +/* avoid <linux/mm.h> include hell */ +extern unsigned long max_mapnr; + +return pfn >=ARCH_PFN_OFFSET && pfn < max_mapnr; +} +#endif #elif defined(CONFIG_SPARSEMEM )
arch/powerpc/mm/numa.c +1 -1
@@ -639,7 +639,7 @@ static void __init parse_drconf_memory(struct device_node *memory)unsigned int n, rc, ranges, is_kexec_kdump =0 ;unsigned long lmb_size, base, size, sz;int nid; -struct assoc_arrays aa; +struct assoc_arrays aa = { .arrays =NULL }; n =of_get_drconf_memory (memory, &dm);if (!n)
arch/sparc/lib/Makefile +1 -1
@@ -40,7 +40,7 @@ lib-$(CONFIG_SPARC64) += copy_in_user.o user_fixup.o memmove.o lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o obj-y += iomap.o -obj-$(CONFIG_SPARC32) += atomic32.o +obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o obj-y += ksyms.o obj-$(CONFIG_SPARC64) += PeeCeeI.o obj-y += usercopy.o
arch/sparc/lib/ucmpdi2.c new file +19 -0
@@ -0,0 +1,19 @@ +#include <linux/module.h> +#include "libgcc.h" + +word_type __ucmpdi2 (unsigned long long a,unsigned long long b) +{ +const DWunion au = {.ll = a}; +const DWunion bu = {.ll = b}; + +if ((unsigned int ) au.s.high < (unsigned int ) bu.s.high) +return 0 ; +else if ((unsigned int ) au.s.high > (unsigned int ) bu.s.high) +return 2 ; +if ((unsigned int ) au.s.low < (unsigned int ) bu.s.low) +return 0 ; +else if ((unsigned int ) au.s.low > (unsigned int ) bu.s.low) +return 2 ; +return 1 ; +} +EXPORT_SYMBOL (__ucmpdi2);
arch/xtensa/kernel/Makefile +1 -0
@@ -24,6 +24,7 @@ obj-$(CONFIG_MODULES) += xtensa_ksyms.o module.o # Replicate rules in scripts/Makefile.build sed-y = -e 's/\*(\(\.[a-z]*it\|\.ref\|\)\.text)/*(\1.literal \1.text)/g' \ + -e 's/\.text\.unlikely/.literal.unlikely .text.unlikely/g' \ -e 's/\*(\(\.text\.[a-z]*\))/*(\1.literal \1)/g' quiet_cmd__cpp_lds_S = LDS $@
arch/xtensa/kernel/vmlinux.lds.S +1 -2
@@ -83,7 +83,6 @@ SECTIONS _text = .; _stext = .; - _ftext = .; .text : {
@@ -112,7 +111,7 @@ SECTIONS EXCEPTION_TABLE(16) /* Data section */ - _fdata = .; + _sdata = .; RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE) _edata = .;
arch/xtensa/mm/init.c +3 -3
@@ -29,7 +29,7 @@/* References to section boundaries */ -extern char _ftext, _etext, _fdata, _edata, _rodata_end; +extern char _stext, _etext, _sdata, _edata, _rodata_end;extern char __init_begin, __init_end;/*
@@ -197,8 +197,8 @@ void __init mem_init(void) reservedpages++; } - codesize = (unsigned long ) &_etext - (unsigned long ) &_ftext; - datasize = (unsigned long ) &_edata - (unsigned long ) &_fdata; + codesize = (unsigned long ) &_etext - (unsigned long ) &_stext; + datasize = (unsigned long ) &_edata - (unsigned long ) &_sdata; initsize = (unsigned long ) &__init_end - (unsigned long ) &__init_begin; printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
drivers/gpu/drm/i915/intel_lvds.c +1 -7
@@ -408,13 +408,7 @@ static void intel_lvds_prepare(struct drm_encoder *encoder) {struct intel_lvds *intel_lvds =to_intel_lvds (encoder); -/* -* Prior to Ironlake, we must disable the pipe if we want to adjust -* the panel fitter. However at all other times we can just reset -* the registers regardless. -*/ -if (!HAS_PCH_SPLIT (encoder->dev) && intel_lvds->pfit_dirty) -intel_lvds_disable (intel_lvds); +intel_lvds_disable (intel_lvds); }static void intel_lvds_commit (struct drm_encoder *encoder)
drivers/hid/hid-microsoft.c +3 -3
@@ -47,9 +47,9 @@ static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc, rdesc[559 ] =0x45 ; }/* the same as above (s/usage/physical/) */ -if ((quirks &MS_RDESC_3K ) && *rsize ==106 && - !memcmp ((char []){0x19 ,0x00 ,0x29 ,0xff }, - &rdesc[94 ],4 )) { +if ((quirks &MS_RDESC_3K ) && *rsize ==106 && rdesc[94 ] ==0x19 && + rdesc[95 ] ==0x00 && rdesc[96 ] ==0x29 && + rdesc[97 ] ==0xff ) { rdesc[94 ] =0x35 ; rdesc[96 ] =0x45 ; }
drivers/md/raid1.c +11 -11
@@ -812,17 +812,17 @@ static void allow_barrier(struct r1conf *conf)wake_up (&conf->wait_barrier); } -static void freeze_array (struct r1conf *conf) +static void freeze_array (struct r1conf *conf,int extra) {/* stop syncio and normal IO and wait for everything to * go quite. * We increment barrier and nr_waiting, and then -* wait until nr_pending match nr_queued+1 +* wait until nr_pending match nr_queued+extra * This is called in the context of one normal IO request * that has failed. Thus any sync request that might be pending * will be blocked by nr_pending, and we need to wait for * pending IO requests to complete or be queued for re-try. -* Thus the number queued (nr_queued) plus this request (1) +* Thus the number queued (nr_queued) plus this request (extra) * must match the number of pending IOs (nr_pending) before * we continue. */
@@ -830,7 +830,7 @@ static void freeze_array(struct r1conf *conf) conf->barrier++; conf->nr_waiting++;wait_event_lock_irq (conf->wait_barrier, - conf->nr_pending == conf->nr_queued+1 , + conf->nr_pending == conf->nr_queued+extra, conf->resync_lock,flush_pending_writes (conf));spin_unlock_irq (&conf->resync_lock);
@@ -1432,8 +1432,8 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)* we wait for all outstanding requests to complete. */ synchronize_sched (); -raise_barrier (conf); -lower_barrier (conf); +freeze_array (conf,0 ); +unfreeze_array (conf);clear_bit (Unmerged, &rdev->flags); }md_integrity_add_rdev (rdev, mddev);
@@ -1481,11 +1481,11 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev)*/ struct md_rdev *repl = conf->mirrors[conf->raid_disks + number].rdev; -raise_barrier (conf); +freeze_array (conf,0 );clear_bit (Replacement, &repl->flags); p->rdev = repl; conf->mirrors[conf->raid_disks + number].rdev =NULL ; -lower_barrier (conf); +unfreeze_array (conf);clear_bit (WantReplacement, &rdev->flags); }else clear_bit (WantReplacement, &rdev->flags);
@@ -2100,7 +2100,7 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio)* frozen */ if (mddev->ro ==0 ) { -freeze_array (conf); +freeze_array (conf,1 );fix_read_error (conf, r1_bio->read_disk, r1_bio->sector, r1_bio->sectors);unfreeze_array (conf);
@@ -2855,7 +2855,7 @@ static int raid1_reshape(struct mddev *mddev)return -ENOMEM ; } -raise_barrier (conf); +freeze_array (conf,0 );/* ok, everything is stopped */ oldpool = conf->r1bio_pool;
@@ -2887,7 +2887,7 @@ static int raid1_reshape(struct mddev *mddev) mddev->delta_disks =0 ; conf->last_used =0 ;/* just make sure it is in-range */ -lower_barrier (conf); +unfreeze_array (conf);set_bit (MD_RECOVERY_NEEDED , &mddev->recovery);md_wakeup_thread (mddev->thread);
drivers/md/raid10.c +7 -7
@@ -952,17 +952,17 @@ static void allow_barrier(struct r10conf *conf)wake_up (&conf->wait_barrier); } -static void freeze_array (struct r10conf *conf) +static void freeze_array (struct r10conf *conf,int extra) {/* stop syncio and normal IO and wait for everything to * go quiet. * We increment barrier and nr_waiting, and then -* wait until nr_pending match nr_queued+1 +* wait until nr_pending match nr_queued+extra * This is called in the context of one normal IO request * that has failed. Thus any sync request that might be pending * will be blocked by nr_pending, and we need to wait for * pending IO requests to complete or be queued for re-try. -* Thus the number queued (nr_queued) plus this request (1) +* Thus the number queued (nr_queued) plus this request (extra) * must match the number of pending IOs (nr_pending) before * we continue. */
@@ -970,7 +970,7 @@ static void freeze_array(struct r10conf *conf) conf->barrier++; conf->nr_waiting++;wait_event_lock_irq (conf->wait_barrier, - conf->nr_pending == conf->nr_queued+1 , + conf->nr_pending == conf->nr_queued+extra, conf->resync_lock,flush_pending_writes (conf));
@@ -1619,8 +1619,8 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)* we wait for all outstanding requests to complete. */ synchronize_sched (); -raise_barrier (conf,0 ); -lower_barrier (conf); +freeze_array (conf,0 ); +unfreeze_array (conf);clear_bit (Unmerged, &rdev->flags); }md_integrity_add_rdev (rdev, mddev);
@@ -2410,7 +2410,7 @@ static void handle_read_error(struct mddev *mddev, struct r10bio *r10_bio) r10_bio->devs[slot].bio =NULL ;if (mddev->ro ==0 ) { -freeze_array (conf); +freeze_array (conf,1 );fix_read_error (conf, mddev, r10_bio);unfreeze_array (conf); }else
drivers/net/can/usb/peak_usb/pcan_usb.c +1 -1
@@ -649,7 +649,7 @@ static int pcan_usb_decode_data(struct pcan_usb_msg_context *mc, u8 status_len)if ((mc->ptr + rec_len) > mc->end) goto decode_failed; -memcpy (cf->data, mc->ptr, rec_len); +memcpy (cf->data, mc->ptr, cf->can_dlc); mc->ptr += rec_len; }
drivers/net/wireless/iwlegacy/4965-mac.c +8 -8
@@ -4411,12 +4411,12 @@ il4965_irq_tasklet(struct il_priv *il)* is killed. Hence update the killswitch state here. The * rfkill handler will care about restarting if needed. */ -if (!test_bit (S_ALIVE , &il->status)) { -if (hw_rf_kill) -set_bit (S_RFKILL , &il->status); -else -clear_bit (S_RFKILL , &il->status); +if (hw_rf_kill) { +set_bit (S_RFKILL , &il->status); + }else { +clear_bit (S_RFKILL , &il->status);wiphy_rfkill_set_hw_state (il->hw->wiphy, hw_rf_kill); +il_force_reset (il, true); } handled |=CSR_INT_BIT_RF_KILL ;
@@ -5285,6 +5285,9 @@ il4965_alive_start(struct il_priv *il) il->active_rate =RATES_MASK ; +il_power_update_mode (il, true); +D_INFO ("Updated power mode\n" ); +if (il_is_associated (il)) {struct il_rxon_cmd *active_rxon = (struct il_rxon_cmd *)&il->active;
@@ -5315,9 +5318,6 @@ il4965_alive_start(struct il_priv *il)D_INFO ("ALIVE processing complete.\n" );wake_up (&il->wait_command_queue); -il_power_update_mode (il, true); -D_INFO ("Updated power mode\n" ); -return ; restart:
drivers/net/wireless/iwlegacy/common.c +1 -0
@@ -4659,6 +4659,7 @@ il_force_reset(struct il_priv *il, bool external)return 0 ; } +EXPORT_SYMBOL (il_force_reset); int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
drivers/usb/core/quirks.c +6 -0
@@ -100,6 +100,12 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x04d8, 0x000c), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, + /* CarrolTouch 4000U */ + { USB_DEVICE(0x04e7, 0x0009), .driver_info = USB_QUIRK_RESET_RESUME }, + + /* CarrolTouch 4500U */ + { USB_DEVICE(0x04e7, 0x0030), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Samsung Android phone modem - ID conflict with SPH-I500 */ { USB_DEVICE(0x04e8, 0x6601), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS },
drivers/usb/serial/mos7720.c +14 -7
@@ -97,6 +97,7 @@ struct urbtracker {struct list_head urblist_entry;struct kref ref_count;struct urb *urb; +struct usb_ctrlrequest *setup; };enum mos7715_pp_modes {
@@ -279,6 +280,7 @@ static void destroy_urbtracker(struct kref *kref)struct mos7715_parport *mos_parport = urbtrack->mos_parport;dbg ("%s called" , __func__);usb_free_urb (urbtrack->urb); +kfree (urbtrack->setup);kfree (urbtrack);kref_put (&mos_parport->ref_count, destroy_mos_parport); }
@@ -363,7 +365,6 @@ static int write_parport_reg_nonblock(struct mos7715_parport *mos_parport,struct urbtracker *urbtrack;int ret_val;unsigned long flags; -struct usb_ctrlrequest setup;struct usb_serial *serial = mos_parport->serial;struct usb_device *usbdev = serial->dev;dbg ("%s called" , __func__);
@@ -382,14 +383,20 @@ static int write_parport_reg_nonblock(struct mos7715_parport *mos_parport,kfree (urbtrack);return -ENOMEM ; } - setup.bRequestType = (__u8 )0x40 ; - setup.bRequest = (__u8 )0x0e ; - setup.wValue =get_reg_value (reg, dummy); - setup.wIndex =get_reg_index (reg); - setup.wLength =0 ; + urbtrack->setup =kmalloc (sizeof (*urbtrack->setup),GFP_KERNEL ); +if (!urbtrack->setup) { +usb_free_urb (urbtrack->urb); +kfree (urbtrack); +return -ENOMEM ; + } + urbtrack->setup->bRequestType = (__u8 )0x40 ; + urbtrack->setup->bRequest = (__u8 )0x0e ; + urbtrack->setup->wValue =get_reg_value (reg, dummy); + urbtrack->setup->wIndex =get_reg_index (reg); + urbtrack->setup->wLength =0 ;usb_fill_control_urb (urbtrack->urb, usbdev,usb_sndctrlpipe (usbdev,0 ), - (unsigned char *)&setup, + (unsigned char *)urbtrack->setup,NULL ,0 , async_complete, urbtrack);kref_init (&urbtrack->ref_count);INIT_LIST_HEAD (&urbtrack->urblist_entry);
fs/ext4/ext4_jbd2.c +4 -4
@@ -109,10 +109,10 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,if (ext4_handle_valid (handle)) { err =jbd2_journal_dirty_metadata (handle, bh); -if (err) { -/* Errors can only happen if there is a bug */ - handle->h_err = err; -__ext4_journal_stop (where, line, handle); +/* Errors can only happen if there is a bug */ +if (WARN_ON_ONCE (err)) { +ext4_journal_abort_handle (where, line, __func__, bh, + handle, err); } }else {if (inode)
fs/proc/task_mmu.c +4 -4
@@ -679,14 +679,14 @@ typedef struct { } pagemap_entry_t;struct pagemapread { -int pos, len; +int pos, len;/* units: PM_ENTRY_BYTES, not bytes */ pagemap_entry_t *buffer; };#define PAGEMAP_WALK_SIZE (PMD_SIZE)#define PAGEMAP_WALK_MASK (PMD_MASK) -#define PM_ENTRY_BYTES sizeof(u64) +#define PM_ENTRY_BYTES sizeof(pagemap_entry_t)#define PM_STATUS_BITS 3#define PM_STATUS_OFFSET (64 - PM_STATUS_BITS)#define PM_STATUS_MASK (((1LL << PM_STATUS_BITS) - 1) << PM_STATUS_OFFSET)
@@ -913,8 +913,8 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,if (!count) goto out_task; - pm.len =PM_ENTRY_BYTES * (PAGEMAP_WALK_SIZE >>PAGE_SHIFT ); - pm.buffer =kmalloc (pm.len,GFP_TEMPORARY ); + pm.len = (PAGEMAP_WALK_SIZE >>PAGE_SHIFT ); + pm.buffer =kmalloc (pm.len *PM_ENTRY_BYTES ,GFP_TEMPORARY ); ret = -ENOMEM ;if (!pm.buffer) goto out_task;
include/linux/hugetlb.h +16 -0
@@ -293,6 +293,17 @@ static inline unsigned hstate_index_to_shift(unsigned index) return hstates[index].order + PAGE_SHIFT; } +pgoff_t __basepage_index (struct page *page); + +/* Return page->index in PAGE_SIZE units */ +static inline pgoff_t basepage_index (struct page *page) +{ +if (!PageCompound (page)) +return page->index; + +return __basepage_index (page); +} +#else /* CONFIG_HUGETLB_PAGE */ struct hstate {};#define alloc_huge_page_node (h, nid) NULL
@@ -311,6 +322,11 @@ static inline unsigned int pages_per_huge_page(struct hstate *h)return 1 ; }#define hstate_index_to_shift (index) 0 + +static inline pgoff_t basepage_index (struct page *page) +{ +return page->index; +}#endif #endif /* _LINUX_HUGETLB_H */
kernel/futex.c +2 -1
@@ -60,6 +60,7 @@#include <linux/pid.h> #include <linux/nsproxy.h> #include <linux/ptrace.h> +#include <linux/hugetlb.h> #include <asm/futex.h>
@@ -363,7 +364,7 @@ again: }else { key->both.offset |=FUT_OFF_INODE ;/* inode-based key */ key->shared.inode = page_head->mapping->host; - key->shared.pgoff = page_head->index; + key->shared.pgoff =basepage_index (page); }get_futex_key_refs (key);
mm/hugetlb.c +17 -0
@@ -679,6 +679,23 @@ int PageHuge(struct page *page) }EXPORT_SYMBOL_GPL (PageHuge); +pgoff_t __basepage_index (struct page *page) +{ +struct page *page_head =compound_head (page); +pgoff_t index =page_index (page_head); +unsigned long compound_idx; + +if (!PageHuge (page_head)) +return page_index (page); + +if (compound_order (page_head) >=MAX_ORDER ) + compound_idx =page_to_pfn (page) -page_to_pfn (page_head); +else + compound_idx = page - page_head; + +return (index <<compound_order (page_head)) + compound_idx; +} +static struct page *alloc_fresh_huge_page_node (struct hstate *h,int nid) {struct page *page;
mm/nommu.c +10 -0
@@ -1856,6 +1856,16 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr, }EXPORT_SYMBOL (remap_pfn_range); +int vm_iomap_memory (struct vm_area_struct *vma,phys_addr_t start,unsigned long len) +{ +unsigned long pfn = start >>PAGE_SHIFT ; +unsigned long vm_len = vma->vm_end - vma->vm_start; + + pfn += vma->vm_pgoff; +return io_remap_pfn_range (vma, vma->vm_start, pfn, vm_len, vma->vm_page_prot); +} +EXPORT_SYMBOL (vm_iomap_memory); +int remap_vmalloc_range (struct vm_area_struct *vma,void *addr,unsigned long pgoff) {
net/key/af_key.c +1 -0
@@ -2687,6 +2687,7 @@ static int key_notify_policy_flush(const struct km_event *c) hdr->sadb_msg_pid = c->pid; hdr->sadb_msg_version =PF_KEY_V2 ; hdr->sadb_msg_errno = (uint8_t )0 ; + hdr->sadb_msg_satype =SADB_SATYPE_UNSPEC ; hdr->sadb_msg_len = (sizeof (struct sadb_msg ) /sizeof (uint64_t )); hdr->sadb_msg_reserved =0 ;pfkey_broadcast (skb_out,GFP_ATOMIC ,BROADCAST_ALL ,NULL , c->net);
sound/oss/Kconfig +1 -0
@@ -250,6 +250,7 @@ config MSND_FIFOSIZE menuconfig SOUND_OSS tristate "OSS sound modules" depends on ISA_DMA_API && VIRT_TO_BUS + depends on !GENERIC_ISA_DMA_SUPPORT_BROKEN help OSS is the Open Sound System suite of sound card drivers. They make sound programming easier since they provide a common API. Say Y or