netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Olaf Hering <olh@suse.de>
To: Andi Kleen <ak@suse.de>
Cc: netdev@oss.sgi.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH]  allow CONFIG_NET=n on ppc64
Date: Sat, 2 Oct 2004 17:30:53 +0200	[thread overview]
Message-ID: <20041002153053.GA2643@suse.de> (raw)
In-Reply-To: <20040929201524.GA14615@wotan.suse.de>

 On Wed, Sep 29, Andi Kleen wrote:

> 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.

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

ok.

Signed-off-by: Olaf Hering <olh@suse.de>

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

  reply	other threads:[~2004-10-02 15:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-09-29 20:01 [PATCH] allow CONFIG_NET=n on ppc64 Olaf Hering
2004-09-29 20:15 ` Andi Kleen
2004-10-02 15:30   ` Olaf Hering [this message]
2004-10-03 21:59     ` David S. Miller
2004-10-04 18:07       ` HELP NEEDED!!! Pranav
2004-10-04 18:15         ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041002153053.GA2643@suse.de \
    --to=olh@suse.de \
    --cc=ak@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).