Skip to content

Commit 17dbe27

Browse files
torvaldstorvalds
committed
Merge tag 'xtensa-next-20121018' of git://github.com/czankel/xtensa-linux
Pull Xtensa patchset from Chris Zankel: "These are all limited to the xtensa subtree and include some important changes (adding long missing system calls for newer libc versions and other fixes) and the UAPI changes" * tag 'xtensa-next-20121018' of git://github.com/czankel/xtensa-linux: xtensa: add missing system calls to the syscall table xtensa: minor compiler warning fix xtensa: Use Kbuild infrastructure to handle asm-generic headers UAPI: (Scripted) Disintegrate arch/xtensa/include/asm xtensa: fix unaligned usermode access xtensa: reorganize SR referencing xtensa: fix boot parameters parsing xtensa: fix missing return in do_page_fault for SIGBUS case xtensa: copy_thread with CLONE_VM must not copy live parent AR windows xtensa: fix memmove(), bcopy(), and memcpy(). xtensa: ISS: fix rs_put_char xtensa: ISS: fix specific simcalls
2 parents b05e585 + 7216cab commit 17dbe27

82 files changed

Lines changed: 1677 additions & 1620 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/xtensa/boot/boot-redboot/bootstrap.S‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ _start:
5151
/* 'reset' window registers */
5252

5353
movi a4, 1
54-
wsr a4, PS
54+
wsr a4, ps
5555
rsync
5656

57-
rsr a5, WINDOWBASE
57+
rsr a5, windowbase
5858
ssl a5
5959
sll a4, a4
60-
wsr a4, WINDOWSTART
60+
wsr a4, windowstart
6161
rsync
6262

6363
movi a4, 0x00040000
64-
wsr a4, PS
64+
wsr a4, ps
6565
rsync
6666

6767
/* copy the loader to its address

‎arch/xtensa/include/asm/Kbuild‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
1-
include include/asm-generic/Kbuild.asm
2-
1+
generic-y += bitsperlong.h
2+
generic-y += bug.h
33
generic-y += clkdev.h
4+
generic-y += cputime.h
5+
generic-y += device.h
6+
generic-y += div64.h
7+
generic-y += emergency-restart.h
8+
generic-y += errno.h
49
generic-y += exec.h
10+
generic-y += fcntl.h
11+
generic-y += futex.h
12+
generic-y += hardirq.h
13+
generic-y += ioctl.h
14+
generic-y += irq_regs.h
15+
generic-y += kdebug.h
16+
generic-y += kmap_types.h
17+
generic-y += kvm_para.h
18+
generic-y += local.h
19+
generic-y += local64.h
20+
generic-y += percpu.h
21+
generic-y += resource.h
22+
generic-y += scatterlist.h
23+
generic-y += sections.h
24+
generic-y += siginfo.h
25+
generic-y += statfs.h
26+
generic-y += termios.h
27+
generic-y += topology.h
28+
generic-y += xor.h

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static inline void atomic_add(int i, atomic_t * v)
7373
"l32i %0, %2, 0 \n\t"
7474
"add %0, %0, %1 \n\t"
7575
"s32i %0, %2, 0 \n\t"
76-
"wsr a15, "__stringify(PS)" \n\t"
76+
"wsr a15, ps \n\t"
7777
"rsync \n"
7878
: "=&a" (vval)
7979
: "a" (i), "a" (v)
@@ -97,7 +97,7 @@ static inline void atomic_sub(int i, atomic_t *v)
9797
"l32i %0, %2, 0 \n\t"
9898
"sub %0, %0, %1 \n\t"
9999
"s32i %0, %2, 0 \n\t"
100-
"wsr a15, "__stringify(PS)" \n\t"
100+
"wsr a15, ps \n\t"
101101
"rsync \n"
102102
: "=&a" (vval)
103103
: "a" (i), "a" (v)
@@ -118,7 +118,7 @@ static inline int atomic_add_return(int i, atomic_t * v)
118118
"l32i %0, %2, 0 \n\t"
119119
"add %0, %0, %1 \n\t"
120120
"s32i %0, %2, 0 \n\t"
121-
"wsr a15, "__stringify(PS)" \n\t"
121+
"wsr a15, ps \n\t"
122122
"rsync \n"
123123
: "=&a" (vval)
124124
: "a" (i), "a" (v)
@@ -137,7 +137,7 @@ static inline int atomic_sub_return(int i, atomic_t * v)
137137
"l32i %0, %2, 0 \n\t"
138138
"sub %0, %0, %1 \n\t"
139139
"s32i %0, %2, 0 \n\t"
140-
"wsr a15, "__stringify(PS)" \n\t"
140+
"wsr a15, ps \n\t"
141141
"rsync \n"
142142
: "=&a" (vval)
143143
: "a" (i), "a" (v)
@@ -260,7 +260,7 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
260260
"xor %1, %4, %3 \n\t"
261261
"and %0, %0, %4 \n\t"
262262
"s32i %0, %2, 0 \n\t"
263-
"wsr a15, "__stringify(PS)" \n\t"
263+
"wsr a15, ps \n\t"
264264
"rsync \n"
265265
: "=&a" (vval), "=a" (mask)
266266
: "a" (v), "a" (all_f), "1" (mask)
@@ -277,7 +277,7 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
277277
"l32i %0, %2, 0 \n\t"
278278
"or %0, %0, %1 \n\t"
279279
"s32i %0, %2, 0 \n\t"
280-
"wsr a15, "__stringify(PS)" \n\t"
280+
"wsr a15, ps \n\t"
281281
"rsync \n"
282282
: "=&a" (vval)
283283
: "a" (mask), "a" (v)

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ extern void copy_from_user_page(struct vm_area_struct*, struct page*,
165165
static inline u32 xtensa_get_cacheattr(void)
166166
{
167167
u32 r;
168-
asm volatile(" rsr %0, CACHEATTR" : "=a"(r));
168+
asm volatile(" rsr %0, cacheattr" : "=a"(r));
169169
return r;
170170
}
171171

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ __cmpxchg_u32(volatile int *p, int old, int new)
2727
"bne %0, %2, 1f \n\t"
2828
"s32i %3, %1, 0 \n\t"
2929
"1: \n\t"
30-
"wsr a15, "__stringify(PS)" \n\t"
30+
"wsr a15, ps \n\t"
3131
"rsync \n\t"
3232
: "=&a" (old)
3333
: "a" (p), "a" (old), "r" (new)
@@ -97,7 +97,7 @@ static inline unsigned long xchg_u32(volatile int * m, unsigned long val)
9797
__asm__ __volatile__("rsil a15, "__stringify(LOCKLEVEL)"\n\t"
9898
"l32i %0, %1, 0 \n\t"
9999
"s32i %2, %1, 0 \n\t"
100-
"wsr a15, "__stringify(PS)" \n\t"
100+
"wsr a15, ps \n\t"
101101
"rsync \n\t"
102102
: "=&a" (tmp)
103103
: "a" (m), "a" (val)

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,10 @@
9494
#if XCHAL_HAVE_CP
9595

9696
#define RSR_CPENABLE(x) do { \
97-
__asm__ __volatile__("rsr %0," __stringify(CPENABLE) : "=a" (x)); \
97+
__asm__ __volatile__("rsr %0, cpenable" : "=a" (x)); \
9898
} while(0);
9999
#define WSR_CPENABLE(x) do { \
100-
__asm__ __volatile__("wsr %0," __stringify(CPENABLE) "; rsync" \
101-
:: "a" (x)); \
100+
__asm__ __volatile__("wsr %0, cpenable; rsync" :: "a" (x)); \
102101
} while(0);
103102

104103
#endif /* XCHAL_HAVE_CP */

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static inline void __delay(unsigned long loops)
2727
static __inline__ u32 xtensa_get_ccount(void)
2828
{
2929
u32 ccount;
30-
asm volatile ("rsr %0, 234; # CCOUNT\n" : "=r" (ccount));
30+
asm volatile ("rsr %0, ccount\n" : "=r" (ccount));
3131
return ccount;
3232
}
3333

0 commit comments

Comments
 (0)