ppc64: updates for 2.5.48

arch/ppc64/kernel/eeh.c

@@ -95,10 +95,10 @@ unsigned long eeh_check_failure(void *token, unsigned long val)
 		dev = pci_find_slot(bus, devfn);
 		if (dev) {
 			printk(KERN_ERR "EEH:  MMIO failure (%ld) on device:\n  %s %s\n",
-			      rets[0], dev->slot_name, dev->name);
+			      rets[0], dev->slot_name, dev->dev.name);
 			PPCDBG_ENTER_DEBUGGER();
 			panic("EEH:  MMIO failure (%ld) on device:\n  %s %s\n",
-			      rets[0], dev->slot_name, dev->name);
+			      rets[0], dev->slot_name, dev->dev.name);
 		} else {
 			printk(KERN_ERR "EEH:  MMIO failure (%ld) on device buid %lx, config_addr %lx\n", rets[0], phb->buid, config_addr);
 			PPCDBG_ENTER_DEBUGGER();
@@ -224,7 +224,7 @@ int is_eeh_configured(struct pci_dev *dev)
 
 	if (!eeh_check_opts_config(dev, default_state)) {
 		if (default_state)
-			printk(KERN_INFO "EEH: %s %s user requested to run without EEH.\n", dev->slot_name, dev->name);
+			printk(KERN_INFO "EEH: %s %s user requested to run without EEH.\n", dev->slot_name, dev->dev.name);
 		return 0;
 	}
 

arch/ppc64/kernel/misc.S

@@ -633,10 +633,10 @@ _GLOBAL(sys_call_table32)
 	.llong .sys32_adjtimex
 	.llong .sys_mprotect		/* 125 */
 	.llong .sys32_sigprocmask
-	.llong .sys32_create_module
+	.llong .sys_ni_syscall		/* old create_module syscall */
 	.llong .sys32_init_module
 	.llong .sys32_delete_module
-	.llong .sys32_get_kernel_syms	/* 130 */
+	.llong .sys_ni_syscall		/* 130 old get_kernel_syms syscall */
 	.llong .sys_quotactl
 	.llong .sys32_getpgid
 	.llong .sys_fchdir
@@ -672,7 +672,7 @@ _GLOBAL(sys_call_table32)
 	.llong .sys32_mremap
 	.llong .sys_setresuid
 	.llong .sys_getresuid	        /* 165 */
-	.llong .sys32_query_module
+	.llong .sys_ni_syscall		/* old query_module syscall */
 	.llong .sys_poll
 	.llong .sys32_nfsservctl
 	.llong .sys_setresgid
@@ -881,10 +881,10 @@ _GLOBAL(sys_call_table)
 	.llong .sys_adjtimex
 	.llong .sys_mprotect		/* 125 */
 	.llong .sys_sigprocmask
-	.llong .sys_create_module
+	.llong .sys_ni_syscall		/* old create_module syscall */
 	.llong .sys_init_module
 	.llong .sys_delete_module
-	.llong .sys_get_kernel_syms	/* 130 */
+	.llong .sys_ni_syscall		/* 130 old get_kernel_syms syscall */
 	.llong .sys_quotactl
 	.llong .sys_getpgid
 	.llong .sys_fchdir
@@ -920,7 +920,7 @@ _GLOBAL(sys_call_table)
 	.llong .sys_mremap
 	.llong .sys_setresuid
 	.llong .sys_getresuid	        /* 165 */
-	.llong .sys_query_module
+	.llong .sys_ni_syscall		/* old query_module syscall */
 	.llong .sys_poll
 	.llong .sys_nfsservctl
 	.llong .sys_setresgid

arch/ppc64/kernel/pci.c

@@ -939,7 +939,7 @@ void dumpPci_Dev(struct pci_dev* Pci_Dev)
 	int i;
 	udbg_printf("\tpci_dev*        = 0x%p\n",Pci_Dev);
 	if ( Pci_Dev == NULL )  return;
-	udbg_printf("\tname            = %s  \n",Pci_Dev->name);
+	udbg_printf("\tname            = %s  \n",Pci_Dev->dev.name);
 	udbg_printf("\tbus*            = 0x%p\n",Pci_Dev->bus);
 	udbg_printf("\tsysdata*        = 0x%p\n",Pci_Dev->sysdata);
 	udbg_printf("\tDevice          = 0x%4X%02X:%02X.%02X 0x%04X:%04X\n",

arch/ppc64/kernel/sys_ppc32.c

@@ -858,11 +858,11 @@ static int cp_new_stat32(struct kstat *stat, struct stat32 *statbuf)
 	if (stat->size > MAX_NON_LFS)
 		return -EOVERFLOW;
 	err |= put_user(stat->size, &statbuf->st_size);
-	err |= put_user(stat->atime, &statbuf->st_atime);
+	err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);
 	err |= put_user(0, &statbuf->__unused1);
-	err |= put_user(stat->mtime, &statbuf->st_mtime);
+	err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);
 	err |= put_user(0, &statbuf->__unused2);
