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

Merge tag 'xtensa-next-20130912' of git://github.com/czankel/xtensa-linux 

Pull Xtensa updates from Chris Zankel.

* tag 'xtensa-next-20130912' of git://github.com/czankel/xtensa-linux:
  xtensa: Fix broken allmodconfig build
  xtensa: remove CCOUNT_PER_JIFFY
  xtensa: fix !CONFIG_XTENSA_CALIBRATE_CCOUNT build failure
  xtensa: don't use echo -e needlessly
  xtensa: new fast_alloca handler
  xtensa: keep a3 and excsave1 on entry to exception handlers
  xtensa: enable kernel preemption
  xtensa: check thread flags atomically on return from user exception
parents 9bf12df3 8872366d

arch/xtensa/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ ifneq ($(CONFIG_LD_NO_RELAX),) 
LDFLAGS := --no-relax

endif



ifeq ($(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#"),1)

ifeq ($(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#"),1)

CHECKFLAGS += -D__XTENSA_EB__

endif

ifeq ($(shell echo -e __XTENSA_EL__ | $(CC) -E - | grep -v "\#"),1)

ifeq ($(shell echo __XTENSA_EL__ | $(CC) -E - | grep -v "\#"),1)

CHECKFLAGS += -D__XTENSA_EL__

endif

arch/xtensa/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
KBUILD_CFLAGS	+= -fno-builtin -Iarch/$(ARCH)/boot/include

HOSTFLAGS	+= -Iarch/$(ARCH)/boot/include



BIG_ENDIAN	:= $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#")

BIG_ENDIAN	:= $(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#")



export ccflags-y

export BIG_ENDIAN

arch/xtensa/include/asm/regs.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
#define PS_CALLINC_SHIFT	16

#define PS_CALLINC_MASK		0x00030000

#define PS_OWB_SHIFT		8

#define PS_OWB_WIDTH		4

#define PS_OWB_MASK		0x00000F00

#define PS_RING_SHIFT		6

#define PS_RING_MASK		0x000000C0

arch/xtensa/include/asm/timex.h

+0 −6
Original line number Diff line number Diff line
@@ -35,13 +35,7 @@ 
# error "Bad timer number for Linux configurations!"

#endif



#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT

extern unsigned long ccount_freq;

#define CCOUNT_PER_JIFFY (ccount_freq / HZ)

#else

#define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))

#endif





typedef unsigned long long cycles_t;

arch/xtensa/kernel/align.S

+2 −3
Original line number Diff line number Diff line
@@ -146,9 +146,9 @@ 
 *   a0:	trashed, original value saved on stack (PT_AREG0)

 *   a1:	a1

 *   a2:	new stack pointer, original in DEPC

 *   a3:	dispatch table

 *   a3:	a3

 *   depc:	a2, original value saved on stack (PT_DEPC)

 *   excsave_1:	a3

 *   excsave_1:	dispatch table

 *

 *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC

 *	     <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -171,7 +171,6 @@ ENTRY(fast_unaligned) 
	s32i	a8, a2, PT_AREG8



	rsr	a0, depc

	xsr	a3, excsave1

	s32i	a0, a2, PT_AREG2

	s32i	a3, a2, PT_AREG3

CRA Git | Maintained and supported by SUSTech CRA and CCSE