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

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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] __per_cpu_idtrs[] is a memory hog
  [IA64] sanity in #include files.  Move fnptr to types.h
  [IA64] use helpers for rlimits
  [IA64] cpumask_of_node() should handle -1 as a node
parents 2c1f1895 6c57a332

arch/ia64/include/asm/ftrace.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,6 @@ 
extern void _mcount(unsigned long pfs, unsigned long r1, unsigned long b0, unsigned long r0);

extern void _mcount(unsigned long pfs, unsigned long r1, unsigned long b0, unsigned long r0);

#define mcount _mcount

#define mcount _mcount





#include <asm/kprobes.h>

/* In IA64, MCOUNT_ADDR is set in link time, so it's not a constant at compile time */

/* In IA64, MCOUNT_ADDR is set in link time, so it's not a constant at compile time */

#define MCOUNT_ADDR (((struct fnptr *)mcount)->ip)

#define MCOUNT_ADDR (((struct fnptr *)mcount)->ip)

#define FTRACE_ADDR (((struct fnptr *)ftrace_caller)->ip)

#define FTRACE_ADDR (((struct fnptr *)ftrace_caller)->ip)

arch/ia64/include/asm/kprobes.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -103,11 +103,6 @@ typedef struct kprobe_opcode { 
	bundle_t bundle;

	bundle_t bundle;

} kprobe_opcode_t;

} kprobe_opcode_t;





struct fnptr {

	unsigned long ip;

	unsigned long gp;

};



/* Architecture specific copy of original instruction*/

/* Architecture specific copy of original instruction*/

struct arch_specific_insn {

struct arch_specific_insn {

	/* copy of the instruction to be emulated */

	/* copy of the instruction to be emulated */

arch/ia64/include/asm/tlb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ struct ia64_tr_entry { 
extern int ia64_itr_entry(u64 target_mask, u64 va, u64 pte, u64 log_size);

extern int ia64_itr_entry(u64 target_mask, u64 va, u64 pte, u64 log_size);

extern void ia64_ptr_entry(u64 target_mask, int slot);

extern void ia64_ptr_entry(u64 target_mask, int slot);





extern struct ia64_tr_entry __per_cpu_idtrs[NR_CPUS][2][IA64_TR_ALLOC_MAX];

extern struct ia64_tr_entry *ia64_idtrs[NR_CPUS];





/*

/*

 region register macros

 region register macros

arch/ia64/include/asm/topology.h

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

/*

 * Returns a bitmask of CPUs on Node 'node'.

 * Returns a bitmask of CPUs on Node 'node'.

 */

 */

#define cpumask_of_node(node) (&node_to_cpu_mask[node])

#define cpumask_of_node(node) ((node) == -1 ?				\

			       cpu_all_mask :				\

			       &node_to_cpu_mask[node])





/*

/*

 * Returns the number of the node containing Node 'nid'.

 * Returns the number of the node containing Node 'nid'.

arch/ia64/include/asm/types.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,11 @@ 




typedef unsigned int umode_t;

typedef unsigned int umode_t;





struct fnptr {

	unsigned long ip;

	unsigned long gp;

};



/*

/*

 * These aren't exported outside the kernel to avoid name space clashes

 * These aren't exported outside the kernel to avoid name space clashes

 */

 */