Commit c688f14c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull core fixes from Ingo Molnar:
 "A couple of sched.h splitup related build fixes, plus an objtool fix"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix another GCC jump table detection issue
  drivers/char/nwbutton: Fix build breakage caused by include file reshuffling
  h8300: Fix build breakage caused by header file changes
  avr32: Fix build error caused by include file reshuffling
parents 9e91c144 5c51f4ae

arch/avr32/oprofile/backtrace.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 */



#include <linux/oprofile.h>

#include <linux/sched.h>

#include <linux/ptrace.h>

#include <linux/uaccess.h>



/* The first two words of each frame on the stack look like this if we have

arch/h8300/kernel/ptrace_h.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



#include <linux/linkage.h>

#include <linux/sched.h>

#include <linux/sched/signal.h>

#include <asm/ptrace.h>



#define BREAKINST 0x5730 /* trapa #3 */

drivers/char/nwbutton.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/sched/signal.h>

#include <linux/interrupt.h>

#include <linux/time.h>

#include <linux/timer.h>

tools/objtool/builtin-check.c

+12 −3
Original line number Diff line number Diff line
@@ -805,11 +805,20 @@ static struct rela *find_switch_table(struct objtool_file *file, 
		     insn->jump_dest->offset > orig_insn->offset))

		    break;



		/* look for a relocation which references .rodata */

		text_rela = find_rela_by_dest_range(insn->sec, insn->offset,

						    insn->len);

		if (text_rela && text_rela->sym == file->rodata->sym)

			return find_rela_by_dest(file->rodata,

						 text_rela->addend);

		if (!text_rela || text_rela->sym != file->rodata->sym)

			continue;



		/*

		 * Make sure the .rodata address isn't associated with a

		 * symbol.  gcc jump tables are anonymous data.

		 */

		if (find_symbol_containing(file->rodata, text_rela->addend))

			continue;



		return find_rela_by_dest(file->rodata, text_rela->addend);

	}



	return NULL;

tools/objtool/elf.c

+12 −0
Original line number Diff line number Diff line
@@ -85,6 +85,18 @@ struct symbol *find_symbol_by_offset(struct section *sec, unsigned long offset) 
	return NULL;

}



struct symbol *find_symbol_containing(struct section *sec, unsigned long offset)

{

	struct symbol *sym;



	list_for_each_entry(sym, &sec->symbol_list, list)

		if (sym->type != STT_SECTION &&

		    offset >= sym->offset && offset < sym->offset + sym->len)

			return sym;



	return NULL;

}



struct rela *find_rela_by_dest_range(struct section *sec, unsigned long offset,

				     unsigned int len)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE