[PATCH] allow CONFIG_NET=n on ppc64

The attached minimal config does not compile on ppc64.
I was able to boot the resulting binary with this patch.


Signed-off-by: Olaf Hering <redacted>


diff -purNX /suse/olh/kernel/kernel_exclude.txt linux-2.6.9-rc2/arch/ppc64/kernel/misc.S linux-2.6.9-rc2.ppc64/arch/ppc64/kernel/misc.S

--- linux-2.6.9-rc2/arch/ppc64/kernel/misc.S	2004-09-13 07:33:23.000000000 +0200
+++ linux-2.6.9-rc2.ppc64/arch/ppc64/kernel/misc.S	2004-09-29 21:00:44.909074755 +0200

@@ -703,7 +703,11 @@ _GLOBAL(sys_call_table32)
 	.llong .compat_sys_statfs
 	.llong .compat_sys_fstatfs		/* 100 */
 	.llong .sys_ni_syscall		/* old ioperm syscall */
+#ifdef CONFIG_NET
 	.llong .compat_sys_socketcall
+#else
+	.llong .sys_ni_syscall		/* old ioperm syscall */
+#endif
 	.llong .sys32_syslog
 	.llong .compat_sys_setitimer
 	.llong .compat_sys_getitimer		/* 105 */

diff -purNX /suse/olh/kernel/kernel_exclude.txt linux-2.6.9-rc2/include/net/sock.h linux-2.6.9-rc2.ppc64/include/net/sock.h

--- linux-2.6.9-rc2/include/net/sock.h	2004-09-13 07:33:11.000000000 +0200
+++ linux-2.6.9-rc2.ppc64/include/net/sock.h	2004-09-29 21:06:03.544933591 +0200

@@ -1327,6 +1327,13 @@ static inline void sock_valbool_flag(str
 extern __u32 sysctl_wmem_max;
 extern __u32 sysctl_rmem_max;
 
+#ifdef CONFIG_NET
 int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
+#else
+static inline int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
+{
+	return -ENODEV;
+}
+#endif
 
 #endif	/* _SOCK_H */

-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, nÜRNBERG

On Wed, Sep 29, 2004 at 10:01:58PM +0200, Olaf Hering wrote:

The attached minimal config does not compile on ppc64.
I was able to boot the resulting binary with this patch.

I already fixed this some time ago, but the patch must have disappeared.

Right fix is to declare compat_sys_socketcall as as cond_syscall() 
in sys.c

-Andi

 On Wed, Sep 29, Andi Kleen wrote:

On Wed, Sep 29, 2004 at 10:01:58PM +0200, Olaf Hering wrote:

quoted

The attached minimal config does not compile on ppc64.
I was able to boot the resulting binary with this patch.

Right fix is to declare compat_sys_socketcall as as cond_syscall() 
in sys.c

ok.

Signed-off-by: Olaf Hering <redacted>

diff -purNX /suse/olh/kernel/kernel_exclude.txt linux-2.6.9-rc3-bk2/include/net/sock.h linux-2.6.9-rc3-bk2.nonet/include/net/sock.h

--- linux-2.6.9-rc3-bk2/include/net/sock.h	2004-09-30 05:05:21.000000000 +0200
+++ linux-2.6.9-rc3-bk2.nonet/include/net/sock.h	2004-10-02 17:24:23.666152810 +0200

@@ -1336,6 +1336,13 @@ static inline void sock_valbool_flag(str
 extern __u32 sysctl_wmem_max;
 extern __u32 sysctl_rmem_max;
 
+#ifdef CONFIG_NET
 int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
+#else
+static inline int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
+{
+	return -ENODEV;
+}
+#endif
 
 #endif	/* _SOCK_H */

diff -purNX /suse/olh/kernel/kernel_exclude.txt linux-2.6.9-rc3-bk2/kernel/sys.c linux-2.6.9-rc3-bk2.nonet/kernel/sys.c

--- linux-2.6.9-rc3-bk2/kernel/sys.c	2004-09-30 05:03:55.000000000 +0200
+++ linux-2.6.9-rc3-bk2.nonet/kernel/sys.c	2004-10-02 17:05:49.589116448 +0200

@@ -282,6 +282,7 @@ cond_syscall(compat_set_mempolicy)
 cond_syscall(sys_pciconfig_read)
 cond_syscall(sys_pciconfig_write)
 cond_syscall(sys_pciconfig_iobase)
+cond_syscall(compat_sys_socketcall)
 
 static int set_one_prio(struct task_struct *p, int niceval, int error)
 {

-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, nÜRNBERG

Olaf, as I requested of you last time, please use attachments for
your patches since I can never apply them cleanly when you
inline them to the main body text.

Thanks a lot.

Hi everyone,

            I have got a small problem regarding configuring my ethernet
card,while loading the eth0 driver the kernel performs auto-probing for the
device and configures the eth0 to half-duplex.

I used command line arguments while loading modules
insmod 8139too io=0x280 irq=10 duplex=2

but still it performs the autoprobing overriding the parameters.

Please help me out of this problem,i want to configure my ethernetcard to
fullduplex.

Waiting for a reply...

With Regards,
Pranav.

Pranav wrote:

Hi everyone,

            I have got a small problem regarding configuring my ethernet
card,while loading the eth0 driver the kernel performs auto-probing for the
device and configures the eth0 to half-duplex.

I used command line arguments while loading modules
insmod 8139too io=0x280 irq=10 duplex=2

8139too module does not take any arguments like io= or irq=.  PCI cards 
do not need such parameters.

You may use ethtool to select half-duplex or full-duplex.

	Jeff