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

Commit 6253195b authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/stable-updates' 

Conflicts:
	arch/sh/kernel/dwarf.c
parents 15893fb5 60339fad

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -418,6 +418,14 @@ When: 2.6.33 
Why:	Should be implemented in userspace, policy daemon.

Who:	Johannes Berg <johannes@sipsolutions.net>



---------------------------



What:	CONFIG_INOTIFY

When:	2.6.33

Why:	last user (audit) will be converted to the newer more generic

	and more easily maintained fsnotify subsystem

Who:	Eric Paris <eparis@redhat.com>



----------------------------



What:	lock_policy_rwsem_* and unlock_policy_rwsem_* will not be

Documentation/lguest/lguest.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <signal.h>

#include "linux/lguest_launcher.h"

#include "linux/virtio_config.h"

#include <linux/virtio_ids.h>

#include "linux/virtio_net.h"

#include "linux/virtio_blk.h"

#include "linux/virtio_console.h"

arch/sh/kernel/dwarf.c

+22 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/mempool.h>

#include <linux/mm.h>

#include <linux/elf.h>

#include <linux/ftrace.h>

#include <asm/dwarf.h>

#include <asm/unwinder.h>

#include <asm/sections.h>
@@ -569,6 +570,27 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc, 
	if (!pc && !prev)

		pc = (unsigned long)current_text_addr();



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	/*

	 * If our stack has been patched by the function graph tracer

	 * then we might see the address of return_to_handler() where we

	 * expected to find the real return address.

	 */

	if (pc == (unsigned long)&return_to_handler) {

		int index = current->curr_ret_stack;



		/*

		 * We currently have no way of tracking how many

		 * return_to_handler()'s we've seen. If there is more

		 * than one patched return address on our stack,

		 * complain loudly.

		 */

		WARN_ON(index > 0);



		pc = current->ret_stack[index].ret;

	}

#endif



	frame = mempool_alloc(dwarf_frame_pool, GFP_ATOMIC);

	if (!frame) {

		printk(KERN_ERR "Unable to allocate a dwarf frame\n");

arch/sh/kernel/irq.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/module.h>

#include <linux/kernel_stat.h>

#include <linux/seq_file.h>

#include <linux/ftrace.h>

#include <asm/processor.h>

#include <asm/machvec.h>

#include <asm/uaccess.h>
@@ -114,7 +115,7 @@ static union irq_ctx *hardirq_ctx[NR_CPUS] __read_mostly; 
static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly;

#endif



asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs)

asmlinkage __irq_entry int do_IRQ(unsigned int irq, struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);

#ifdef CONFIG_IRQSTACKS

arch/sh/kernel/sh_ksyms_32.c

+14 −0
Original line number Diff line number Diff line
@@ -85,6 +85,20 @@ DECLARE_EXPORT(__movstr_i4_even); 
DECLARE_EXPORT(__movstr_i4_odd);

DECLARE_EXPORT(__movstrSI12_i4);

DECLARE_EXPORT(__movmem);

DECLARE_EXPORT(__movmemSI8);

DECLARE_EXPORT(__movmemSI12);

DECLARE_EXPORT(__movmemSI16);

DECLARE_EXPORT(__movmemSI20);

DECLARE_EXPORT(__movmemSI24);

DECLARE_EXPORT(__movmemSI28);

DECLARE_EXPORT(__movmemSI32);

DECLARE_EXPORT(__movmemSI36);

DECLARE_EXPORT(__movmemSI40);

DECLARE_EXPORT(__movmemSI44);

DECLARE_EXPORT(__movmemSI48);

DECLARE_EXPORT(__movmemSI52);

DECLARE_EXPORT(__movmemSI56);

DECLARE_EXPORT(__movmemSI60);

DECLARE_EXPORT(__movmem_i4_even);

DECLARE_EXPORT(__movmem_i4_odd);

DECLARE_EXPORT(__movmemSI12_i4);