From: Keith Owens <kaos@ocs.com.au>
To: torvalds@transmeta.com
Cc: linux-kernel@vger.kernel.org
Subject: 2.4.8-pre6 - towards a clean kernel compile
Date: Wed, 08 Aug 2001 15:29:55 +1000 [thread overview]
Message-ID: <29863.997248595@kao2.melbourne.sgi.com> (raw)
Fix duplicate symbols in ieee1394.
Remove dead call to rio_init from tty_io.
Correct missing () in ldm.h.
Some of these patches have already appeared on l-k but they are not in
the latest pre-patch.
Index: 8-pre6.1/drivers/ieee1394/raw1394.c
--- 8-pre6.1/drivers/ieee1394/raw1394.c Fri, 20 Jul 2001 16:36:16 +1000 kaos (linux-2.4/u/b/50_raw1394.c 1.1.1.2 644)
+++ 8-pre6.1(w)/drivers/ieee1394/raw1394.c Wed, 08 Aug 2001 11:14:21 +1000 kaos (linux-2.4/u/b/50_raw1394.c 1.1.1.2 644)
@@ -45,7 +45,7 @@ static devfs_handle_t devfs_handle;
LIST_HEAD(host_info_list);
static int host_count;
-spinlock_t host_info_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t host_info_lock = SPIN_LOCK_UNLOCKED;
static struct hpsb_highlevel *hl_handle;
Index: 8-pre6.1/drivers/ieee1394/nodemgr.c
--- 8-pre6.1/drivers/ieee1394/nodemgr.c Tue, 31 Jul 2001 11:09:45 +1000 kaos (linux-2.4/H/e/29_nodemgr.c 1.2 644)
+++ 8-pre6.1(w)/drivers/ieee1394/nodemgr.c Wed, 08 Aug 2001 11:14:21 +1000 kaos (linux-2.4/H/e/29_nodemgr.c 1.2 644)
@@ -43,7 +43,7 @@ static LIST_HEAD(node_list);
rwlock_t node_lock = RW_LOCK_UNLOCKED;
static LIST_HEAD(host_info_list);
-spinlock_t host_info_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t host_info_lock = SPIN_LOCK_UNLOCKED;
struct bus_options {
u8 irmc; /* Iso Resource Manager Capable */
Index: 8-pre6.1/drivers/char/tty_io.c
--- 8-pre6.1/drivers/char/tty_io.c Thu, 19 Jul 2001 11:12:10 +1000 kaos (linux-2.4/b/c/32_tty_io.c 1.1.2.2.1.1.1.4 644)
+++ 8-pre6.1(w)/drivers/char/tty_io.c Wed, 08 Aug 2001 11:31:00 +1000 kaos (linux-2.4/b/c/32_tty_io.c 1.1.2.2.1.1.1.4 644)
@@ -105,7 +105,6 @@
#ifdef CONFIG_VT
extern void con_init_devfs (void);
#endif
-extern int rio_init(void);
#define CONSOLE_DEV MKDEV(TTY_MAJOR,0)
#define TTY_DEV MKDEV(TTYAUX_MAJOR,0)
@@ -2341,9 +2340,6 @@ void __init tty_init(void)
#endif
#ifdef CONFIG_SPECIALIX
specialix_init();
-#endif
-#ifdef CONFIG_RIO
- rio_init();
#endif
#if (defined(CONFIG_8xx) || defined(CONFIG_8260))
rs_8xx_init();
Index: 8-pre6.1/fs/partitions/ldm.h
--- 8-pre6.1/fs/partitions/ldm.h Sun, 05 Aug 2001 13:29:36 +1000 kaos (linux-2.4/I/e/44_ldm.h 1.2 644)
+++ 8-pre6.1(w)/fs/partitions/ldm.h Wed, 08 Aug 2001 11:14:24 +1000 kaos (linux-2.4/I/e/44_ldm.h 1.2 644)
@@ -81,13 +81,13 @@
#define TOC_BITMAP2 "log" /* bitmaps in the TOCBLOCK. */
/* Borrowed from msdos.c */
-#define SYS_IND(p) (get_unaligned(&p->sys_ind))
-#define NR_SECTS(p) ({ __typeof__(p->nr_sects) __a = \
- get_unaligned(&p->nr_sects); \
+#define SYS_IND(p) (get_unaligned(&(p)->sys_ind))
+#define NR_SECTS(p) ({ __typeof__((p)->nr_sects) __a =3D \
+ get_unaligned(&(p)->nr_sects); \
le32_to_cpu(__a); \
})
-#define START_SECT(p) ({ __typeof__(p->start_sect) __a = \
- get_unaligned(&p->start_sect); \
+#define START_SECT(p) ({ __typeof__((p)->start_sect) __a =3D \
+ get_unaligned(&(p)->start_sect);\
le32_to_cpu(__a); \
})
next reply other threads:[~2001-08-08 5:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-08-08 5:29 Keith Owens [this message]
2001-08-08 10:08 ` 2.4.8-pre6 - towards a clean kernel compile Anton Altaparmakov
2001-08-08 14:13 ` Ignacio Vazquez-Abrams
2001-08-08 14:24 ` Keith Owens
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=29863.997248595@kao2.melbourne.sgi.com \
--to=kaos@ocs.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.