Commit 17dbe27d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b05e585d 7216cabf

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

+4 −4
Original line number Diff line number Diff line
@@ -51,17 +51,17 @@ _start: 
	/* 'reset' window registers */



	movi	a4, 1

	wsr	a4, PS

	wsr	a4, ps

	rsync



	rsr	a5, WINDOWBASE

	rsr	a5, windowbase

	ssl	a5

	sll	a4, a4

	wsr	a4, WINDOWSTART

	wsr	a4, windowstart

	rsync



	movi	a4, 0x00040000

	wsr	a4, PS

	wsr	a4, ps

	rsync



	/* copy the loader to its address

arch/xtensa/include/asm/Kbuild

+26 −2
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



generic-y += bitsperlong.h

generic-y += bug.h

generic-y += clkdev.h

generic-y += cputime.h

generic-y += device.h

generic-y += div64.h

generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

generic-y += fcntl.h

generic-y += futex.h

generic-y += hardirq.h

generic-y += ioctl.h

generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += kmap_types.h

generic-y += kvm_para.h

generic-y += local.h

generic-y += local64.h

generic-y += percpu.h

generic-y += resource.h

generic-y += scatterlist.h

generic-y += sections.h

generic-y += siginfo.h

generic-y += statfs.h

generic-y += termios.h

generic-y += topology.h

generic-y += xor.h

arch/xtensa/include/asm/atomic.h

+6 −6
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static inline void atomic_add(int i, atomic_t * v) 
	"l32i    %0, %2, 0              \n\t"

	"add     %0, %0, %1             \n\t"

	"s32i    %0, %2, 0              \n\t"

	"wsr     a15, "__stringify(PS)"       \n\t"

	"wsr     a15, ps                \n\t"

	"rsync                          \n"

	: "=&a" (vval)

	: "a" (i), "a" (v)
@@ -97,7 +97,7 @@ static inline void atomic_sub(int i, atomic_t *v) 
	"l32i    %0, %2, 0              \n\t"

	"sub     %0, %0, %1             \n\t"

	"s32i    %0, %2, 0              \n\t"

	"wsr     a15, "__stringify(PS)"       \n\t"

	"wsr     a15, ps                \n\t"

	"rsync                          \n"

	: "=&a" (vval)

	: "a" (i), "a" (v)
@@ -118,7 +118,7 @@ static inline int atomic_add_return(int i, atomic_t * v) 
	"l32i    %0, %2, 0             \n\t"

	"add     %0, %0, %1            \n\t"

	"s32i    %0, %2, 0             \n\t"

	"wsr     a15, "__stringify(PS)"      \n\t"

	"wsr     a15, ps               \n\t"

	"rsync                         \n"

	: "=&a" (vval)

	: "a" (i), "a" (v)
@@ -137,7 +137,7 @@ static inline int atomic_sub_return(int i, atomic_t * v) 
	"l32i    %0, %2, 0             \n\t"

	"sub     %0, %0, %1            \n\t"

	"s32i    %0, %2, 0             \n\t"

	"wsr     a15, "__stringify(PS)"       \n\t"

	"wsr     a15, ps               \n\t"

	"rsync                         \n"

	: "=&a" (vval)

	: "a" (i), "a" (v)
@@ -260,7 +260,7 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) 
	"xor     %1, %4, %3            \n\t"

	"and     %0, %0, %4            \n\t"

	"s32i    %0, %2, 0             \n\t"

	"wsr     a15, "__stringify(PS)"      \n\t"

	"wsr     a15, ps               \n\t"

	"rsync                         \n"

	: "=&a" (vval), "=a" (mask)

	: "a" (v), "a" (all_f), "1" (mask)
@@ -277,7 +277,7 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v) 
	"l32i    %0, %2, 0             \n\t"

	"or      %0, %0, %1            \n\t"

	"s32i    %0, %2, 0             \n\t"

	"wsr     a15, "__stringify(PS)"       \n\t"

	"wsr     a15, ps               \n\t"

	"rsync                         \n"

	: "=&a" (vval)

	: "a" (mask), "a" (v)

arch/xtensa/include/asm/bitsperlong.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/bitsperlong.h>

arch/xtensa/include/asm/cacheflush.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ extern void copy_from_user_page(struct vm_area_struct*, struct page*, 
static inline u32 xtensa_get_cacheattr(void)

{

	u32 r;

	asm volatile("	rsr %0, CACHEATTR" : "=a"(r));

	asm volatile("	rsr %0, cacheattr" : "=a"(r));

	return r;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE