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

Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (78 commits)
  [PARISC] Use symbolic last syscall in __NR_Linux_syscalls
  [PARISC] Add missing statfs64 and fstatfs64 syscalls
  Revert "[PARISC] Optimize TLB flush on SMP systems"
  [PARISC] Compat signal fixes for 64-bit parisc
  [PARISC] Reorder syscalls to match unistd.h
  Revert "[PATCH] make kernel/signal.c:kill_proc_info() static"
  [PARISC] fix sys_rt_sigqueueinfo
  [PARISC] fix section mismatch warnings in harmony sound driver
  [PARISC] do not export get_register/set_register
  [PARISC] add ENTRY()/ENDPROC() and simplify assembly of HP/UX emulation code
  [PARISC] convert to use CONFIG_64BIT instead of __LP64__
  [PARISC] use CONFIG_64BIT instead of __LP64__
  [PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macro
  [PARISC] more ENTRY(), ENDPROC(), END() conversions
  [PARISC] fix ENTRY() and ENDPROC() for 64bit-parisc
  [PARISC] Fixes /proc/cpuinfo cache output on B160L
  [PARISC] implement standard ENTRY(), END() and ENDPROC()
  [PARISC] kill ENTRY_SYS_CPUS
  [PARISC] clean up debugging printks in smp.c
  [PARISC] factor syscall_restart code out of do_signal
  ...

Fix conflict in include/linux/sched.h due to kill_proc_info() being made
publicly available to PARISC again.
parents 6572d6d7 1055a8af

arch/parisc/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ config GENERIC_FIND_NEXT_BIT 
	bool

	default y



config GENERIC_BUG

	bool

	default y

	depends on BUG



config GENERIC_HWEIGHT

	bool

	default y
@@ -45,6 +50,10 @@ config GENERIC_CALIBRATE_DELAY 
	bool

	default y



config GENERIC_TIME

	bool

	default y



config TIME_LOW_RES

	bool

	depends on SMP

arch/parisc/Makefile

+2 −6
Original line number Diff line number Diff line
@@ -35,12 +35,8 @@ FINAL_LD=$(CROSS_COMPILE)ld --warn-common --warn-section-align 


OBJCOPY_FLAGS =-O binary -R .note -R .comment -S



GCC_VERSION     := $(call cc-version)

ifneq ($(shell if [ -z $(GCC_VERSION) ] ; then echo "bad"; fi ;),)

$(error Sorry, couldn't find ($(cc-version)).)

endif

ifneq ($(shell if [ $(GCC_VERSION) -lt 0303 ] ; then echo "bad"; fi ;),)

$(error Sorry, your compiler is too old ($(GCC_VERSION)).  GCC v3.3 or above is required.)

ifneq ($(call cc-ifversion, -lt, 0303, "bad"),)

$(error Sorry, GCC v3.3 or above is required.)

endif



cflags-y	:= -pipe

arch/parisc/hpux/entry_hpux.S

+5 −5
Original line number Diff line number Diff line
@@ -18,17 +18,16 @@ 
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include <asm/unistd.h>

#include <asm/assembly.h>

#include <linux/sys.h>

#include <linux/linkage.h>

#include <asm/unistd.h>



#define ENTRY_NAME(_name_) .word _name_

#define ENTRY_NAME(_name_) ASM_ULONG_INSN _name_



	.section .rodata,"a"

	.align 4

	.export hpux_call_table

	.import hpux_unimplemented_wrapper

hpux_call_table:

ENTRY(hpux_call_table)

	ENTRY_NAME(sys_ni_syscall)	/* 0 */

	ENTRY_NAME(sys_exit)

	ENTRY_NAME(hpux_fork_wrapper)
@@ -542,5 +541,6 @@ hpux_call_table: 
	ENTRY_NAME(hpux_unimplemented_wrapper)      /* 510 */

	ENTRY_NAME(hpux_unimplemented_wrapper)

	ENTRY_NAME(hpux_unimplemented_wrapper)

END(hpux_call_table)

.end

arch/parisc/hpux/fs.c

+13 −13
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ int hpux_execve(struct pt_regs *regs) 
	int error;

	char *filename;



	filename = getname((char *) regs->gr[26]);

	filename = getname((char __user *) regs->gr[26]);

	error = PTR_ERR(filename);

	if (IS_ERR(filename))

		goto out;



	error = do_execve(filename, (char **) regs->gr[25],

		(char **)regs->gr[24], regs);

	error = do_execve(filename, (char __user * __user *) regs->gr[25],

		(char __user * __user *) regs->gr[24], regs);



	if (error == 0) {

		task_lock(current);
@@ -63,19 +63,19 @@ struct hpux_dirent { 
};



struct getdents_callback {

	struct hpux_dirent *current_dir;

	struct hpux_dirent *previous;

	struct hpux_dirent __user *current_dir;

	struct hpux_dirent __user *previous;

	int count;

	int error;

};



#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))

#define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))

#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))



static int filldir(void * __buf, const char * name, int namlen, loff_t offset,

		u64 ino, unsigned d_type)

{

	struct hpux_dirent * dirent;

	struct hpux_dirent __user * dirent;

	struct getdents_callback * buf = (struct getdents_callback *) __buf;

	ino_t d_ino;

	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
@@ -105,10 +105,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, 
#undef NAME_OFFSET

#undef ROUND_UP



int hpux_getdents(unsigned int fd, struct hpux_dirent *dirent, unsigned int count)

int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned int count)

{

	struct file * file;

	struct hpux_dirent * lastdirent;

	struct hpux_dirent __user * lastdirent;

	struct getdents_callback buf;

	int error = -EBADF;
@@ -143,7 +143,7 @@ int hpux_mount(const char *fs, const char *path, int mflag, 
	return -ENOSYS;

}



static int cp_hpux_stat(struct kstat *stat, struct hpux_stat64 *statbuf)

static int cp_hpux_stat(struct kstat *stat, struct hpux_stat64 __user *statbuf)

{

	struct hpux_stat64 tmp;
@@ -169,7 +169,7 @@ static int cp_hpux_stat(struct kstat *stat, struct hpux_stat64 *statbuf) 
	return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;

}



long hpux_stat64(char *filename, struct hpux_stat64 *statbuf)

long hpux_stat64(char __user *filename, struct hpux_stat64 __user *statbuf)

{

	struct kstat stat;

	int error = vfs_stat(filename, &stat);
@@ -180,7 +180,7 @@ long hpux_stat64(char *filename, struct hpux_stat64 *statbuf) 
	return error;

}



long hpux_fstat64(unsigned int fd, struct hpux_stat64 *statbuf)

long hpux_fstat64(unsigned int fd, struct hpux_stat64 __user *statbuf)

{

	struct kstat stat;

	int error = vfs_fstat(fd, &stat);
@@ -191,7 +191,7 @@ long hpux_fstat64(unsigned int fd, struct hpux_stat64 *statbuf) 
	return error;

}



long hpux_lstat64(char *filename, struct hpux_stat64 *statbuf)

long hpux_lstat64(char __user *filename, struct hpux_stat64 __user *statbuf)

{

	struct kstat stat;

	int error = vfs_lstat(filename, &stat);

arch/parisc/hpux/gate.S

+7 −16
Original line number Diff line number Diff line
@@ -12,27 +12,18 @@ 
#include <asm/asm-offsets.h>

#include <asm/unistd.h>

#include <asm/errno.h>

#include <linux/linkage.h>



#ifdef __LP64__

	.level          2.0w

#else

	.level		1.1

#endif

	.level	LEVEL

	.text



#ifdef __LP64__

#define FRAME_SIZE	128

#else

#define FRAME_SIZE	64

#endif

	.import hpux_call_table

	.import hpux_syscall_exit,code

	.export hpux_gateway_page



	.align 4096

hpux_gateway_page:

ENTRY(hpux_gateway_page)

	nop

#ifdef __LP64__

#ifdef CONFIG_64BIT

#warning NEEDS WORK for 64-bit

#endif

	ldw     -64(%r30), %r29                 ;! 8th argument
@@ -101,7 +92,7 @@ hpux_gateway_page: 
	ldo	R%hpux_call_table(%r21), %r21

	comiclr,>>=	__NR_HPUX_syscalls, %r22, %r0

	b,n	syscall_nosys

	ldwx,s	%r22(%r21), %r21

	LDREGX	%r22(%r21), %r21

	ldil	L%hpux_syscall_exit,%r2

	be	0(%sr7,%r21)

	ldo	R%hpux_syscall_exit(%r2),%r2
@@ -110,7 +101,7 @@ syscall_nosys: 
	ldil	L%hpux_syscall_exit,%r1

	be	R%hpux_syscall_exit(%sr7,%r1)

	ldo	-ENOSYS(%r0),%r28

ENDPROC(hpux_gateway_page)



	.align 4096

	.export end_hpux_gateway_page

end_hpux_gateway_page:
 
ENTRY(end_hpux_gateway_page)

CRA Git | Maintained and supported by SUSTech CRA and CCSE