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

Commit c529b7e2 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] prevent ia64 from invoking irq handlers on offline CPUs
  [IA64] arch/ia64/sn/pci/tioca_provider.c: introduce missing kfree
  [IA64] fix up bte.h
  [IA64] fix compile failure with non modular builds
parents e2858ce3 e7b14036

arch/ia64/include/asm/elf.h

+15 −0
Original line number Diff line number Diff line
@@ -266,4 +266,19 @@ do { \ 
	}								\

} while (0)



/*

 * format for entries in the Global Offset Table

 */

struct got_entry {

	uint64_t val;

};



/*

 * Layout of the Function Descriptor

 */

struct fdesc {

	uint64_t ip;

	uint64_t gp;

};



#endif /* _ASM_IA64_ELF_H */

arch/ia64/include/asm/sections.h

+12 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 *	David Mosberger-Tang <davidm@hpl.hp.com>

 */



#include <linux/elf.h>

#include <linux/uaccess.h>

#include <asm-generic/sections.h>



extern char __per_cpu_start[], __per_cpu_end[], __phys_per_cpu_start[];
@@ -22,7 +24,16 @@ extern char __start_unwind[], __end_unwind[]; 
extern char __start_ivt_text[], __end_ivt_text[];



#undef dereference_function_descriptor

void *dereference_function_descriptor(void *);

static inline void *dereference_function_descriptor(void *ptr)

{

	struct fdesc *desc = ptr;

	void *p;



	if (!probe_kernel_address(&desc->ip, p))

		ptr = p;

	return ptr;

}





#endif /* _ASM_IA64_SECTIONS_H */

arch/ia64/include/asm/sn/bte.h

+5 −4
Original line number Diff line number Diff line
@@ -224,8 +224,9 @@ extern void bte_error_handler(unsigned long); 
 * version of bte_copy, you must perform this check yourself.

 */

#define BTE_UNALIGNED_COPY(src, dest, len, mode)			\

	(((len & L1_CACHE_MASK) || (src & L1_CACHE_MASK) ||             \

	  (dest & L1_CACHE_MASK)) ?                                     \

	(((len & (L1_CACHE_BYTES - 1)) ||				\

	  (src & (L1_CACHE_BYTES - 1)) ||				\

	  (dest & (L1_CACHE_BYTES - 1))) ?				\

	 bte_unaligned_copy(src, dest, len, mode) :			\

	 bte_copy(src, dest, len, mode, NULL))

arch/ia64/kernel/module.c

+0 −21
Original line number Diff line number Diff line
@@ -31,11 +31,9 @@ 
#include <linux/elf.h>

#include <linux/moduleloader.h>

#include <linux/string.h>

#include <linux/uaccess.h>

#include <linux/vmalloc.h>



#include <asm/patch.h>

#include <asm/sections.h>

#include <asm/unaligned.h>



#define ARCH_MODULE_DEBUG 0
@@ -137,15 +135,6 @@ static const char *reloc_name[256] = { 


#undef N



struct got_entry {

	uint64_t val;

};



struct fdesc {

	uint64_t ip;

	uint64_t gp;

};



/* Opaque struct for insns, to protect against derefs. */

struct insn;
@@ -943,13 +932,3 @@ module_arch_cleanup (struct module *mod) 
	if (mod->arch.core_unw_table)

		unw_remove_unwind_table(mod->arch.core_unw_table);

}
 


void *dereference_function_descriptor(void *ptr)

{

	struct fdesc *desc = ptr;

	void *p;



	if (!probe_kernel_address(&desc->ip, p))

		ptr = p;

	return ptr;

}

arch/ia64/kernel/smpboot.c

+1 −3
Original line number Diff line number Diff line
@@ -741,16 +741,14 @@ int __cpu_disable(void) 
			return -EBUSY;

	}



	cpu_clear(cpu, cpu_online_map);



	if (migrate_platform_irqs(cpu)) {

		cpu_set(cpu, cpu_online_map);

		return (-EBUSY);

	}



	remove_siblinginfo(cpu);

	cpu_clear(cpu, cpu_online_map);

	fixup_irqs();

	cpu_clear(cpu, cpu_online_map);

	local_flush_tlb_all();

	cpu_clear(cpu, cpu_callin_map);

	return 0;