-	err |= put_user(stat->ctime, &statbuf->st_ctime);
+	err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);
 	err |= put_user(0, &statbuf->__unused3);
 	err |= put_user(stat->blksize, &statbuf->st_blksize);
 	err |= put_user(stat->blocks, &statbuf->st_blocks);

include/asm-ppc64/ppc32.h

@@ -174,14 +174,12 @@ struct flock32 {
 
 struct stat32 {
 	__kernel_dev_t32   st_dev; /* 2 */
-	/* __kernel_dev_t32 __pad1; */ /* 2 */
 	__kernel_ino_t32   st_ino; /* 4  */
 	__kernel_mode_t32  st_mode; /* 2  */
 	short   	   st_nlink; /* 2 */
 	__kernel_uid_t32   st_uid; /* 2 */
 	__kernel_gid_t32   st_gid; /* 2 */
 	__kernel_dev_t32   st_rdev; /* 2 */
-	/* __kernel_dev_t32 __pad2; */ /* 2 */
 	__kernel_off_t32   st_size; /* 4 */
 	__kernel_off_t32   st_blksize; /* 4 */
 	__kernel_off_t32   st_blocks; /* 4 */
@@ -194,21 +192,6 @@ struct stat32 {
 	unsigned int  __unused4[2]; /* 2*4 */
 };
 
-struct __old_kernel_stat32
-{
-	unsigned short st_dev;
-	unsigned short st_ino;
-	unsigned short st_mode;
-	unsigned short st_nlink;
-	unsigned short st_uid;
-	unsigned short st_gid;
-	unsigned short st_rdev;
-	unsigned int   st_size;
-	unsigned int   st_atime;
-	unsigned int   st_mtime;
-	unsigned int   st_ctime;
-};
-
 struct sigcontext32 {
 	unsigned int	_unused[4];
 	int		signal;

include/asm-ppc64/stat.h

@@ -10,20 +10,6 @@
 
 #include <linux/types.h>
 
-struct __old_kernel_stat {
-	unsigned short st_dev;
-	unsigned short st_ino;
-	unsigned short st_mode;
-	unsigned short st_nlink;
-	unsigned short st_uid;
-	unsigned short st_gid;
-	unsigned short st_rdev;
-	unsigned long  st_size;
-	unsigned long  st_atime;
-	unsigned long  st_mtime;
-	unsigned long  st_ctime;
-};
-
 struct stat {
 	dev_t		st_dev;
 	ino_t		st_ino;
@@ -48,7 +34,7 @@ struct stat {
 
 #define STAT_HAVE_NSEC 1
 
-/* This matches struct stat64 in glibc2.1. */
+/* This matches struct stat64 in glibc2.1. Only used for 32 bit. */
 struct stat64 {
 	unsigned long st_dev; 		/* Device.  */
 	unsigned long st_ino;		/* File serial number.  */