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

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

Pull Xtensa fixes from Chris Zankel:
 "Some important bug fixes.

  With the change to uapi, there was a bug introduced that results in an
  empty syscall table (mult-inclusion bug).  Switching to the generic
  thread/execve allowed us to fix a bug we had in vfork()."

* tag 'xtensa-next-20121101' of git://github.com/czankel/xtensa-linux:
  xtensa: switch to generic sys_execve()
  xtensa: switch to generic kernel_execve()
  xtensa: switch to generic kernel_thread()
  xtensa: reset windowbase/windowstart when cloning the VM
  xtensa: use physical addresses for bus addresses
  xtensa: allow multi-inclusion for uapi/unistd.h
parents 8c23f406 dc241f2c

arch/xtensa/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ config XTENSA 
	select GENERIC_CPU_DEVICES

	select MODULES_USE_ELF_RELA

	select GENERIC_PCI_IOMAP

	select GENERIC_KERNEL_THREAD

	select GENERIC_KERNEL_EXECVE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help

	  Xtensa processors are 32-bit RISC machines designed by Tensilica

arch/xtensa/include/asm/io.h

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) 
static inline void iounmap(volatile void __iomem *addr)

{

}



#define virt_to_bus     virt_to_phys

#define bus_to_virt     phys_to_virt



#endif /* CONFIG_MMU */



/*

arch/xtensa/include/asm/processor.h

+1 −3
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ struct thread_struct { 


/* Clearing a0 terminates the backtrace. */

#define start_thread(regs, new_pc, new_sp) \

	memset(regs, 0, sizeof(*regs)); \

	regs->pc = new_pc; \

	regs->ps = USER_PS_VALUE; \

	regs->areg[1] = new_sp; \
@@ -168,9 +169,6 @@ struct mm_struct; 
/* Free all resources held by a thread. */

#define release_thread(thread) do { } while(0)



/* Create a kernel thread without removing it from tasklists */

extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);



/* Copy and release all segment info associated with a VM */

#define copy_segments(p, mm)	do { } while(0)

#define release_segments(mm)	do { } while(0)

arch/xtensa/include/asm/syscall.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


struct pt_regs;

struct sigaction;

asmlinkage long xtensa_execve(char*, char**, char**, struct pt_regs*);

asmlinkage long sys_execve(char*, char**, char**, struct pt_regs*);

asmlinkage long xtensa_clone(unsigned long, unsigned long, struct pt_regs*);

asmlinkage long xtensa_ptrace(long, long, long, long);

asmlinkage long xtensa_sigreturn(struct pt_regs*);

arch/xtensa/include/asm/unistd.h

+5 −10
Original line number Diff line number Diff line 
/*

 * include/asm-xtensa/unistd.h

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 2001 - 2005 Tensilica Inc.

 */

#ifndef _XTENSA_UNISTD_H

#define _XTENSA_UNISTD_H



#define __ARCH_WANT_SYS_EXECVE

#include <uapi/asm/unistd.h>





/*

 * "Conditional" syscalls

 *
@@ -37,3 +30,5 @@ 
#define __IGNORE_mmap				/* use mmap2 */

#define __IGNORE_vfork				/* use clone */

#define __IGNORE_fadvise64			/* use fadvise64_64 */



#endif /* _XTENSA_UNISTD_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE