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

Commit 9144f382 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] xsc3: fix xsc3_l2_inv_range
  [ARM] mm: fix page table initialization
  [ARM] fix naming of MODULE_START / MODULE_END
  ARM: OMAP: Fix define for twl4030 irqs
  ARM: OMAP: Fix get_irqnr_and_base to clear spurious interrupt bits
  ARM: OMAP: Fix debugfs_create_*'s error checking method for arm/plat-omap
  ARM: OMAP: Fix compiler warnings in gpmc.c
  [ARM] fix VFP+softfloat binaries
parents 6572a281 6597cb84

arch/arm/include/asm/memory.h

+6 −6
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ 
 * The module space lives between the addresses given by TASK_SIZE

 * and PAGE_OFFSET - it must be within 32MB of the kernel text.

 */

#define MODULE_END		(PAGE_OFFSET)

#define MODULE_START		(MODULE_END - 16*1048576)

#define MODULES_END		(PAGE_OFFSET)

#define MODULES_VADDR		(MODULES_END - 16*1048576)



#if TASK_SIZE > MODULE_START

#if TASK_SIZE > MODULES_VADDR

#error Top of user space clashes with start of module space

#endif
@@ -56,7 +56,7 @@ 
 * Since we use sections to map it, this macro replaces the physical address

 * with its virtual address while keeping offset from the base section.

 */

#define XIP_VIRT_ADDR(physaddr)  (MODULE_START + ((physaddr) & 0x000fffff))

#define XIP_VIRT_ADDR(physaddr)  (MODULES_VADDR + ((physaddr) & 0x000fffff))



/*

 * Allow 16MB-aligned ioremap pages
@@ -94,8 +94,8 @@ 
/*

 * The module can be at any place in ram in nommu mode.

 */

#define MODULE_END		(END_MEM)

#define MODULE_START		(PHYS_OFFSET)

#define MODULES_END		(END_MEM)

#define MODULES_VADDR		(PHYS_OFFSET)



#endif /* !CONFIG_MMU */

arch/arm/include/asm/system.h

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ 
#define CR_U	(1 << 22)	/* Unaligned access operation		*/

#define CR_XP	(1 << 23)	/* Extended page tables			*/

#define CR_VE	(1 << 24)	/* Vectored interrupts			*/

#define CR_EE	(1 << 25)	/* Exception (Big) Endian		*/

#define CR_TRE	(1 << 28)	/* TEX remap enable			*/

#define CR_AFE	(1 << 29)	/* Access flag enable			*/

#define CR_TE	(1 << 30)	/* Thumb exception enable		*/



/*

 * This is used to ensure the compiler did actually allocate the register we

arch/arm/kernel/elf.c

+5 −1
Original line number Diff line number Diff line
@@ -21,12 +21,16 @@ int elf_check_arch(const struct elf32_hdr *x) 


	eflags = x->e_flags;

	if ((eflags & EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN) {

		unsigned int flt_fmt;



		/* APCS26 is only allowed if the CPU supports it */

		if ((eflags & EF_ARM_APCS_26) && !(elf_hwcap & HWCAP_26BIT))

			return 0;



		flt_fmt = eflags & (EF_ARM_VFP_FLOAT | EF_ARM_SOFT_FLOAT);



		/* VFP requires the supporting code */

		if ((eflags & EF_ARM_VFP_FLOAT) && !(elf_hwcap & HWCAP_VFP))

		if (flt_fmt == EF_ARM_VFP_FLOAT && !(elf_hwcap & HWCAP_VFP))

			return 0;

	}

	return 1;

arch/arm/kernel/module.c

+4 −4
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ 
/*

 * The XIP kernel text is mapped in the module area for modules and

 * some other stuff to work without any indirect relocations.

 * MODULE_START is redefined here and not in asm/memory.h to avoid

 * MODULES_VADDR is redefined here and not in asm/memory.h to avoid

 * recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off.

 */

extern void _etext;

#undef MODULE_START

#define MODULE_START	(((unsigned long)&_etext + ~PGDIR_MASK) & PGDIR_MASK)

#undef MODULES_VADDR

#define MODULES_VADDR	(((unsigned long)&_etext + ~PGDIR_MASK) & PGDIR_MASK)

#endif



#ifdef CONFIG_MMU
@@ -43,7 +43,7 @@ void *module_alloc(unsigned long size) 
	if (!size)

		return NULL;



	area = __get_vm_area(size, VM_ALLOC, MODULE_START, MODULE_END);

	area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);

	if (!area)

		return NULL;

arch/arm/mach-omap2/gpmc.c

+2 −4
Original line number Diff line number Diff line
@@ -429,18 +429,16 @@ void __init gpmc_init(void) 
	gpmc_l3_clk = clk_get(NULL, ck);

	if (IS_ERR(gpmc_l3_clk)) {

		printk(KERN_ERR "Could not get GPMC clock %s\n", ck);

		return -ENODEV;

		BUG();

	}



	gpmc_base = ioremap(l, SZ_4K);

	if (!gpmc_base) {

		clk_put(gpmc_l3_clk);

		printk(KERN_ERR "Could not get GPMC register memory\n");

		return -ENOMEM;

		BUG();

	}



	BUG_ON(IS_ERR(gpmc_l3_clk));



	l = gpmc_read_reg(GPMC_REVISION);

	printk(KERN_INFO "GPMC revision %d.%d\n", (l >> 4) & 0x0f, l & 0x0f);

	/* Set smart idle mode and automatic L3 clock gating */