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

Commit 42578c82 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel 

Conflicts:
	arch/arm/Kconfig
	arch/arm/kernel/smp.c
	arch/arm/mach-realview/Makefile
	arch/arm/mach-realview/platsmp.c
parents 2631182b 85d6943a

arch/arm/Kconfig

+5 −3
Original line number Diff line number Diff line
@@ -849,7 +849,8 @@ source "kernel/time/Kconfig" 


config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP ||ARCH_OMAP4)

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4)
@@ -920,7 +921,8 @@ config HOTPLUG_CPU 


config LOCAL_TIMERS

	bool "Use local timer interrupts"

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP || ARCH_OMAP4)

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4)

	default y

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4)

	help
@@ -1031,7 +1033,7 @@ config LEDS 
		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91 || ARCH_DAVINCI || \

		   ARCH_KS8695 || MACH_RD88F5182

		   ARCH_KS8695 || MACH_RD88F5182 || ARCH_REALVIEW

	help

	  If you say Y here, the LEDs on your machine will be used

	  to provide useful information about your current system status.

arch/arm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
# Copyright (C) 1995-2001 by Russell King



LDFLAGS_vmlinux	:=-p --no-undefined -X

ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux	+= --be8

endif

CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)

OBJCOPYFLAGS	:=-O binary -R .note -R .note.gnu.build-id -R .comment -S

GZFLAGS		:=-9

arch/arm/boot/compressed/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ ifeq ($(CONFIG_PXA_SHARPSL),y) 
OBJS		+= head-sharpsl.o

endif



ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)

ifeq ($(CONFIG_CPU_ENDIAN_BE32),y)

ifeq ($(CONFIG_CPU_CP15),y)

OBJS		+= big-endian.o

else
@@ -78,6 +78,9 @@ EXTRA_AFLAGS := -Wa,-march=all 
# linker symbols.  We only define initrd_phys and params_phys if the

# machine class defined the corresponding makefile variable.

LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR)

ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux += --be8

endif

ifneq ($(INITRD_PHYS),)

LDFLAGS_vmlinux += --defsym initrd_phys=$(INITRD_PHYS)

endif

arch/arm/boot/compressed/head.S

+6 −0
Original line number Diff line number Diff line
@@ -438,6 +438,9 @@ __armv4_mmu_cache_on: 
		mrc	p15, 0, r0, c1, c0, 0	@ read control reg

		orr	r0, r0, #0x5000		@ I-cache enable, RR cache replacement

		orr	r0, r0, #0x0030

#ifdef CONFIG_CPU_ENDIAN_BE8

		orr	r0, r0, #1 << 25	@ big-endian page tables

#endif

		bl	__common_mmu_cache_on

		mov	r0, #0

		mcr	p15, 0, r0, c8, c7, 0	@ flush I,D TLBs
@@ -455,6 +458,9 @@ __armv7_mmu_cache_on: 
		mrc	p15, 0, r0, c1, c0, 0	@ read control reg

		orr	r0, r0, #0x5000		@ I-cache enable, RR cache replacement

		orr	r0, r0, #0x003c		@ write buffer

#ifdef CONFIG_CPU_ENDIAN_BE8

		orr	r0, r0, #1 << 25	@ big-endian page tables

#endif

		orrne	r0, r0, #1		@ MMU enabled

		movne	r1, #-1

		mcrne	p15, 0, r3, c2, c0, 0	@ load page table pointer

arch/arm/include/asm/cputype.h

+25 −0
Original line number Diff line number Diff line
@@ -8,6 +8,21 @@ 
#define CPUID_TCM	2

#define CPUID_TLBTYPE	3



#define CPUID_EXT_PFR0	"c1, 0"

#define CPUID_EXT_PFR1	"c1, 1"

#define CPUID_EXT_DFR0	"c1, 2"

#define CPUID_EXT_AFR0	"c1, 3"

#define CPUID_EXT_MMFR0	"c1, 4"

#define CPUID_EXT_MMFR1	"c1, 5"

#define CPUID_EXT_MMFR2	"c1, 6"

#define CPUID_EXT_MMFR3	"c1, 7"

#define CPUID_EXT_ISAR0	"c2, 0"

#define CPUID_EXT_ISAR1	"c2, 1"

#define CPUID_EXT_ISAR2	"c2, 2"

#define CPUID_EXT_ISAR3	"c2, 3"

#define CPUID_EXT_ISAR4	"c2, 4"

#define CPUID_EXT_ISAR5	"c2, 5"



#ifdef CONFIG_CPU_CP15

#define read_cpuid(reg)							\

	({								\
@@ -18,9 +33,19 @@ 
		    : "cc");						\

		__val;							\

	})

#define read_cpuid_ext(ext_reg)						\

	({								\

		unsigned int __val;					\

		asm("mrc	p15, 0, %0, c0, " ext_reg		\

		    : "=r" (__val)					\

		    :							\

		    : "cc");						\

		__val;							\

	})

#else

extern unsigned int processor_id;

#define read_cpuid(reg) (processor_id)

#define read_cpuid_ext(reg) 0

#endif



/*