[PATCH] allow CONFIG_NET=n on ppc64
flat view
STALE8048d
From: Olaf Hering <hidden>
Date: 2004-09-29 20:02:21
Also in:
lkml
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ÜRNBERGAttachments
- minimal.config [text/plain] 1392 bytes · preview