Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df5450d5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v3.7-rc8' into staging/for_v3.8 

Linux 3.7-rc8

* tag 'v3.7-rc8': (112 commits)
  Linux 3.7-rc8
  [parisc] open(2) compat bug
  Revert "sched, autogroup: Stop going ahead if autogroup is disabled"
  open*(2) compat fixes (s390, arm64)
  8139cp: fix coherent mapping leak in error path.
  tcp: fix crashes in do_tcp_sendpages()
  workqueue: mod_delayed_work_on() shouldn't queue timer on 0 delay
  workqueue: exit rescuer_thread() as TASK_RUNNING
  x86, fpu: Avoid FPU lazy restore after suspend
  drivers/rtc/rtc-tps65910.c: fix invalid pointer access on _remove()
  mm: soft offline: split thp at the beginning of soft_offline_page()
  mm: avoid waking kswapd for THP allocations when compaction is deferred or contended
  revert "Revert "mm: remove __GFP_NO_KSWAPD""
  mm: vmscan: fix endless loop in kswapd balancing
  mm/vmemmap: fix wrong use of virt_to_page
  mm: compaction: fix return value of capture_free_page()
  fix off-by-one in argument passed by iterate_fd() to callbacks
  lookup_one_len: don't accept . and ..
  cifs: get rid of blind d_drop() in readdir
  nfs_lookup_revalidate(): fix a leak
  ...
parents d8658bca b69f0859

Makefile

+5 −3
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 7

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Terrified Chipmunk



# *DOCUMENTATION*
@@ -1321,10 +1321,12 @@ kernelversion: 


# Clear a bunch of variables before executing the submake

tools/: FORCE

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/



tools/%: FORCE

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/ $*

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ $*



# Single targets

# ---------------------------------------------------------------------------

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ config ARCH_KIRKWOOD 
	select CPU_FEROCEON

	select GENERIC_CLOCKEVENTS

	select PCI

	select PCI_QUIRKS

	select PLAT_ORION_LEGACY

	help

	  Support for the following Marvell Kirkwood series SoCs:

arch/arm/common/timer-sp.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static struct clock_event_device sp804_clockevent = { 
	.set_mode	= sp804_set_mode,

	.set_next_event	= sp804_set_next_event,

	.rating		= 300,

	.cpumask	= cpu_all_mask,

};



static struct irqaction sp804_timer_irq = {
@@ -185,6 +184,7 @@ void __init sp804_clockevents_init(void __iomem *base, unsigned int irq, 
	clkevt_reload = DIV_ROUND_CLOSEST(rate, HZ);

	evt->name = name;

	evt->irq = irq;

	evt->cpumask = cpu_possible_mask;



	setup_irq(irq, &sp804_timer_irq);

	clockevents_config_and_register(evt, rate, 0xf, 0xffffffff);

arch/arm/mach-dove/include/mach/pm.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static inline int pmu_to_irq(int pin) 


static inline int irq_to_pmu(int irq)

{

	if (IRQ_DOVE_PMU_START < irq && irq < NR_IRQS)

	if (IRQ_DOVE_PMU_START <= irq && irq < NR_IRQS)

		return irq - IRQ_DOVE_PMU_START;



	return -EINVAL;

arch/arm/mach-dove/irq.c

+13 −1
Original line number Diff line number Diff line
@@ -46,8 +46,20 @@ static void pmu_irq_ack(struct irq_data *d) 
	int pin = irq_to_pmu(d->irq);

	u32 u;



	/*

	 * The PMU mask register is not RW0C: it is RW.  This means that

	 * the bits take whatever value is written to them; if you write

	 * a '1', you will set the interrupt.

	 *

	 * Unfortunately this means there is NO race free way to clear

	 * these interrupts.

	 *

	 * So, let's structure the code so that the window is as small as

	 * possible.

	 */

	u = ~(1 << (pin & 31));

	writel(u, PMU_INTERRUPT_CAUSE);

	u &= readl_relaxed(PMU_INTERRUPT_CAUSE);

	writel_relaxed(u, PMU_INTERRUPT_CAUSE);

}



static struct irq_chip pmu_irq_chip = {