Linux 3.1.8
I'm announcing the release of the 3.1.8 kernel.
All users of the 3.1 kernel series must upgrade.
The updated 3.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.1.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/arm/mach-omap2/board-rx51-peripherals.c | 2 arch/arm/oprofile/common.c | 2 arch/arm/plat-mxc/pwm.c | 16 arch/s390/oprofile/init.c | 2 arch/sh/oprofile/common.c | 4 arch/sparc/include/asm/pgtable_32.h | 20 arch/sparc/include/asm/pgtable_64.h | 20 arch/sparc/kernel/entry.h | 7 arch/sparc/kernel/module.c | 27 arch/sparc/kernel/pci_sun4v.c | 4 arch/sparc/kernel/setup_64.c | 48 - arch/sparc/kernel/signal32.c | 18 arch/sparc/kernel/signal_32.c | 30 - arch/sparc/kernel/signal_64.c | 42 - arch/sparc/kernel/visemul.c | 32 - arch/sparc/lib/memcpy.S | 804 +++------------------------ arch/sparc/mm/Makefile | 1 arch/sparc/mm/btfixup.c | 3 arch/sparc/mm/generic_32.c | 98 --- arch/sparc/mm/generic_64.c | 164 ----- arch/x86/net/bpf_jit_comp.c | 4 block/blk-core.c | 14 block/cfq-iosched.c | 16 drivers/gpu/drm/i915/i915_dma.c | 10 drivers/gpu/drm/i915/i915_drv.h | 1 drivers/gpu/drm/i915/i915_reg.h | 8 drivers/gpu/drm/i915/intel_sdvo.c | 8 drivers/gpu/drm/radeon/evergreen.c | 12 drivers/gpu/drm/radeon/radeon_atombios.c | 6 drivers/infiniband/hw/mlx4/main.c | 6 drivers/input/mouse/synaptics.c | 11 drivers/media/video/omap/omap_vout.c | 1 drivers/media/video/s5p-fimc/fimc-core.c | 2 drivers/mfd/twl-core.c | 16 drivers/mfd/twl4030-madc.c | 22 drivers/mmc/host/mmci.c | 14 drivers/mmc/host/vub300.c | 2 drivers/net/pptp.c | 4 drivers/net/wireless/ath/ath9k/main.c | 3 drivers/net/wireless/ath/ath9k/rc.c | 4 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 5 drivers/net/wireless/iwlwifi/iwl-trans.c | 4 drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 2 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 2 drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 2 drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 2 drivers/oprofile/oprofile_files.c | 7 drivers/oprofile/oprofilefs.c | 11 drivers/rtc/interface.c | 44 - drivers/rtc/rtc-m41t80.c | 9 drivers/s390/scsi/zfcp_scsi.c | 4 drivers/scsi/fcoe/fcoe.c | 1 drivers/scsi/mpt2sas/mpt2sas_base.c | 59 - drivers/scsi/mpt2sas/mpt2sas_base.h | 4 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 2 drivers/ssb/driver_pcicore.c | 8 drivers/watchdog/hpwdt.c | 5 fs/nfs/file.c | 2 fs/nfs/nfs4state.c | 8 fs/nilfs2/ioctl.c | 13 include/linux/blkdev.h | 3 include/linux/i2c/twl4030-madc.h | 4 include/linux/lglock.h | 36 + include/net/dst.h | 1 include/net/flow.h | 1 include/net/sctp/structs.h | 4 kernel/cgroup.c | 5 kernel/exit.c | 9 kernel/futex.c | 28 kernel/hung_task.c | 14 kernel/ptrace.c | 13 kernel/signal.c | 2 kernel/sysctl_binary.c | 2 mm/filemap.c | 7 mm/hugetlb.c | 2 mm/memcontrol.c | 3 mm/mempolicy.c | 11 mm/oom_kill.c | 2 mm/percpu.c | 6 net/bridge/br_netfilter.c | 2 net/core/flow.c | 12 net/ipv4/devinet.c | 5 net/ipv4/ipconfig.c | 4 net/ipv4/ipip.c | 7 net/ipv4/route.c | 111 +++ net/ipv6/ip6_output.c | 2 net/ipv6/route.c | 2 net/ipv6/sit.c | 7 net/llc/af_llc.c | 14 net/mac80211/agg-tx.c | 86 +- net/sched/sch_gred.c | 2 net/sched/sch_mqprio.c | 2 net/sctp/associola.c | 2 net/sctp/output.c | 8 net/sctp/outqueue.c | 6 net/sctp/protocol.c | 3 net/sctp/socket.c | 2 net/sctp/sysctl.c | 13 net/sunrpc/xprt.c | 10 net/xfrm/xfrm_policy.c | 18 security/selinux/netport.c | 4 sound/pci/hda/hda_intel.c | 1 sound/soc/codecs/wm8996.c | 1 105 files changed, 851 insertions(+), 1334 deletions(-)
Alex Deucher (1):
drm/radeon/kms: bail on BTC parts if MC ucode is missing
Alex Juncu (1):
llc: llc_cmsg_rcv was getting called after sk_eat_skb.
Alexander Müller (1):
drm/radeon/kms/atom: fix possible segfault in pm setup
Anton Blanchard (1):
SCSI: mpt2sas: _scsih_smart_predicted_fault uses GFP_KERNEL in interrupt context
Dave Kleikamp (1):
vfs: __read_cache_page should use gfp argument rather than GFP_KERNEL
David Henningsson (1):
ALSA: HDA: Set position fix to LPIB for an Atom/Poulsbo based device
David Howells (1):
SELinux: Fix RCU deref check warning in sel_netport_insert()
David S. Miller (10):
sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().
sparc32: Be less strict in matching %lo part of relocation.
sparc64: Patch sun4v code sequences properly on module load.
sparc: Kill custom io_remap_pfn_range().
sparc32: Remove non-kernel code from memcpy implementation.
sparc32: Remove uses of %g7 in memcpy implementation.
sparc32: Correct the return value of memcpy.
sparc64: Fix masking and shifting in VIS fpcmp emulation.
sparc: Fix handling of orig_i0 wrt. debugging when restarting syscalls.
ipv6: Check dest prefix length on original route not copied one in rt6_alloc_cow().
Djalal Harouni (1):
ppp: fix pptp double release_sock in pptp_bind()
Dmitry Torokhov (1):
Input: synaptics - fix touchpad not working after S2R on Vostro V13
Emmanuel Grumbach (1):
iwlwifi: update SCD BC table for all SCD queues
Eric Dumazet (3):
sch_gred: should not use GFP_KERNEL while holding a spinlock
net: introduce DST_NOPEER dst flag
ipv4: reintroduce route cache garbage collector
Eugene Surovegin (1):
percpu: fix per_cpu_ptr_to_phys() handling of non-page-aligned addresses
Eugeni Dodonov (1):
drm/i915: prevent division by zero when asking for chipset power
Felipe Contreras (1):
ARM: OMAP: rx51: fix USB
Frantisek Hrbata (1):
oom: fix integer overflow of points in oom_badness
Gary Thomas (1):
media: omap_vout: Fix compile error in 3.1
Gerlando Falauto (1):
net: have ipconfig not wait if no dev is available
Greg Kroah-Hartman (1):
Linux 3.1.8
Hauke Mehrtens (1):
ssb: fix init regression with SoCs
Hillf Danton (2):
memcg: keep root group unchanged if creation fails
mm: hugetlb: fix non-atomic enqueue of huge page
Hugh Dickins (1):
futex: Fix uninterruptible loop due to gate_area
Ilya Yanok (1):
mfd: Fix twl-core oops while calling twl_i2c_* for unbound driver
Jason Chen (2):
MXC PWM: should active during DOZE/WAIT/DBG mode ARM:imx:fix pwm period value
Johannes Berg (1):
mac80211: fix another race in aggregation start
John Stultz (1):
rtc: m41t80: Workaround broken alarm functionality
KOSAKI Motohiro (1):
mm/mempolicy.c: refix mbind_range() vma issue
Kyle Manna (1):
mfd: Turn on the twl4030-madc MADC clock
Linus Torvalds (1):
Revert "rtc: Disable the alarm in the hardware"
Mandeep Singh Baines (2):
cgroups: fix a css_set not found bug in cgroup_attach_proc
hung_task: fix false positive during vfork
Mark Brown (1):
ASoC: Fix WM8996 24.576MHz clock operation
Markus Kötter (1):
net: bpf_jit: fix an off-one bug in x86_64 cond jump target
Michel Lespinasse (1):
binary_sysctl(): fix memory leak
Mike Snitzer (1):
block: initialize request_queue's numa node during
Mingarelli, Thomas (1):
watchdog: hpwdt: Changes to handle NX secure bit in 32bit path
Mohammed Shafi Shajakhan (1):
ath9k: Fix kernel panic in AR2427 in AP mode
Nagalakshmi Nandigama (1):
mpt2sas: fix non-x86 crash on shutdown
Oleg Nesterov (2):
ptrace: partially fix the do_wait(WEXITED) vs EXIT_DEAD->EXIT_ZOMBIE race
ptrace: ensure JOBCTL_STOP_SIGMASK is not zero after detach
Paulo Zanoni (1):
drm/i915: set the right SDVO transcoder for CPT
Philipp Dreimann (1):
rtl8192{ce,cu,de,se}: avoid problems because of possible ERFOFF -> ERFSLEEP transitionRajkumar Manoharan (1):
ath9k: fix max phy rate at rate control init
Robert Richter (1):
oprofile: Fix uninitialized memory access when writing to writing to oprofilefs
Roland Dreier (1):
IB/mlx4: Fix shutdown crash accessing a non-existent bitmap
Rusty Russell (1):
mmc: vub300: fix type of firmware_rom_wait_states module parameter
Srivatsa S. Bhat (1):
VFS: Fix race between CPU hotplug and lglocks
Steffen Klassert (1):
net: Add a flow_cache_flush_deferred function
Steffen Maier (1):
SCSI: zfcp: return early from slave_destroy if slave_alloc returned early
Stephen Rothwell (1):
ipv4: using prefetch requires including prefetch.h
Sylwester Nawrocki (1):
media: s5p-fimc: Use correct fourcc for RGB565 colour format
Ted Feng (1):
ipip, sit: copy parms.name after register_netdevice
Thomas Gleixner (1):
SCSI: fcoe: Fix preempt count leak in fcoe_filter_frames()
Thomas Graf (2):
mqprio: Avoid panic if no options are provided
sctp: Do not account for sizeof(struct sk_buff) in estimated rwnd
Thomas Meyer (1):
nilfs2: unbreak compat ioctl
Trond Myklebust (3):
SUNRPC: Ensure we always bump the backlog queue in xprt_free_slot
NFS: Fix a regression in nfs_file_llseek()
NFSv4.1: Ensure that we handle _all_ SEQUENCE status bits.
Ulf Hansson (2):
ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR
ARM: 7220/1: mmc: mmci: Fixup error handling for dma
Vladimir Zapolskiy (1):
oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue
Weiping Pan (1):
ipv4: flush route cache after change accept_local
Wey-Yi Guy (2):
iwlwifi: do not set the sequence control bit is not needed
iwlwifi: allow to switch to HT40 if not associated
Xi Wang (1):
sctp: fix incorrect overflow check on autoclose
Yasuaki Ishimatsu (1):
cfq-iosched: fix cfq_cic_link() race confition
majianpeng (1):
cfq-iosched: free cic_index if blkio_alloc_blkg_stats fails
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 1 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = NAME = "Divemaster Edition"
arch/arm/mach-omap2/board-rx51-peripherals.c +1 -1
@@ -193,7 +193,7 @@ static struct platform_device rx51_charger_device = {static void __init rx51_charger_init (void ) {WARN_ON (gpio_request_one (RX51_USB_TRANSCEIVER_RST_GPIO , -GPIOF_OUT_INIT_LOW ,"isp1704_reset" )); +GPIOF_OUT_INIT_HIGH ,"isp1704_reset" ));platform_device_register (&rx51_charger_device); }
arch/arm/oprofile/common.c +1 -1
@@ -116,7 +116,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)return oprofile_perf_init (ops); } -void __exit oprofile_arch_exit(void) +void oprofile_arch_exit (void ) {oprofile_perf_exit (); }
arch/arm/plat-mxc/pwm.c +15 -1
@@ -32,6 +32,9 @@#define MX3_PWMSAR 0x0C/* PWM Sample Register */ #define MX3_PWMPR 0x10/* PWM Period Register */ #define MX3_PWMCR_PRESCALER (x) (((x - 1) & 0xFFF) << 4) +#define MX3_PWMCR_DOZEEN (1 << 24) +#define MX3_PWMCR_WAITEN (1 << 23) +#define MX3_PWMCR_DBGEN (1 << 22)#define MX3_PWMCR_CLKSRC_IPG_HIGH (2 << 16)#define MX3_PWMCR_CLKSRC_IPG (1 << 16)#define MX3_PWMCR_EN (1 << 0)
@@ -74,10 +77,21 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)do_div (c, period_ns); duty_cycles = c; +/* +* according to imx pwm RM, the real period value should be +* PERIOD value in PWMPR plus 2. +*/ +if (period_cycles >2 ) + period_cycles -=2 ; +else + period_cycles =0 ; +writel (duty_cycles, pwm->mmio_base +MX3_PWMSAR );writel (period_cycles, pwm->mmio_base +MX3_PWMPR ); - cr =MX3_PWMCR_PRESCALER (prescale) |MX3_PWMCR_EN ; + cr =MX3_PWMCR_PRESCALER (prescale) | +MX3_PWMCR_DOZEEN |MX3_PWMCR_WAITEN | +MX3_PWMCR_DBGEN |MX3_PWMCR_EN ;if (cpu_is_mx25 ()) cr |=MX3_PWMCR_CLKSRC_IPG ;
arch/s390/oprofile/init.c +1 -1
@@ -88,7 +88,7 @@ static ssize_t hwsampler_write(struct file *file, char const __user *buf,return -EINVAL ; retval =oprofilefs_ulong_from_user (&val, buf, count); -if (retval) +if (retval <=0 )return retval;if (oprofile_started)
arch/sh/oprofile/common.c +2 -2
@@ -49,7 +49,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)return oprofile_perf_init (ops); } -void __exit oprofile_arch_exit(void) +void oprofile_arch_exit (void ) {oprofile_perf_exit ();kfree (sh_pmu_op_name);
@@ -60,5 +60,5 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ops->backtrace = sh_backtrace; return -ENODEV; } -void __exit oprofile_arch_exit(void) {} +void oprofile_arch_exit (void ) {}#endif /* CONFIG_HW_PERF_EVENTS */
arch/sparc/include/asm/pgtable_32.h +16 -4
@@ -431,10 +431,6 @@ extern unsigned long *sparc_valid_addr_bitmap;#define kern_addr_valid (addr) \ (test_bit(__pa((unsigned long)(addr))>>20, sparc_valid_addr_bitmap)) -extern int io_remap_pfn_range (struct vm_area_struct *vma, -unsigned long from,unsigned long pfn, -unsigned long size,pgprot_t prot); -/* * For sparc32&64, the pfn in io_remap_pfn_range() carries <iospace> in * its high 4 bits. These macros/functions put it there or get it from there.
@@ -443,6 +439,22 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma,#define GET_IOSPACE (pfn) (pfn >> (BITS_PER_LONG - 4))#define GET_PFN (pfn) (pfn & 0x0fffffffUL) +extern int remap_pfn_range (struct vm_area_struct *,unsigned long ,unsigned long , +unsigned long ,pgprot_t ); + +static inline int io_remap_pfn_range (struct vm_area_struct *vma, +unsigned long from,unsigned long pfn, +unsigned long size,pgprot_t prot) +{ +unsigned long long offset, space, phys_base; + + offset = ((unsigned long long )GET_PFN (pfn)) <<PAGE_SHIFT ; + space =GET_IOSPACE (pfn); + phys_base = offset | (space <<32ULL ); + +return remap_pfn_range (vma, from, phys_base >>PAGE_SHIFT , size, prot); +} +#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS#define ptep_set_access_flags (__vma, __address, __ptep, __entry, __dirty) \ ({ \
arch/sparc/include/asm/pgtable_64.h +16 -4
@@ -757,10 +757,6 @@ static inline bool kern_addr_valid(unsigned long addr)extern int page_in_phys_avail (unsigned long paddr); -extern int io_remap_pfn_range (struct vm_area_struct *vma,unsigned long from, -unsigned long pfn, -unsigned long size,pgprot_t prot); -/* * For sparc32&64, the pfn in io_remap_pfn_range() carries <iospace> in * its high 4 bits. These macros/functions put it there or get it from there.
@@ -769,6 +765,22 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,#define GET_IOSPACE (pfn) (pfn >> (BITS_PER_LONG - 4))#define GET_PFN (pfn) (pfn & 0x0fffffffffffffffUL) +extern int remap_pfn_range (struct vm_area_struct *,unsigned long ,unsigned long , +unsigned long ,pgprot_t ); + +static inline int io_remap_pfn_range (struct vm_area_struct *vma, +unsigned long from,unsigned long pfn, +unsigned long size,pgprot_t prot) +{ +unsigned long offset =GET_PFN (pfn) <<PAGE_SHIFT ; +int space =GET_IOSPACE (pfn); +unsigned long phys_base; + + phys_base = offset | (((unsigned long ) space) <<32UL ); + +return remap_pfn_range (vma, from, phys_base >>PAGE_SHIFT , size, prot); +} +#include <asm-generic/pgtable.h> /* We provide our own get_unmapped_area to cope with VA holes and
arch/sparc/kernel/entry.h +7 -0
@@ -42,6 +42,9 @@ extern void fpsave(unsigned long *fpregs, unsigned long *fsr, extern void fpload(unsigned long *fpregs, unsigned long *fsr); #else /* CONFIG_SPARC32 */ + +#include <asm/trap_block.h> + struct popc_3insn_patch_entry { unsigned int addr; unsigned int insns[3];
@@ -57,6 +60,10 @@ extern struct popc_6insn_patch_entry __popc_6insn_patch, __popc_6insn_patch_end;extern void __init per_cpu_patch (void ); +extern void sun4v_patch_1insn_range (struct sun4v_1insn_patch_entry *, +struct sun4v_1insn_patch_entry *); +extern void sun4v_patch_2insn_range (struct sun4v_2insn_patch_entry *, +struct sun4v_2insn_patch_entry *);extern void __init sun4v_patch (void );extern void __init boot_cpu_id_too_large (int cpu);extern unsigned int dcache_parity_tl1_occurred;
arch/sparc/kernel/module.c +27 -0
@@ -17,6 +17,8 @@#include <asm/processor.h> #include <asm/spitfire.h> +#include "entry.h" +#ifdef CONFIG_SPARC64 #include <linux/jump_label.h>
@@ -203,6 +205,29 @@ int apply_relocate_add(Elf_Shdr *sechdrs, }#ifdef CONFIG_SPARC64 +static void do_patch_sections (const Elf_Ehdr *hdr, +const Elf_Shdr *sechdrs) +{ +const Elf_Shdr *s, *sun4v_1insn =NULL , *sun4v_2insn =NULL ; +char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; + +for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) { +if (!strcmp (".sun4v_1insn_patch" , secstrings + s->sh_name)) + sun4v_1insn = s; +if (!strcmp (".sun4v_2insn_patch" , secstrings + s->sh_name)) + sun4v_2insn = s; + } + +if (sun4v_1insn && tlb_type == hypervisor) { +void *p = (void *) sun4v_1insn->sh_addr; +sun4v_patch_1insn_range (p, p + sun4v_1insn->sh_size); + } +if (sun4v_2insn && tlb_type == hypervisor) { +void *p = (void *) sun4v_2insn->sh_addr; +sun4v_patch_2insn_range (p, p + sun4v_2insn->sh_size); + } +} +int module_finalize (const Elf_Ehdr *hdr,const Elf_Shdr *sechdrs,struct module *me)
@@ -210,6 +235,8 @@ int module_finalize(const Elf_Ehdr *hdr,/* make jump label nops */ jump_label_apply_nops (me); +do_patch_sections (hdr, sechdrs); +/* Cheetah's I-cache is fully coherent. */ if (tlb_type == spitfire) {unsigned long va;
arch/sparc/kernel/pci_sun4v.c +2 -2
@@ -848,10 +848,10 @@ static int pci_sun4v_msiq_build_irq(struct pci_pbm_info *pbm,if (!irq)return -ENOMEM ; -if (pci_sun4v_msiq_setstate (pbm->devhandle, msiqid,HV_MSIQSTATE_IDLE )) -return -EINVAL ;if (pci_sun4v_msiq_setvalid (pbm->devhandle, msiqid,HV_MSIQ_VALID ))return -EINVAL ; +if (pci_sun4v_msiq_setstate (pbm->devhandle, msiqid,HV_MSIQSTATE_IDLE )) +return -EINVAL ;return irq; }
arch/sparc/kernel/setup_64.c +29 -19
69 lines not on this page · raw message
arch/sparc/kernel/signal32.c +10 -8
@@ -822,21 +822,23 @@ static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs* want to handle. Thus you cannot kill init even with a SIGKILL even by * mistake. */ -void do_signal32 (sigset_t *oldset,struct pt_regs * regs, -int restart_syscall,unsigned long orig_i0) +void do_signal32 (sigset_t *oldset,struct pt_regs * regs) {struct k_sigaction ka; +unsigned long orig_i0; +int restart_syscall;siginfo_t info;int signr; signr =get_signal_to_deliver (&info, &ka, regs,NULL ); -/* If the debugger messes with the program counter, it clears -* the "in syscall" bit, directing us to not perform a syscall -* restart. -*/ -if (restart_syscall && !pt_regs_is_syscall (regs)) - restart_syscall =0 ; + restart_syscall =0 ; + orig_i0 =0 ; +if (pt_regs_is_syscall (regs) && + (regs->tstate & (TSTATE_XCARRY |TSTATE_ICARRY ))) { + restart_syscall =1 ; + orig_i0 = regs->u_regs[UREG_G6 ]; + }if (signr >0 ) {if (restart_syscall)
arch/sparc/kernel/signal_32.c +25 -5
@@ -519,10 +519,26 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)siginfo_t info;int signr; +/* It's a lot of work and synchronization to add a new ptrace +* register for GDB to save and restore in order to get +* orig_i0 correct for syscall restarts when debugging. +* +* Although it should be the case that most of the global +* registers are volatile across a system call, glibc already +* depends upon that fact that we preserve them. So we can't +* just use any global register to save away the orig_i0 value. +* +* In particular %g2, %g3, %g4, and %g5 are all assumed to be +* preserved across a system call trap by various pieces of +* code in glibc. +* +* %g7 is used as the "thread register". %g6 is not used in +* any fixed manner. %g6 is used as a scratch register and +* a compiler temporary, but it's value is never used across +* a system call. Therefore %g6 is usable for orig_i0 storage. +*/ if (pt_regs_is_syscall (regs) && (regs->psr &PSR_C )) - restart_syscall =1 ; -else - restart_syscall =0 ; + regs->u_regs[UREG_G6 ] = orig_i0;if (test_thread_flag (TIF_RESTORE_SIGMASK )) oldset = ¤t->saved_sigmask;
@@ -535,8 +551,12 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)* the software "in syscall" bit, directing us to not perform * a syscall restart. */ -if (restart_syscall && !pt_regs_is_syscall (regs)) - restart_syscall =0 ; + restart_syscall =0 ; +if (pt_regs_is_syscall (regs) && (regs->psr &PSR_C )) { + restart_syscall =1 ; + orig_i0 = regs->u_regs[UREG_G6 ]; + } +if (signr >0 ) {if (restart_syscall)
arch/sparc/kernel/signal_64.c +28 -14
61 lines not on this page · raw message
arch/sparc/kernel/visemul.c +16 -16
@@ -713,17 +713,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf)s16 b = (rs2 >> (i *16 )) &0xffff ;if (a > b) - rd_val |=1 << i; + rd_val |=8 >> i; }break ;case FCMPGT32_OPF :for (i =0 ; i <2 ; i++) { -s32 a = (rs1 >> (i *32 )) &0xffff ; -s32 b = (rs2 >> (i *32 )) &0xffff ; +s32 a = (rs1 >> (i *32 )) &0xffffffff ; +s32 b = (rs2 >> (i *32 )) &0xffffffff ;if (a > b) - rd_val |=1 << i; + rd_val |=2 >> i; }break ;
@@ -733,17 +733,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf)s16 b = (rs2 >> (i *16 )) &0xffff ;if (a <= b) - rd_val |=1 << i; + rd_val |=8 >> i; }break ;case FCMPLE32_OPF :for (i =0 ; i <2 ; i++) { -s32 a = (rs1 >> (i *32 )) &0xffff ; -s32 b = (rs2 >> (i *32 )) &0xffff ; +s32 a = (rs1 >> (i *32 )) &0xffffffff ; +s32 b = (rs2 >> (i *32 )) &0xffffffff ;if (a <= b) - rd_val |=1 << i; + rd_val |=2 >> i; }break ;
@@ -753,17 +753,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf)s16 b = (rs2 >> (i *16 )) &0xffff ;if (a != b) - rd_val |=1 << i; + rd_val |=8 >> i; }break ;case FCMPNE32_OPF :for (i =0 ; i <2 ; i++) { -s32 a = (rs1 >> (i *32 )) &0xffff ; -s32 b = (rs2 >> (i *32 )) &0xffff ; +s32 a = (rs1 >> (i *32 )) &0xffffffff ; +s32 b = (rs2 >> (i *32 )) &0xffffffff ;if (a != b) - rd_val |=1 << i; + rd_val |=2 >> i; }break ;
@@ -773,17 +773,17 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf)s16 b = (rs2 >> (i *16 )) &0xffff ;if (a == b) - rd_val |=1 << i; + rd_val |=8 >> i; }break ;case FCMPEQ32_OPF :for (i =0 ; i <2 ; i++) { -s32 a = (rs1 >> (i *32 )) &0xffff ; -s32 b = (rs2 >> (i *32 )) &0xffff ; +s32 a = (rs1 >> (i *32 )) &0xffffffff ; +s32 b = (rs2 >> (i *32 )) &0xffffffff ;if (a == b) - rd_val |=1 << i; + rd_val |=2 >> i; }break ; }
arch/sparc/lib/memcpy.S +99 -705
947 lines not on this page · raw message
arch/sparc/mm/Makefile +0 -1
@@ -8,7 +8,6 @@ obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o obj-y += fault_$(BITS).o obj-y += init_$(BITS).o obj-$(CONFIG_SPARC32) += loadmmu.o -obj-y += generic_$(BITS).o obj-$(CONFIG_SPARC32) += extable.o btfixup.o srmmu.o iommu.o io-unit.o obj-$(CONFIG_SPARC32) += hypersparc.o viking.o tsunami.o swift.o obj-$(CONFIG_SPARC_LEON)+= leon_mm.o
arch/sparc/mm/btfixup.c +1 -2
@@ -302,8 +302,7 @@ void __init btfixup(void)case 'i' :/* INT */ if ((insn &0xc1c00000 ) ==0x01000000 )/* %HI */ set_addr (addr, q[1 ], fmangled, (insn &0xffc00000 ) | (p[1 ] >>10 )); -else if ((insn &0x80002000 ) ==0x80002000 && - (insn &0x01800000 ) !=0x01800000 )/* %LO */ +else if ((insn &0x80002000 ) ==0x80002000 )/* %LO */ set_addr (addr, q[1 ], fmangled, (insn &0xffffe000 ) | (p[1 ] &0x3ff ));else {prom_printf (insn_i, p, addr, insn);
arch/sparc/mm/generic_32.c deleted +0 -98
98 lines not on this page · raw message
arch/sparc/mm/generic_64.c deleted +0 -164
164 lines not on this page · raw message
arch/x86/net/bpf_jit_comp.c +2 -2
@@ -568,8 +568,8 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];break ; }if (filter[i].jt !=0 ) { -if (filter[i].jf) - t_offset +=is_near (f_offset) ?2 :6 ; +if (filter[i].jf && f_offset) + t_offset +=is_near (f_offset) ?2 :5 ;EMIT_COND_JMP (t_op, t_offset);if (filter[i].jf)EMIT_JMP (f_offset);
block/blk-core.c +3 -11
@@ -418,6 +418,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) q->backing_dev_info.state =0 ; q->backing_dev_info.capabilities =BDI_CAP_MAP_COPY ; q->backing_dev_info.name ="block" ; + q->node = node_id; err =bdi_init (&q->backing_dev_info);if (err) {
@@ -502,7 +503,7 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)if (!uninit_q)return NULL ; - q =blk_init_allocated_queue_node (uninit_q, rfn, lock, node_id); + q =blk_init_allocated_queue (uninit_q, rfn, lock);if (!q)blk_cleanup_queue (uninit_q);
@@ -514,18 +515,9 @@ struct request_queue * blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, spinlock_t *lock) { - return blk_init_allocated_queue_node(q, rfn, lock, -1); -} -EXPORT_SYMBOL (blk_init_allocated_queue); - -struct request_queue * -blk_init_allocated_queue_node (struct request_queue *q,request_fn_proc *rfn, -spinlock_t *lock,int node_id) -{ if (!q) return NULL; - q->node = node_id;if (blk_init_free_list (q))return NULL ;
@@ -555,7 +547,7 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,return NULL ; } -EXPORT_SYMBOL (blk_init_allocated_queue_node); +EXPORT_SYMBOL (blk_init_allocated_queue);int blk_get_queue (struct request_queue *q) {
block/cfq-iosched.c +14 -2
@@ -3184,7 +3184,7 @@ static int cfq_cic_link(struct cfq_data *cfqd, struct io_context *ioc, } } -if (ret) +if (ret && ret != -EEXIST )printk (KERN_ERR "cfq: cic link failed!\n" );return ret;
@@ -3200,6 +3200,7 @@ cfq_get_io_context(struct cfq_data *cfqd, gfp_t gfp_mask) {struct io_context *ioc =NULL ;struct cfq_io_context *cic; +int ret;might_sleep_if (gfp_mask & __GFP_WAIT);
@@ -3207,6 +3208,7 @@ cfq_get_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)if (!ioc)return NULL ; +retry: cic =cfq_cic_lookup (cfqd, ioc);if (cic) goto out;
@@ -3215,7 +3217,12 @@ cfq_get_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)if (cic ==NULL ) goto err; -if (cfq_cic_link (cfqd, ioc, cic, gfp_mask)) + ret =cfq_cic_link (cfqd, ioc, cic, gfp_mask); +if (ret == -EEXIST ) { +/* someone has linked cic to ioc already */ +cfq_cic_free (cic); + goto retry; + }else if (ret) goto err_free; out:
@@ -4036,6 +4043,11 @@ static void *cfq_init_queue(struct request_queue *q)if (blkio_alloc_blkg_stats (&cfqg->blkg)) {kfree (cfqg); + +spin_lock (&cic_index_lock); +ida_remove (&cic_index_ida, cfqd->cic_index); +spin_unlock (&cic_index_lock); +kfree (cfqd);return NULL ; }
drivers/gpu/drm/i915/i915_dma.c +10 -0
@@ -1453,6 +1453,14 @@ unsigned long i915_chipset_val(struct drm_i915_private *dev_priv) diff1 = now - dev_priv->last_time1; +/* Prevent division-by-zero if we are asking too fast. +* Also, we don't get interesting results if we are polling +* faster than once in 10ms, so just return the saved value +* in such cases. +*/ +if (diff1 <=10 ) +return dev_priv->chipset_power; + count1 =I915_READ (DMIEC ); count2 =I915_READ (DDREC ); count3 =I915_READ (CSIEC );
@@ -1483,6 +1491,8 @@ unsigned long i915_chipset_val(struct drm_i915_private *dev_priv) dev_priv->last_count1 = total_count; dev_priv->last_time1 = now; + dev_priv->chipset_power = ret; +return ret; }
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -707,6 +707,7 @@ typedef struct drm_i915_private {u64 last_count1;unsigned long last_time1; +unsigned long chipset_power;u64 last_count2;struct timespec last_time2;unsigned long gfx_power;
drivers/gpu/drm/i915/i915_reg.h +4 -4
@@ -3271,10 +3271,10 @@/* or SDVOB */ #define HDMIB 0xe1140#define PORT_ENABLE (1 << 31) -#define TRANSCODER_A (0) -#define TRANSCODER_B (1 << 30) -#define TRANSCODER (pipe) ((pipe) << 30) -#define TRANSCODER_MASK (1 << 30) +#define TRANSCODER (pipe) ((pipe) << 30) +#define TRANSCODER_CPT (pipe) ((pipe) << 29) +#define TRANSCODER_MASK (1 << 30) +#define TRANSCODER_MASK_CPT (3 << 29)#define COLOR_FORMAT_8bpc (0)#define COLOR_FORMAT_12bpc (3 << 26)#define SDVOB_HOTPLUG_ENABLE (1 << 23)
drivers/gpu/drm/i915/intel_sdvo.c +6 -2
@@ -1085,8 +1085,12 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, } sdvox |= (9 <<19 ) |SDVO_BORDER_ENABLE ; } -if (intel_crtc->pipe ==1 ) - sdvox |=SDVO_PIPE_B_SELECT ; + +if (INTEL_PCH_TYPE (dev) >=PCH_CPT ) + sdvox |=TRANSCODER_CPT (intel_crtc->pipe); +else + sdvox |=TRANSCODER (intel_crtc->pipe); +if (intel_sdvo->has_hdmi_audio) sdvox |=SDVO_AUDIO_ENABLE ;
drivers/gpu/drm/radeon/evergreen.c +12 -0
@@ -3258,6 +3258,18 @@ int evergreen_init(struct radeon_device *rdev) rdev->accel_working = false; } } + +/* Don't start up if the MC ucode is missing on BTC parts. +* The default clocks and voltages before the MC ucode +* is loaded are not suffient for advanced operations. +*/ +if (ASIC_IS_DCE5 (rdev)) { +if (!rdev->mc_fw && !(rdev->flags &RADEON_IS_IGP )) { +DRM_ERROR ("radeon: MC ucode required for NI+.\n" ); +return -EINVAL ; + } + } +return 0 ; }
drivers/gpu/drm/radeon/radeon_atombios.c +5 -1
@@ -2568,7 +2568,11 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) rdev->pm.current_power_state_index = rdev->pm.default_power_state_index; rdev->pm.current_clock_mode_index =0 ; - rdev->pm.current_vddc = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0 ].voltage.voltage; +if (rdev->pm.default_power_state_index >=0 ) + rdev->pm.current_vddc = + rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0 ].voltage.voltage; +else + rdev->pm.current_vddc =0 ; }void radeon_atom_set_clock_gating (struct radeon_device *rdev,int enable)
drivers/infiniband/hw/mlx4/main.c +4 -2
@@ -1144,7 +1144,8 @@ err_reg: err_counter:for (; i; --i) -mlx4_counter_free (ibdev->dev, ibdev->counters[i -1 ]); +if (ibdev->counters[i -1 ] !=-1 ) +mlx4_counter_free (ibdev->dev, ibdev->counters[i -1 ]); err_map:iounmap (ibdev->uar_map);
@@ -1175,7 +1176,8 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) }iounmap (ibdev->uar_map);for (p =0 ; p < ibdev->num_ports; ++p) -mlx4_counter_free (ibdev->dev, ibdev->counters[p]); +if (ibdev->counters[p] !=-1 ) +mlx4_counter_free (ibdev->dev, ibdev->counters[p]); mlx4_foreach_port(p, dev, MLX4_PORT_TYPE_IB)mlx4_CLOSE_PORT (dev, p);
drivers/input/mouse/synaptics.c +11 -0
@@ -24,6 +24,7 @@*/ #include <linux/module.h> +#include <linux/delay.h> #include <linux/dmi.h> #include <linux/input/mt.h> #include <linux/serio.h>
@@ -786,6 +787,16 @@ static int synaptics_reconnect(struct psmouse *psmouse)do {psmouse_reset (psmouse); +if (retry) { +/* +* On some boxes, right after resuming, the touchpad +* needs some time to finish initializing (I assume +* it needs time to calibrate) and start responding +* to Synaptics-specific queries, so let's wait a +* bit. +*/ +ssleep (1 ); + } error =synaptics_detect (psmouse,0 ); }while (error && ++retry <3 );
drivers/media/video/omap/omap_vout.c +1 -0
@@ -38,6 +38,7 @@#include <linux/irq.h> #include <linux/videodev2.h> #include <linux/dma-mapping.h> +#include <linux/slab.h> #include <media/videobuf-dma-contig.h> #include <media/v4l2-device.h>
drivers/media/video/s5p-fimc/fimc-core.c +1 -1
@@ -35,7 +35,7 @@ static char *fimc_clocks[MAX_FIMC_CLOCKS] = {static struct fimc_fmt fimc_formats[] = { { .name ="RGB565" , - .fourcc =V4L2_PIX_FMT_RGB565X , + .fourcc =V4L2_PIX_FMT_RGB565 , .depth = {16 }, .color =S5P_FIMC_RGB565 , .memplanes =1 ,
drivers/mfd/twl-core.c +8 -8
@@ -362,13 +362,13 @@ int twl_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)pr_err ("%s: invalid module number %d\n" ,DRIVER_NAME , mod_no);return -EPERM ; } - sid = twl_map[mod_no].sid; - twl = &twl_modules[sid]; -if (unlikely (!inuse)) { -pr_err ("%s: client %d is not initialized\n" ,DRIVER_NAME , sid); +pr_err ("%s: not initialized\n" ,DRIVER_NAME );return -EPERM ; } + sid = twl_map[mod_no].sid; + twl = &twl_modules[sid]; +mutex_lock (&twl->xfer_lock);/* * [MSG1]: fill the register address data
@@ -419,13 +419,13 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)pr_err ("%s: invalid module number %d\n" ,DRIVER_NAME , mod_no);return -EPERM ; } - sid = twl_map[mod_no].sid; - twl = &twl_modules[sid]; -if (unlikely (!inuse)) { -pr_err ("%s: client %d is not initialized\n" ,DRIVER_NAME , sid); +pr_err ("%s: not initialized\n" ,DRIVER_NAME );return -EPERM ; } + sid = twl_map[mod_no].sid; + twl = &twl_modules[sid]; +mutex_lock (&twl->xfer_lock);/* [MSG1] fill the register address data */ msg = &twl->xfer_msg[0 ];
drivers/mfd/twl4030-madc.c +22 -0
@@ -740,6 +740,28 @@ static int __devinit twl4030_madc_probe(struct platform_device *pdev) TWL4030_BCI_BCICTL1); goto err_i2c; } + +/* Check that MADC clock is on */ + ret =twl_i2c_read_u8 (TWL4030_MODULE_INTBR , ®val,TWL4030_REG_GPBR1 ); +if (ret) { +dev_err (&pdev->dev,"unable to read reg GPBR1 0x%X\n" , +TWL4030_REG_GPBR1 ); + goto err_i2c; + } + +/* If MADC clk is not on, turn it on */ +if (!(regval &TWL4030_GPBR1_MADC_HFCLK_EN )) { +dev_info (&pdev->dev,"clk disabled, enabling\n" ); + regval |=TWL4030_GPBR1_MADC_HFCLK_EN ; + ret =twl_i2c_write_u8 (TWL4030_MODULE_INTBR , regval, +TWL4030_REG_GPBR1 ); +if (ret) { +dev_err (&pdev->dev,"unable to write reg GPBR1 0x%X\n" , +TWL4030_REG_GPBR1 ); + goto err_i2c; + } + } +platform_set_drvdata (pdev, madc);mutex_init (&madc->lock); ret = request_threaded_irq(platform_get_irq(pdev, 0), NULL,
drivers/mmc/host/mmci.c +10 -4
@@ -673,7 +673,8 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data, unsigned int status) {/* First check for errors */ -if (status & (MCI_DATACRCFAIL |MCI_DATATIMEOUT |MCI_TXUNDERRUN |MCI_RXOVERRUN )) { +if (status & (MCI_DATACRCFAIL |MCI_DATATIMEOUT |MCI_STARTBITERR | +MCI_TXUNDERRUN |MCI_RXOVERRUN )) {u32 remain, success;/* Terminate the DMA transfer */
@@ -752,8 +753,12 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, }if (!cmd->data || cmd->error) { -if (host->data) +if (host->data) { +/* Terminate the DMA transfer */ +if (dma_inprogress (host)) +mmci_dma_data_error (host);mmci_stop_data (host); + }mmci_request_end (host, cmd->mrq); }else if (!(cmd->data->flags &MMC_DATA_READ )) {mmci_start_data (host, cmd->data);
@@ -953,8 +958,9 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)dev_dbg (mmc_dev (host->mmc),"irq0 (data+cmd) %08x\n" , status); data = host->data; -if (status & (MCI_DATACRCFAIL |MCI_DATATIMEOUT |MCI_TXUNDERRUN | -MCI_RXOVERRUN |MCI_DATAEND |MCI_DATABLOCKEND ) && data) +if (status & (MCI_DATACRCFAIL |MCI_DATATIMEOUT |MCI_STARTBITERR | +MCI_TXUNDERRUN |MCI_RXOVERRUN |MCI_DATAEND | +MCI_DATABLOCKEND ) && data)mmci_data_irq (host, data, status); cmd = host->cmd;
drivers/mmc/host/vub300.c +1 -1
@@ -259,7 +259,7 @@ static int firmware_rom_wait_states = 0x04;static int firmware_rom_wait_states =0x1C ;#endif -module_param (firmware_rom_wait_states, bool,0644 ); +module_param (firmware_rom_wait_states, int,0644 );MODULE_PARM_DESC (firmware_rom_wait_states,"ROM wait states byte=RRRIIEEE (Reserved Internal External)" );
drivers/net/pptp.c +1 -3
@@ -423,10 +423,8 @@ static int pptp_bind(struct socket *sock, struct sockaddr *uservaddr,lock_sock (sk); opt->src_addr = sp->sa_addr.pptp; -if (add_chan (po)) { -release_sock (sk); +if (add_chan (po)) error = -EBUSY ; - }release_sock (sk);return error;
drivers/net/wireless/ath/ath9k/main.c +3 -0
@@ -1841,6 +1841,9 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,struct ath_softc *sc = hw->priv;struct ath_node *an = (struct ath_node *) sta->drv_priv; +if (!(sc->sc_flags &SC_OP_TXAGGR )) +return ; +switch (cmd) {case STA_NOTIFY_SLEEP : an->sleeping = true;
drivers/net/wireless/ath/ath9k/rc.c +3 -1
@@ -1250,7 +1250,9 @@ static void ath_rc_init(struct ath_softc *sc, ath_rc_priv->max_valid_rate = k;ath_rc_sort_validrates (rate_table, ath_rc_priv); - ath_rc_priv->rate_max_phy = ath_rc_priv->valid_rate_index[k-4 ]; + ath_rc_priv->rate_max_phy = (k >4 ) ? + ath_rc_priv->valid_rate_index[k-4 ] : + ath_rc_priv->valid_rate_index[k-1 ]; ath_rc_priv->rate_table = rate_table; ath_dbg(common, ATH_DBG_CONFIG,
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +2 -2
@@ -620,8 +620,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)if (ctx->ht.enabled) {/* if HT40 is used, it should not change * after associated except channel switch */ -if (iwl_is_associated_ctx (ctx) && - !ctx->ht.is_40mhz) +if (!ctx->ht.is_40mhz || + !iwl_is_associated_ctx (ctx))iwlagn_config_ht40 (conf, ctx); }else ctx->ht.is_40mhz = false;
drivers/net/wireless/iwlwifi/iwl-agn-tx.c +4 -1
@@ -166,7 +166,10 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv, tx_cmd->tid_tspec = qc[0 ] &0xf ; tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK ; }else { - tx_flags |=TX_CMD_FLG_SEQ_CTL_MSK ; +if (info->flags &IEEE80211_TX_CTL_ASSIGN_SEQ ) + tx_flags |=TX_CMD_FLG_SEQ_CTL_MSK ; +else + tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK ; }iwlagn_tx_cmd_protection (priv, info, fc, &tx_flags);
drivers/net/wireless/iwlwifi/iwl-trans.c +1 -3
@@ -1068,9 +1068,7 @@ static int iwl_trans_tx(struct iwl_priv *priv, struct sk_buff *skb,iwl_print_hex_dump (priv,IWL_DL_TX , (u8 *)tx_cmd->hdr, hdr_len);/* Set up entry for this TFD in Tx byte-count array */ -if (ampdu) -iwl_trans_txq_update_byte_cnt_tbl (priv, txq, -le16_to_cpu (tx_cmd->len)); +iwl_trans_txq_update_byte_cnt_tbl (priv, txq,le16_to_cpu (tx_cmd->len));dma_sync_single_for_device (priv->bus->dev, txcmd_phys, firstlen,DMA_BIDIRECTIONAL );
drivers/net/wireless/rtlwifi/rtl8192ce/phy.c +1 -1
@@ -569,7 +569,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw, }case ERFSLEEP :{if (ppsc->rfpwr_state ==ERFOFF ) -break ; +return false;for (queue_id =0 , i =0 ; queue_id <RTL_PCI_MAX_TX_QUEUE_COUNT ;) { ring = &pcipriv->dev.tx_ring[queue_id];
drivers/net/wireless/rtlwifi/rtl8192cu/phy.c +1 -1
@@ -548,7 +548,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,break ;case ERFSLEEP :if (ppsc->rfpwr_state ==ERFOFF ) -break ; +return false;for (queue_id =0 , i =0 ; queue_id <RTL_PCI_MAX_TX_QUEUE_COUNT ;) { ring = &pcipriv->dev.tx_ring[queue_id];
drivers/net/wireless/rtlwifi/rtl8192de/phy.c +1 -1
@@ -3374,7 +3374,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,break ;case ERFSLEEP :if (ppsc->rfpwr_state ==ERFOFF ) -break ; +return false;for (queue_id =0 , i =0 ; queue_id <RTL_PCI_MAX_TX_QUEUE_COUNT ;) {
drivers/net/wireless/rtlwifi/rtl8192se/phy.c +1 -1
@@ -602,7 +602,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw, }case ERFSLEEP :if (ppsc->rfpwr_state ==ERFOFF ) -break ; +return false;for (queue_id =0 , i =0 ; queue_id <RTL_PCI_MAX_TX_QUEUE_COUNT ;) {
drivers/oprofile/oprofile_files.c +4 -3
@@ -45,7 +45,7 @@ static ssize_t timeout_write(struct file *file, char const __user *buf,return -EINVAL ; retval =oprofilefs_ulong_from_user (&val, buf, count); -if (retval) +if (retval <=0 )return retval; retval =oprofile_set_timeout (val);
@@ -84,7 +84,7 @@ static ssize_t depth_write(struct file *file, char const __user *buf, size_t coureturn -EINVAL ; retval =oprofilefs_ulong_from_user (&val, buf, count); -if (retval) +if (retval <=0 )return retval; retval =oprofile_set_ulong (&oprofile_backtrace_depth, val);
@@ -141,9 +141,10 @@ static ssize_t enable_write(struct file *file, char const __user *buf, size_t coreturn -EINVAL ; retval =oprofilefs_ulong_from_user (&val, buf, count); -if (retval) +if (retval <=0 )return retval; + retval =0 ;if (val) retval =oprofile_start ();else
drivers/oprofile/oprofilefs.c +9 -2
@@ -60,6 +60,13 @@ ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user *buf, size_t cou } +/* +* Note: If oprofilefs_ulong_from_user() returns 0, then *val remains +* unchanged and might be uninitialized. This follows write syscall +* implementation when count is zero: "If count is zero ... [and if] +* no errors are detected, 0 will be returned without causing any +* other effect." (man 2 write) +*/ int oprofilefs_ulong_from_user (unsigned long *val,char const __user *buf,size_t count) {char tmpbuf[TMPBUFSIZE ];
@@ -79,7 +86,7 @@ int oprofilefs_ulong_from_user(unsigned long *val, char const __user *buf, size_spin_lock_irqsave (&oprofilefs_lock, flags); *val =simple_strtoul (tmpbuf,NULL ,0 );spin_unlock_irqrestore (&oprofilefs_lock, flags); -return 0 ; +return count; }
@@ -99,7 +106,7 @@ static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_return -EINVAL ; retval =oprofilefs_ulong_from_user (&value, buf, count); -if (retval) +if (retval <=0 )return retval; retval =oprofile_set_ulong (file->private_data, value);
drivers/rtc/interface.c +10 -34
75 lines not on this page · raw message
drivers/rtc/rtc-m41t80.c +9 -0
@@ -357,10 +357,19 @@ static int m41t80_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *t)static struct rtc_class_ops m41t80_rtc_ops = { .read_time = m41t80_rtc_read_time, .set_time = m41t80_rtc_set_time, +/* +* XXX - m41t80 alarm functionality is reported broken. +* until it is fixed, don't register alarm functions. +* .read_alarm = m41t80_rtc_read_alarm, .set_alarm = m41t80_rtc_set_alarm, +*/ .proc = m41t80_rtc_proc, +/* +* See above comment on broken alarm +* .alarm_irq_enable = m41t80_rtc_alarm_irq_enable, +*/ };#if defined(CONFIG_RTC_INTF_SYSFS ) || defined(CONFIG_RTC_INTF_SYSFS_MODULE )
drivers/s390/scsi/zfcp_scsi.c +4 -0
@@ -57,6 +57,10 @@ static void zfcp_scsi_slave_destroy(struct scsi_device *sdev) {struct zfcp_scsi_dev *zfcp_sdev =sdev_to_zfcp (sdev); +/* if previous slave_alloc returned early, there is nothing to do */ +if (!zfcp_sdev->port) +return ; +zfcp_erp_lun_shutdown_wait (sdev,"scssd_1" );put_device (&zfcp_sdev->port->dev); }
drivers/scsi/fcoe/fcoe.c +1 -0
@@ -1635,6 +1635,7 @@ static inline int fcoe_filter_frames(struct fc_lport *lport, stats->InvalidCRCCount++;if (stats->InvalidCRCCount <5 )printk (KERN_WARNING "fcoe: dropping frame with CRC error\n" ); +put_cpu ();return -EINVAL ; }
drivers/scsi/mpt2sas/mpt2sas_base.c +2 -57
102 lines not on this page · raw message
drivers/scsi/mpt2sas/mpt2sas_base.h +0 -4
@@ -636,8 +636,6 @@ enum mutex_type {* @wait_for_port_enable_to_complete: * @msix_enable: flag indicating msix is enabled * @msix_vector_count: number msix vectors -* @msix_table: virt address to the msix table -* @msix_table_backup: backup msix table * @scsi_io_cb_idx: shost generated commands * @tm_cb_idx: task management commands * @scsih_cb_idx: scsih internal commands
@@ -779,8 +777,6 @@ struct MPT2SAS_ADAPTER {u8 msix_enable;u16 msix_vector_count; -u32 *msix_table; -u32 *msix_table_backup;u32 ioc_reset_count;/* internal commands, callback index */
drivers/scsi/mpt2sas/mpt2sas_scsih.c +1 -1
@@ -4210,7 +4210,7 @@ _scsih_smart_predicted_fault(struct MPT2SAS_ADAPTER *ioc, u16 handle)/* insert into event log */ sz = offsetof(Mpi2EventNotificationReply_t , EventData) +sizeof (Mpi2EventDataSasDeviceStatusChange_t); - event_reply =kzalloc (sz,GFP_KERNEL ); + event_reply =kzalloc (sz,GFP_ATOMIC );if (!event_reply) {printk (MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n" , ioc->name, __FILE__, __LINE__, __func__);
drivers/ssb/driver_pcicore.c +6 -2
@@ -516,10 +516,14 @@ static void ssb_pcicore_pcie_setup_workarounds(struct ssb_pcicore *pc)static void __devinit ssb_pcicore_init_clientmode (struct ssb_pcicore *pc) { -ssb_pcicore_fix_sprom_core_index (pc); +struct ssb_device *pdev = pc->dev; +struct ssb_bus *bus = pdev->bus; + +if (bus->bustype ==SSB_BUSTYPE_PCI ) +ssb_pcicore_fix_sprom_core_index (pc);/* Disable PCI interrupts. */ -ssb_write32 (pc->dev,SSB_INTVEC ,0 ); +ssb_write32 (pdev,SSB_INTVEC ,0 );/* Additional PCIe always once-executed workarounds */ if (pc->dev->id.coreid ==SSB_DEV_PCIE ) {
drivers/watchdog/hpwdt.c +4 -1
@@ -230,6 +230,7 @@ static int __devinit cru_detect(unsigned long map_entry, cmn_regs.u1.reax =CRU_BIOS_SIGNATURE_VALUE ; +set_memory_x ((unsigned long )bios32_entrypoint, (2 *PAGE_SIZE ));asminline_call (&cmn_regs, bios32_entrypoint);if (cmn_regs.u1.ral !=0 ) {
@@ -247,8 +248,10 @@ static int __devinit cru_detect(unsigned long map_entry,if ((physical_bios_base + physical_bios_offset)) { cru_rom_addr =ioremap (cru_physical_address, cru_length); -if (cru_rom_addr) +if (cru_rom_addr) { +set_memory_x ((unsigned long )cru_rom_addr, cru_length); retval =0 ; + } } printk(KERN_DEBUG "hpwdt: CRU Base Address: 0x%lx\n",
fs/nfs/file.c +1 -1
@@ -191,7 +191,7 @@ static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)* origin == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate * the cached file length */ -if (origin !=SEEK_SET || origin !=SEEK_CUR ) { +if (origin !=SEEK_SET && origin !=SEEK_CUR ) {struct inode *inode = filp->f_mapping->host;int retval =nfs_revalidate_file_size (inode, filp);
fs/nfs/nfs4state.c +4 -4
@@ -1525,16 +1525,16 @@ void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags) {if (!flags)return ; -else if (flags &SEQ4_STATUS_RESTART_RECLAIM_NEEDED ) +if (flags &SEQ4_STATUS_RESTART_RECLAIM_NEEDED )nfs41_handle_server_reboot (clp); -else if (flags & (SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED | +if (flags & (SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED |SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED |SEQ4_STATUS_ADMIN_STATE_REVOKED |SEQ4_STATUS_LEASE_MOVED ))nfs41_handle_state_revoked (clp); -else if (flags &SEQ4_STATUS_RECALLABLE_STATE_REVOKED ) +if (flags &SEQ4_STATUS_RECALLABLE_STATE_REVOKED )nfs41_handle_recallable_state_revoked (clp); -else if (flags & (SEQ4_STATUS_CB_PATH_DOWN | +if (flags & (SEQ4_STATUS_CB_PATH_DOWN |SEQ4_STATUS_BACKCHANNEL_FAULT |SEQ4_STATUS_CB_PATH_DOWN_SESSION ))nfs41_handle_cb_path_down (clp);
fs/nilfs2/ioctl.c +13 -0
@@ -842,6 +842,19 @@ long nilfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)case FS_IOC32_GETVERSION : cmd =FS_IOC_GETVERSION ;break ; +case NILFS_IOCTL_CHANGE_CPMODE : +case NILFS_IOCTL_DELETE_CHECKPOINT : +case NILFS_IOCTL_GET_CPINFO : +case NILFS_IOCTL_GET_CPSTAT : +case NILFS_IOCTL_GET_SUINFO : +case NILFS_IOCTL_GET_SUSTAT : +case NILFS_IOCTL_GET_VINFO : +case NILFS_IOCTL_GET_BDESCS : +case NILFS_IOCTL_CLEAN_SEGMENTS : +case NILFS_IOCTL_SYNC : +case NILFS_IOCTL_RESIZE : +case NILFS_IOCTL_SET_ALLOC_RANGE : +break ;default :return -ENOIOCTLCMD ; }
include/linux/blkdev.h +0 -3
@@ -803,9 +803,6 @@ extern void blk_unprep_request(struct request *);*/ extern struct request_queue *blk_init_queue_node (request_fn_proc *rfn,spinlock_t *lock,int node_id); -extern struct request_queue *blk_init_allocated_queue_node (struct request_queue *, -request_fn_proc *, -spinlock_t *,int node_id);extern struct request_queue *blk_init_queue (request_fn_proc *,spinlock_t *);extern struct request_queue *blk_init_allocated_queue (struct request_queue *,request_fn_proc *,spinlock_t *);
include/linux/i2c/twl4030-madc.h +4 -0
@@ -129,6 +129,10 @@ enum sample_type {#define REG_BCICTL2 0x024#define TWL4030_BCI_ITHSENS 0x007 +/* Register and bits for GPBR1 register */ +#define TWL4030_REG_GPBR1 0x0c +#define TWL4030_GPBR1_MADC_HFCLK_EN (1 << 7) +struct twl4030_madc_user_parms {int channel;int average;
include/linux/lglock.h +32 -4
@@ -22,6 +22,7 @@#include <linux/spinlock.h> #include <linux/lockdep.h> #include <linux/percpu.h> +#include <linux/cpu.h> /* can make br locks by using local lock for read side, global lock for write */ #define br_lock_init (name) name##_lock_init()
@@ -72,9 +73,31 @@#define DEFINE_LGLOCK (name) \ \ + DEFINE_SPINLOCK(name##_cpu_lock); \ + cpumask_t name##_cpus __read_mostly; \ DEFINE_PER_CPU(arch_spinlock_t, name##_lock); \ DEFINE_LGLOCK_LOCKDEP(name); \ \ + static int \ + name##_lg_cpu_callback(struct notifier_block *nb, \ + unsigned long action, void *hcpu) \ + { \ + switch (action & ~CPU_TASKS_FROZEN) { \ + case CPU_UP_PREPARE: \ + spin_lock(&name##_cpu_lock); \ + cpu_set((unsigned long)hcpu, name##_cpus); \ + spin_unlock(&name##_cpu_lock); \ + break; \ + case CPU_UP_CANCELED: case CPU_DEAD: \ + spin_lock(&name##_cpu_lock); \ + cpu_clear((unsigned long)hcpu, name##_cpus); \ + spin_unlock(&name##_cpu_lock); \ + } \ + return NOTIFY_OK; \ + } \ + static struct notifier_block name##_lg_cpu_notifier = { \ + .notifier_call = name##_lg_cpu_callback, \ + }; \ void name##_lock_init(void) { \ int i; \ LOCKDEP_INIT_MAP(&name##_lock_dep_map, #name, &name##_lock_key, 0); \
@@ -83,6 +106,11 @@ lock = &per_cpu(name##_lock, i); \ *lock = (arch_spinlock_t )__ARCH_SPIN_LOCK_UNLOCKED; \ } \ + register_hotcpu_notifier(&name##_lg_cpu_notifier); \ +get_online_cpus (); \ +for_each_online_cpu (i) \ + cpu_set(i, name##_cpus); \ +put_online_cpus (); \ } \ EXPORT_SYMBOL(name##_lock_init); \ \
@@ -124,9 +152,9 @@ \ void name##_global_lock_online(void) { \int i; \ -preempt_disable (); \ + spin_lock(&name##_cpu_lock); \ rwlock_acquire(&name##_lock_dep_map, 0, 0, _RET_IP_); \ -for_each_online_cpu (i) { \ + for_each_cpu(i, &name##_cpus) { \arch_spinlock_t *lock; \ lock = &per_cpu(name##_lock, i); \arch_spin_lock (lock); \
@@ -137,12 +165,12 @@ void name##_global_unlock_online(void) { \int i; \ rwlock_release(&name##_lock_dep_map, 1, _RET_IP_); \ -for_each_online_cpu (i) { \ + for_each_cpu(i, &name##_cpus) { \arch_spinlock_t *lock; \ lock = &per_cpu(name##_lock, i); \arch_spin_unlock (lock); \ } \ -preempt_enable (); \ + spin_unlock(&name##_cpu_lock); \ } \ EXPORT_SYMBOL(name##_global_unlock_online); \ \
include/net/dst.h +1 -0
@@ -53,6 +53,7 @@ struct dst_entry {#define DST_NOHASH 0x0008#define DST_NOCACHE 0x0010#define DST_NOCOUNT 0x0020 +#define DST_NOPEER 0x0040short error;short obsolete;
include/net/flow.h +1 -0
@@ -207,6 +207,7 @@ extern struct flow_cache_object *flow_cache_lookup( u8 dir, flow_resolve_t resolver, void *ctx);extern void flow_cache_flush (void ); +extern void flow_cache_flush_deferred (void );extern atomic_t flow_cache_genid;#endif
include/net/sctp/structs.h +4 -0
@@ -241,6 +241,9 @@ extern struct sctp_globals {* bits is an indicator of when to send and window update SACK. */ int rwnd_update_shift; + +/* Threshold for autoclose timeout, in seconds. */ +unsigned long max_autoclose; } sctp_globals;#define sctp_rto_initial (sctp_globals.rto_initial)
@@ -281,6 +284,7 @@ extern struct sctp_globals {#define sctp_auth_enable (sctp_globals.auth_enable)#define sctp_checksum_disable (sctp_globals.checksum_disable)#define sctp_rwnd_upd_shift (sctp_globals.rwnd_update_shift) +#define sctp_max_autoclose (sctp_globals.max_autoclose)/* SCTP Socket type: UDP or TCP style. */ typedef enum {
kernel/cgroup.c +0 -5
@@ -2098,11 +2098,6 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)continue ;/* get old css_set pointer */ task_lock (tsk); -if (tsk->flags &PF_EXITING ) { -/* ignore this task if it's going away */ -task_unlock (tsk); -continue ; - } oldcg = tsk->cgroups;get_css_set (oldcg);task_unlock (tsk);
kernel/exit.c +8 -1
@@ -1542,8 +1542,15 @@ static int wait_consider_task(struct wait_opts *wo, int ptrace, }/* dead body doesn't have much to contribute */ -if (p->exit_state ==EXIT_DEAD ) +if (unlikely (p->exit_state ==EXIT_DEAD )) { +/* +* But do not ignore this task until the tracer does +* wait_task_zombie()->do_notify_parent(). +*/ +if (likely (!ptrace) &&unlikely (ptrace_reparented (p))) + wo->notask_error =0 ;return 0 ; + }/* slay zombie? */ if (p->exit_state ==EXIT_ZOMBIE ) {
kernel/futex.c +20 -8
@@ -314,17 +314,29 @@ again:#endif lock_page (page_head); + +/* +* If page_head->mapping is NULL, then it cannot be a PageAnon +* page; but it might be the ZERO_PAGE or in the gate area or +* in a special mapping (all cases which we are happy to fail); +* or it may have been a good file page when get_user_pages_fast +* found it, but truncated or holepunched or subjected to +* invalidate_complete_page2 before we got the page lock (also +* cases which we are happy to fail). And we hold a reference, +* so refcount care in invalidate_complete_page's remove_mapping +* prevents drop_caches from setting mapping to NULL beneath us. +* +* The case we do have to guard against is when memory pressure made +* shmem_writepage move it from filecache to swapcache beneath us: +* an unlikely race, but we do need to retry for page_head->mapping. +*/ if (!page_head->mapping) { +int shmem_swizzled =PageSwapCache (page_head);unlock_page (page_head);put_page (page_head); -/* -* ZERO_PAGE pages don't have a mapping. Avoid a busy loop -* trying to find one. RW mapping would have COW'd (and thus -* have a mapping) so this page is RO and won't ever change. -*/ -if ((page_head ==ZERO_PAGE (address))) -return -EFAULT ; - goto again; +if (shmem_swizzled) + goto again; +return -EFAULT ; }/*
kernel/hung_task.c +10 -4
@@ -74,11 +74,17 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)/* * Ensure the task is not frozen. -* Also, when a freshly created task is scheduled once, changes -* its state to TASK_UNINTERRUPTIBLE without having ever been -* switched out once, it musn't be checked. +* Also, skip vfork and any other user process that freezer should skip. */ -if (unlikely (t->flags &PF_FROZEN || !switch_count)) +if (unlikely (t->flags & (PF_FROZEN |PF_FREEZER_SKIP ))) +return ; + +/* +* When a freshly created task is scheduled once, changes its state to +* TASK_UNINTERRUPTIBLE without having ever been switched out once, it +* musn't be checked. +*/ +if (unlikely (!switch_count))return ;if (switch_count != t->last_switch_count) {
kernel/ptrace.c +12 -1
@@ -96,9 +96,20 @@ void __ptrace_unlink(struct task_struct *child)*/ if (!(child->flags &PF_EXITING ) && (child->signal->flags &SIGNAL_STOP_STOPPED || - child->signal->group_stop_count)) + child->signal->group_stop_count)) { child->jobctl |=JOBCTL_STOP_PENDING ; +/* +* This is only possible if this thread was cloned by the +* traced task running in the stopped group, set the signal +* for the future reports. +* FIXME: we should change ptrace_init_task() to handle this +* case. +*/ +if (!(child->jobctl &JOBCTL_STOP_SIGMASK )) + child->jobctl |=SIGSTOP ; + } +/* * If transition to TASK_STOPPED is pending or in TASK_TRACED, kick * @child in the butt. Note that @resume should be used iff @child
kernel/signal.c +0 -2
@@ -1986,8 +1986,6 @@ static bool do_signal_stop(int signr)*/ if (!(sig->flags &SIGNAL_STOP_STOPPED )) sig->group_exit_code = signr; -else -WARN_ON_ONCE (!current->ptrace); sig->group_stop_count =0 ;
kernel/sysctl_binary.c +1 -1
@@ -1354,7 +1354,7 @@ static ssize_t binary_sysctl(const int *name, int nlen,fput (file); out_putname: -putname (pathname); +__putname (pathname); out:return result; }
mm/filemap.c +2 -5
@@ -1828,7 +1828,7 @@ repeat: page =__page_cache_alloc (gfp | __GFP_COLD);if (!page)return ERR_PTR (-ENOMEM ); - err =add_to_page_cache_lru (page, mapping, index,GFP_KERNEL ); + err =add_to_page_cache_lru (page, mapping, index, gfp);if (unlikely (err)) {page_cache_release (page);if (err == -EEXIST )
@@ -1925,10 +1925,7 @@ static struct page *wait_on_page_read(struct page *page)* @gfp: the page allocator flags to use if allocating * * This is the same as "read_mapping_page(mapping, index, NULL)", but with -* any new page allocations done using the specified allocation flags. Note -* that the Radix tree operations will still use GFP_KERNEL, so you can't -* expect to do this atomically or anything like that - but you can pass in -* other page requirements. +* any new page allocations done using the specified allocation flags. * * If the page does not get brought uptodate, return -EIO. */
mm/hugetlb.c +1 -1
@@ -901,7 +901,6 @@ retry: h->resv_huge_pages += delta; ret =0 ; -spin_unlock (&hugetlb_lock);/* Free the needed pages to the hugetlb pool */ list_for_each_entry_safe (page, tmp, &surplus_list, lru) {if ((--needed) <0 )
@@ -915,6 +914,7 @@ retry:VM_BUG_ON (page_count (page));enqueue_huge_page (h, page); } +spin_unlock (&hugetlb_lock);/* Free unnecessary surplus pages to the buddy allocator */ free:
mm/memcontrol.c +1 -2
@@ -4898,9 +4898,9 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)int cpu;enable_swap_cgroup (); parent =NULL ; - root_mem_cgroup = mem;if (mem_cgroup_soft_limit_tree_init ()) goto free_out; + root_mem_cgroup = mem;for_each_possible_cpu (cpu) {struct memcg_stock_pcp *stock = &per_cpu (memcg_stock, cpu);
@@ -4939,7 +4939,6 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)return &mem->css; free_out:__mem_cgroup_free (mem); - root_mem_cgroup =NULL ;return ERR_PTR (error); }
mm/mempolicy.c +10 -1
@@ -636,6 +636,7 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,struct vm_area_struct *prev;struct vm_area_struct *vma;int err =0 ; +pgoff_t pgoff;unsigned long vmstart;unsigned long vmend;
@@ -643,13 +644,21 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,if (!vma || vma->vm_start > start)return -EFAULT ; +if (start > vma->vm_start) + prev = vma; +for (; vma && vma->vm_start < end; prev = vma, vma = next) { next = vma->vm_next; vmstart =max (start, vma->vm_start); vmend =min (end, vma->vm_end); +if (mpol_equal (vma_policy (vma), new_pol)) +continue ; + + pgoff = vma->vm_pgoff + + ((vmstart - vma->vm_start) >>PAGE_SHIFT ); prev =vma_merge (mm, prev, vmstart, vmend, vma->vm_flags, - vma->anon_vma, vma->vm_file, vma->vm_pgoff, + vma->anon_vma, vma->vm_file, pgoff, new_pol);if (prev) { vma = prev;
mm/oom_kill.c +1 -1
@@ -162,7 +162,7 @@ static bool oom_unkillable_task(struct task_struct *p,unsigned int oom_badness (struct task_struct *p,struct mem_cgroup *mem,const nodemask_t *nodemask,unsigned long totalpages) { -int points; +long points;if (oom_unkillable_task (p, mem, nodemask))return 0 ;
mm/percpu.c +4 -2
@@ -1011,9 +1011,11 @@ phys_addr_t per_cpu_ptr_to_phys(void *addr)if (!is_vmalloc_addr (addr))return __pa (addr);else -return page_to_phys (vmalloc_to_page (addr)); +return page_to_phys (vmalloc_to_page (addr)) + +offset_in_page (addr); }else -return page_to_phys (pcpu_addr_to_page (addr)); +return page_to_phys (pcpu_addr_to_page (addr)) + +offset_in_page (addr); }/**
net/bridge/br_netfilter.c +1 -1
@@ -141,7 +141,7 @@ void br_netfilter_rtable_init(struct net_bridge *br) rt->dst.dev = br->dev; rt->dst.path = &rt->dst;dst_init_metrics (&rt->dst, br_dst_default_metrics, true); - rt->dst.flags =DST_NOXFRM ; + rt->dst.flags =DST_NOXFRM |DST_NOPEER ; rt->dst.ops = &fake_dst_ops; }
net/core/flow.c +12 -0
@@ -358,6 +358,18 @@ void flow_cache_flush(void)put_online_cpus (); } +static void flow_cache_flush_task (struct work_struct *work) +{ +flow_cache_flush (); +} + +static DECLARE_WORK(flow_cache_flush_work, flow_cache_flush_task); + +void flow_cache_flush_deferred (void ) +{ +schedule_work (&flow_cache_flush_work); +} +static int __cpuinit flow_cache_cpu_prepare (struct flow_cache *fc,int cpu) {struct flow_cache_percpu *fcp =per_cpu_ptr (fc->percpu, cpu);
net/ipv4/devinet.c +5 -0
@@ -1490,7 +1490,9 @@ static int devinet_conf_proc(ctl_table *ctl, int write,void __user *buffer, size_t *lenp, loff_t *ppos) { + int old_value = *(int *)ctl->data;int ret =proc_dointvec (ctl, write, buffer, lenp, ppos); +int new_value = *(int *)ctl->data;if (write) {struct ipv4_devconf *cnf = ctl->extra1;
@@ -1501,6 +1503,9 @@ static int devinet_conf_proc(ctl_table *ctl, int write,if (cnf == net->ipv4.devconf_dflt)devinet_copy_dflt_conf (net, i); +if (i ==IPV4_DEVCONF_ACCEPT_LOCAL -1 ) +if ((new_value ==0 ) && (old_value !=0 )) +rt_cache_flush (net,0 ); }return ret;
net/ipv4/ipconfig.c +4 -0
@@ -252,6 +252,10 @@ static int __init ic_open_devs(void) } } +/* no point in waiting if we could not bring up at least one device */ +if (!ic_first_dev) + goto have_carrier; +/* wait for a carrier on at least one device */ start = jiffies;while (jiffies - start <msecs_to_jiffies (CONF_CARRIER_TIMEOUT )) {
net/ipv4/ipip.c +6 -1
@@ -285,6 +285,8 @@ static struct ip_tunnel * ipip_tunnel_locate(struct net *net,if (register_netdevice (dev) <0 ) goto failed_free; +strcpy (nt->parms.name, dev->name); +dev_hold (dev);ipip_tunnel_link (ipn, nt);return nt;
@@ -759,7 +761,6 @@ static int ipip_tunnel_init(struct net_device *dev)struct ip_tunnel *tunnel =netdev_priv (dev); tunnel->dev = dev; -strcpy (tunnel->parms.name, dev->name);memcpy (dev->dev_addr, &tunnel->parms.iph.saddr,4 );memcpy (dev->broadcast, &tunnel->parms.iph.daddr,4 );
@@ -825,6 +826,7 @@ static void ipip_destroy_tunnels(struct ipip_net *ipn, struct list_head *head)static int __net_init ipip_init_net (struct net *net) {struct ipip_net *ipn =net_generic (net, ipip_net_id); +struct ip_tunnel *t;int err; ipn->tunnels[0 ] = ipn->tunnels_wc;
@@ -848,6 +850,9 @@ static int __net_init ipip_init_net(struct net *net)if ((err =register_netdev (ipn->fb_tunnel_dev))) goto err_reg_dev; + t =netdev_priv (ipn->fb_tunnel_dev); + +strcpy (t->parms.name, ipn->fb_tunnel_dev->name);return 0 ; err_reg_dev:
net/ipv4/route.c +109 -2
31 lines not on this page · raw message
net/mac80211/agg-tx.c +41 -45
86 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.