Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv10917/linux/arch/ppc64/kernel
Modified Files:
chrp_setup.c ioctl32.c
Log Message:
Synced to 2.5.51
Index: chrp_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel/chrp_setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- chrp_setup.c 23 Nov 2002 00:55:48 -0000 1.5
+++ chrp_setup.c 10 Dec 2002 21:06:03 -0000 1.6
@@ -65,7 +65,6 @@
extern volatile unsigned char *chrp_int_ack_special;
void chrp_progress(char *, unsigned short);
-void chrp_request_regions(void);
extern void openpic_init_IRQ(void);
extern void init_ras_IRQ(void);
@@ -140,11 +139,12 @@
fwnmi_init();
+#ifndef CONFIG_PPC_ISERIES
/* Find and initialize PCI host bridges */
/* iSeries needs to be done much later. */
- #ifndef CONFIG_PPC_ISERIES
- find_and_init_phbs();
- #endif
+ eeh_init();
+ find_and_init_phbs();
+#endif
/* Find the Open PIC if present */
root = find_path_device("/");
@@ -164,11 +164,6 @@
void __init
chrp_init2(void)
{
- /*
- * It is sensitive, when this is called (not too earlu)
- * -- tibit
- */
- chrp_request_regions();
/* Manually leave the kernel version on the panel. */
ppc_md.progress("Linux ppc64\n", 0);
ppc_md.progress(UTS_RELEASE, 0);
Index: ioctl32.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel/ioctl32.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ioctl32.c 23 Nov 2002 00:55:49 -0000 1.7
+++ ioctl32.c 10 Dec 2002 21:06:04 -0000 1.8
@@ -22,6 +22,7 @@
#include <linux/config.h>
#include <linux/types.h>
+#include <linux/compat.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp.h>
@@ -397,14 +398,9 @@
return err;
}
-struct timeval32 {
- int tv_sec;
- int tv_usec;
-};
-
static int do_siocgstamp(unsigned int fd, unsigned int cmd, unsigned long arg)
{
- struct timeval32 *up = (struct timeval32 *)arg;
+ struct compat_timeval *up = (struct compat_timeval *)arg;
struct timeval ktv;
mm_segment_t old_fs = get_fs();
int err;
@@ -1424,8 +1420,8 @@
#define PPPIOCSCOMPRESS32 _IOW('t', 77, struct ppp_option_data32)
struct ppp_idle32 {
- __kernel_time_t32 xmit_idle;
- __kernel_time_t32 recv_idle;
+ compat_time_t xmit_idle;
+ compat_time_t recv_idle;
};
#define PPPIOCGIDLE32 _IOR('t', 63, struct ppp_idle32)
|
