Skip to content

Commit 6700215

Browse files
torvaldstorvalds
committed
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
2 parents 9bf12df + 8872366 commit 6700215

File tree

11 files changed

+324
-353
lines changed

11 files changed

+324
-353
lines changed

‎arch/xtensa/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ ifneq ($(CONFIG_LD_NO_RELAX),)
5555
LDFLAGS := --no-relax
5656
endif
5757

58-
ifeq ($(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#"),1)
58+
ifeq ($(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#"),1)
5959
CHECKFLAGS += -D__XTENSA_EB__
6060
endif
61-
ifeq ($(shell echo -e __XTENSA_EL__ | $(CC) -E - | grep -v "\#"),1)
61+
ifeq ($(shell echo __XTENSA_EL__ | $(CC) -E - | grep -v "\#"),1)
6262
CHECKFLAGS += -D__XTENSA_EL__
6363
endif
6464

‎arch/xtensa/boot/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
KBUILD_CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include
1313
HOSTFLAGS += -Iarch/$(ARCH)/boot/include
1414

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

1717
export ccflags-y
1818
export BIG_ENDIAN

‎arch/xtensa/include/asm/regs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
#define PS_CALLINC_SHIFT 16
8383
#define PS_CALLINC_MASK 0x00030000
8484
#define PS_OWB_SHIFT 8
85+
#define PS_OWB_WIDTH 4
8586
#define PS_OWB_MASK 0x00000F00
8687
#define PS_RING_SHIFT 6
8788
#define PS_RING_MASK 0x000000C0

‎arch/xtensa/include/asm/timex.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,7 @@
3535
# error "Bad timer number for Linux configurations!"
3636
#endif
3737

38-
#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
3938
extern unsigned long ccount_freq;
40-
#define CCOUNT_PER_JIFFY (ccount_freq / HZ)
41-
#else
42-
#define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))
43-
#endif
44-
4539

4640
typedef unsigned long long cycles_t;
4741

‎arch/xtensa/kernel/align.S

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@
146146
* a0: trashed, original value saved on stack (PT_AREG0)
147147
* a1: a1
148148
* a2: new stack pointer, original in DEPC
149-
* a3: dispatch table
149+
* a3: a3
150150
* depc: a2, original value saved on stack (PT_DEPC)
151-
* excsave_1: a3
151+
* excsave_1: dispatch table
152152
*
153153
* PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
154154
* < VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -171,7 +171,6 @@ ENTRY(fast_unaligned)
171171
s32i a8, a2, PT_AREG8
172172

173173
rsr a0, depc
174-
xsr a3, excsave1
175174
s32i a0, a2, PT_AREG2
176175
s32i a3, a2, PT_AREG3
177176

‎arch/xtensa/kernel/coprocessor.S

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
* a0: trashed, original value saved on stack (PT_AREG0)
3333
* a1: a1
3434
* a2: new stack pointer, original in DEPC
35-
* a3: dispatch table
35+
* a3: a3
3636
* depc: a2, original value saved on stack (PT_DEPC)
37-
* excsave_1: a3
37+
* excsave_1: dispatch table
3838
*
3939
* PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
4040
* < VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -225,9 +225,9 @@ ENDPROC(coprocessor_restore)
225225
* a0: trashed, original value saved on stack (PT_AREG0)
226226
* a1: a1
227227
* a2: new stack pointer, original in DEPC
228-
* a3: dispatch table
228+
* a3: a3
229229
* depc: a2, original value saved on stack (PT_DEPC)
230-
* excsave_1: a3
230+
* excsave_1: dispatch table
231231
*
232232
* PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
233233
* < VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -245,7 +245,6 @@ ENTRY(fast_coprocessor)
245245

246246
/* Save remaining registers a1-a3 and SAR */
247247

248-
xsr a3, excsave1
249248
s32i a3, a2, PT_AREG3
250249
rsr a3, sar
251250
s32i a1, a2, PT_AREG1

0 commit comments

Comments
 (0)