* 2.4.8-pre6 - towards a clean kernel compile
@ 2001-08-08 5:29 Keith Owens
2001-08-08 10:08 ` Anton Altaparmakov
0 siblings, 1 reply; 4+ messages in thread
From: Keith Owens @ 2001-08-08 5:29 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
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); \
})
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: 2.4.8-pre6 - towards a clean kernel compile
2001-08-08 5:29 2.4.8-pre6 - towards a clean kernel compile Keith Owens
@ 2001-08-08 10:08 ` Anton Altaparmakov
2001-08-08 14:13 ` Ignacio Vazquez-Abrams
2001-08-08 14:24 ` Keith Owens
0 siblings, 2 replies; 4+ messages in thread
From: Anton Altaparmakov @ 2001-08-08 10:08 UTC (permalink / raw)
To: Keith Owens; +Cc: torvalds, linux-kernel
On Wed, 8 Aug 2001, Keith Owens wrote:
> 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/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); \
> })
Something's gone wrong with this patch. What's this __a =3D stuff that
has appeared out of the blue in two places?
Best regards,
Anton
--
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Linux NTFS maintainer / WWW: http://linux-ntfs.sf.net/
ICQ: 8561279 / WWW: http://www-stu.christs.cam.ac.uk/~aia21/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: 2.4.8-pre6 - towards a clean kernel compile
2001-08-08 10:08 ` Anton Altaparmakov
@ 2001-08-08 14:13 ` Ignacio Vazquez-Abrams
2001-08-08 14:24 ` Keith Owens
1 sibling, 0 replies; 4+ messages in thread
From: Ignacio Vazquez-Abrams @ 2001-08-08 14:13 UTC (permalink / raw)
To: linux-kernel
On Wed, 8 Aug 2001, Anton Altaparmakov wrote:
> Something's gone wrong with this patch. What's this __a =3D stuff that
> has appeared out of the blue in two places?
>
> Best regards,
>
> Anton
That's just someone's MUA acting stoned. Take out the "3D".
0x3d=='='
--
Ignacio Vazquez-Abrams <ignacio@openservices.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: 2.4.8-pre6 - towards a clean kernel compile
2001-08-08 10:08 ` Anton Altaparmakov
2001-08-08 14:13 ` Ignacio Vazquez-Abrams
@ 2001-08-08 14:24 ` Keith Owens
1 sibling, 0 replies; 4+ messages in thread
From: Keith Owens @ 2001-08-08 14:24 UTC (permalink / raw)
To: Anton Altaparmakov; +Cc: torvalds, linux-kernel
On Wed, 8 Aug 2001 11:08:45 +0100 (BST),
Anton Altaparmakov <aia21@cus.cam.ac.uk> wrote:
>On Wed, 8 Aug 2001, Keith Owens wrote:
>> Correct missing () in ldm.h.
>
>Something's gone wrong with this patch. What's this __a =3D stuff that
>has appeared out of the blue in two places?
No idea how that got in there. Just to be sure, I redid all 4 patches
and recompiled to check that the kernel was OK.
Index: 8-pre6.2/drivers/ieee1394/raw1394.c
--- 8-pre6.2/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.2(w)/drivers/ieee1394/raw1394.c Wed, 08 Aug 2001 23:42:25 +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.2/drivers/char/tty_io.c
--- 8-pre6.2/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.2(w)/drivers/char/tty_io.c Wed, 08 Aug 2001 23:42:52 +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.2/drivers/ieee1394/nodemgr.c
--- 8-pre6.2/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.2(w)/drivers/ieee1394/nodemgr.c Wed, 08 Aug 2001 23:42:30 +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.2/fs/partitions/ldm.h
--- 8-pre6.2/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.2(w)/fs/partitions/ldm.h Wed, 08 Aug 2001 22:18:12 +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 = \
+ 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 = \
+ get_unaligned(&(p)->start_sect); \
le32_to_cpu(__a); \
})
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2001-08-08 14:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2001-08-08 5:29 2.4.8-pre6 - towards a clean kernel compile Keith Owens
2001-08-08 10:08 ` Anton Altaparmakov
2001-08-08 14:13 ` Ignacio Vazquez-Abrams
2001-08-08 14:24 ` Keith Owens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox