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

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4017/1: [Jornada7xx] - Updating Jornada720.c
  [ARM] 3992/1: i.MX/MX1 CPU Frequency scaling support
  [ARM] Provide a method to alter the control register
  [ARM] 4016/1: prefetch macro is wrong wrt gcc's "delete-null-pointer-checks"
  [ARM] Remove empty fixup function
  [ARM] 4014/1: include drivers/hid/Kconfig
  [ARM] 4013/1: clocksource driver for netx
  [ARM] 4012/1: Clocksource for pxa
  [ARM] Clean up ioremap code
  [ARM] Unuse another Linux PTE bit
  [ARM] Clean up KERNEL_RAM_ADDR
  [ARM] Add sys_*at syscalls
  [ARM] 4004/1: S3C24XX: UDC remove implict addition of VA to regs
  [ARM] Formalise the ARMv6 processor name string
  [ARM] Handle HWCAP_VFP in VFP support code
  [ARM] 4011/1: AT91SAM9260: Fix compilation with NAND driver
  [ARM] 4010/1: AT91SAM9260-EK board: Prepare for MACB Ethernet support
parents 8eefb2b7 e9ccb799

arch/arm/Kconfig

+12 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ config XIP_PHYS_ADDR 


endmenu



if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP)

if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )



menu "CPU Frequency scaling"
@@ -767,6 +767,15 @@ config CPU_FREQ_INTEGRATOR 


	  If in doubt, say Y.



config CPU_FREQ_IMX

	tristate "CPUfreq driver for i.MX CPUs"

	depends on ARCH_IMX && CPU_FREQ

	default n

	help

	  This enables the CPUfreq driver for i.MX CPUs.



	  If in doubt, say N.



endmenu



endif
@@ -945,6 +954,8 @@ source "drivers/video/Kconfig" 


source "sound/Kconfig"



source "drivers/hid/Kconfig"



source "drivers/usb/Kconfig"



source "drivers/mmc/Kconfig"

arch/arm/kernel/calls.S

+13 −0
Original line number Diff line number Diff line
@@ -331,6 +331,19 @@ 
		CALL(sys_mbind)

/* 320 */	CALL(sys_get_mempolicy)

		CALL(sys_set_mempolicy)

		CALL(sys_openat)

		CALL(sys_mkdirat)

		CALL(sys_mknodat)

/* 325 */	CALL(sys_fchownat)

		CALL(sys_futimesat)

		CALL(sys_fstatat64)

		CALL(sys_unlinkat)

		CALL(sys_renameat)

/* 330 */	CALL(sys_linkat)

		CALL(sys_symlinkat)

		CALL(sys_readlinkat)

		CALL(sys_fchmodat)

		CALL(sys_faccessat)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted

arch/arm/kernel/head.S

+10 −9
Original line number Diff line number Diff line
@@ -22,30 +22,31 @@ 
#include <asm/thread_info.h>

#include <asm/system.h>



#define KERNEL_RAM_ADDR	(PAGE_OFFSET + TEXT_OFFSET)

#define KERNEL_RAM_VADDR	(PAGE_OFFSET + TEXT_OFFSET)

#define KERNEL_RAM_PADDR	(PHYS_OFFSET + TEXT_OFFSET)



/*

 * swapper_pg_dir is the virtual address of the initial page table.

 * We place the page tables 16K below KERNEL_RAM_ADDR.  Therefore, we must

 * make sure that KERNEL_RAM_ADDR is correctly set.  Currently, we expect

 * We place the page tables 16K below KERNEL_RAM_VADDR.  Therefore, we must

 * make sure that KERNEL_RAM_VADDR is correctly set.  Currently, we expect

 * the least significant 16 bits to be 0x8000, but we could probably

 * relax this restriction to KERNEL_RAM_ADDR >= PAGE_OFFSET + 0x4000.

 * relax this restriction to KERNEL_RAM_VADDR >= PAGE_OFFSET + 0x4000.

 */

#if (KERNEL_RAM_ADDR & 0xffff) != 0x8000

#error KERNEL_RAM_ADDR must start at 0xXXXX8000

#if (KERNEL_RAM_VADDR & 0xffff) != 0x8000

#error KERNEL_RAM_VADDR must start at 0xXXXX8000

#endif



	.globl	swapper_pg_dir

	.equ	swapper_pg_dir, KERNEL_RAM_ADDR - 0x4000

	.equ	swapper_pg_dir, KERNEL_RAM_VADDR - 0x4000



	.macro	pgtbl, rd

	ldr	\rd, =(__virt_to_phys(KERNEL_RAM_ADDR - 0x4000))

	ldr	\rd, =(KERNEL_RAM_PADDR - 0x4000)

	.endm



#ifdef CONFIG_XIP_KERNEL

#define TEXTADDR  XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)

#else

#define TEXTADDR  KERNEL_RAM_ADDR

#define TEXTADDR  KERNEL_RAM_VADDR

#endif



/*

arch/arm/kernel/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -354,9 +354,6 @@ static void __init setup_processor(void) 
#ifndef CONFIG_ARM_THUMB

	elf_hwcap &= ~HWCAP_THUMB;

#endif

#ifndef CONFIG_VFP

	elf_hwcap &= ~HWCAP_VFP;

#endif



	cpu_proc_init();

}

arch/arm/mach-at91rm9200/at91sam9260_devices.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/arch/gpio.h>

#include <asm/arch/at91sam9260.h>

#include <asm/arch/at91sam926x_mc.h>

#include <asm/arch/at91sam9260_matrix.h>



#include "generic.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE