It's being uploaded right now, and the BK trees should already
be uptodate.
There's a x86-64 update and IRDA updates here, and a number of USB storage
fixes. The rest is pretty small. Full changelog from -rc1 appended.
Linus
----
Summary of changes from v2.6.2-rc1 to v2.6.2-rc2
============================================
Adam Kropelin:
o input: Always wait for hid request completion in hiddev before
returning to the caller process.
Andi Kleen:
o x86-64 merge
o Kconfig fixes for x86-64
Andrew Morton:
o [NET]: Do not mark dummy_free_one() __exit in dummy.c driver
o RAID-6 fixes
o document RAID-6 support in mdadm-1.5.0
o ppc64: add missing sched_balance_exec() call
o ppc64: include i2c in config
o LSI Logic MegaRAID3 PCI ID
o RAID-6 fix for IA-64
o ppc32: Fixes to the signal context code
o Fix rq_for_each_bio() macro again
o md: Fix possible hang in raid shutdown
o Fix CPU hotplug in networking
o aha1542 warning fix
o IDE build fix
o pdc202xx_new.c: fix PDC20270/1 init on the Xserve Apple machines
o Array overindexing in w9968cf
o DMI update fix
o The RAW_GETBIND compat_ioctl fails
o request_firmware(): use del_timer_sync()
o i8042 timer fix
Andrey Borzenkov:
o input: Move devfs entries for joystick into /dev/input
Bart Samwel:
o [NET]: Return 'unsigned char *' from *skb_pull*() routines
Ben Collins:
o [VIDEO]: kbuildify the promcons_tbl and logo source files
o [SPARC64]: Move setting of current_thread_info()->cpu to
smp_prepare_boot_cpu()
o [SPARC64]: Add CONFIG_DEBUG_BOOTMEM option
o [SPARC64]: Correctly mask the physical address for remapping the
kernel TLB's
o [SUNZILOG]: Fix locking in cases where UART layer has grabbed the
lock already
o [IDE]: Fix compilation warning
Chas Williams:
o [ATM]: [horizon] avoid warning about limited range of data type
Dave Jones:
o Check for MCE ability before checking registers
o PCI probing typo
o OOSTORE needs MTRR
o Reduce stack usage in w9966 driver
o Restore 2.4 MTRR feature
o logic error in aty128fb
o Remove unused CONFIG symbol
o Reduce stack usage in ttusb driver
o Correct CPUs printout on boot
o Remove useless cruft from ATM HE driver
o logic error in radeonfb
o logic error in XFS
o DMI updates from 2.4
o Update post-halloween doc url
David S. Miller:
o [SPARC64]: Fix 32-bit execve out_mm error path
o [TTUSB]: ttusb_dec.c needs linux/init.h
o [SPARC64]: Update defconfig
o [SPARC64]: Add missing sched_balance_exec() to 32-bit compat
execve()
David Stevens:
o [MULTICAST]: multicast loop with include filters fix
Dean Roehrich:
o [XFS] In xfs_bulkstat, we need to do the readahead loop always
Dirk Jagdmann:
o input: Add backslash and 102nd key to amikbd.c list of scancodes
Dmitry Torokhov:
o input: Allow Synaptics packet rate to be controlled by the
psmouse_rate= option.
o input: If we get a byte with timeout or parity flags in psmouse.c,
we take the appropriate action. (throw the byte away, reset byte
counter, return NAK if acking, and complain).
Eric Sandeen:
o [XFS] Fix for large allocation groups, so that extent sizes will
not overflow pagebuf lengths.
Gerd Knorr:
o selinux build fix
o video4linux driver documentation update
Glenn Burkhardt:
o input: Properly recompute initial values upon recalibration in
joydev
Helge Deller:
o input: Bugfixes in atkbd and psmouse-base probing. (use unsigned
char param[] in atkbd_event, like everywhere else, use param[0]
instead of *param at the same place, properly set serio->private to
NULL if probe fails in both atkbd and psmouse, and fix
preinitializing of the return buffer in *_command() funcitons.)
o input: Add support for HP PARISC keyboards to atkbd.c
Hideaki Yoshifuji:
o [IPV6]: Fix several comment spelling errors and typos
Hirofumi Ogawa:
o [netdrvr 8139cp] fix NAPI race
James Bottomley:
o drivers/scsi/Kconfig URL update: resource.cx
o aic7xxx parallel build
James Morris:
o [IPSEC]: Guard against potentially fatal stack usage for auth_data
Jean Tourrilhes:
o [IRDA]: Update dongle api
o [IRDA]: Update actisys-sir driver
o [IRDA]: Update esr-sir driver
o [IRDA]: Update tekram-sir driver
o [IRDA]: Add litelink-sir driver
o [IRDA]: Add act200l-sir driver
o [IRDA]: Add girbil-sir driver
o [IRDA]: Add ma600-sir driver
o [IRDA]: Add mcp2120-sir driver
o [IRDA]: Add old_belkin-sir driver
o [IRDA]: Kconfig changes to enable new drivers into the build, from
Martin Diehl
Jeff Garzik:
o [BK] add two helper scripts to Documentation/BK-usage
Jens Axboe:
o remove mt rainier warning
Johann Deneux:
o input: Fixes and updates of the USB ForceFeedback drivers
Krishna Kumar:
o [IPV6]: Explicity set *dst to NULL at top of ip6_dst_lookup()
Linus Torvalds:
o Fix APIC timer initialization
o Fix up he.c misuse of pci_pool_create() that slipped in.
Marcel Holtmann:
o input: Added BUS_BLUETOOTH definition for BlueTooth HID devices
Mark Haverkamp:
o Fix for aacraid and high memory on 2.6.1
Michael Hunold:
o Fix up 'linux-dvb' maintainers entry
Mikael Pettersson:
o non-integrated local APIC LVTT init compatibility
Panagiotis Issaris:
o Graphire3 support
Pavel Machek:
o input: Alt-arrow console switch is routinely dropped under high
load. This patch fixes it: alt-arrow has to start from console _we
want to switch to_, if switch is already pending.
Peter Berg Larsen:
o input: i8042.c: Add exists=0 into an error path, change the mux/aux
init order to make some of the probing code (second irq probe)
unnecessary.
Richard Henderson:
o [ALPHA] Tidy ELF_HWCAP and ELF_PLATFORM
o [ALPHA] Tidy buglets in sigreturn paths
Russell King:
o [PCMCIA] Add refcounting to struct pcmcia_bus_socket
o [PCMCIA] Get rid of racy interruptible_sleep_on()
o [PCMCIA] Remove write-only socket_dev
o [PCMCIA] Remove unused variable warnings
o [SERIAL] Eliminate a couple of redundant tests
o [SERIAL] Fix missing NULL check
o [SERIAL] Use tty_name() when printing the tty name
Rusty Russell:
o [NET]: Simplify net/flow.c per-cpu handling
Stephen Hemminger:
o [IPV6]: More missing sysctl table sentinels in addrconf.c
o Make xircom cardbus handle shared irq
Tom Rini:
o Elvis^H^H^H^H^HPaul has left the building
Ville Nuorvala:
o [IPV6]: Fix link-local address check in datagram.c
o [IPV6]: Add and use new 'strict' parameter to ip6_chk_addr()
o [IPV6]: addrconf_sysctl_forward_strategy() needs to invoke
rt6_purge_dflt_routers() too
Vojtech Pavlik:
o input: Move keycode definitions around to get as close to 2.4
compatibility as we can at the moment. This also kills KEY_103RD,
because PS/2 keyboards don't have it and everyone is expecting to
get KEY_BACKSLASH anyway. Fix rawmode generation for PrintScreen
key, too.
o input: Add support for Logitech MX700 mouse
o input: Expect only one character in interrupt in i8042.c, this
eases the load on the controller (only one status read per
interrupt). Also do polling only some time after an interrupt
happened.
o input: Add informational printk()s to atkbd.c
o input: Add IBM GamePad to the BADPAD list
o input: Key 89 is RO, not ROMAJI
o input: Add a missing space in atkbd warning message
o input: Make scancode for a Sun5 type keyboard one of those not
ignored because of protocol nastiness.
On Sun, Jan 25, 2004 at 06:48:24PM -0800, Linus Torvalds wrote:
> Summary of changes from v2.6.2-rc1 to v2.6.2-rc2
Hello Linus,
2.6.2-rc2 doesn't compile cleanly with the latest GCC 3.4 with my
configuration, because of several extern inline declarations in
include-files. The same problem existed in 2.6.2-rc1-mm2 and earlier,
and was fixed in -mm3. The fix is to simply remove 'inline' from the
funcion declaration. Andrew Morton has confirmed this and has applied
patches like this into his tree. Here are patches to fix the errors:
--- linux-2.6.2-rc2/include/linux/efi.h.orig Mon Jan 26 11:09:08 2004
+++ linux-2.6.2-rc2/include/linux/efi.h Mon Jan 26 11:09:18 2004
@@ -297,8 +297,8 @@ extern u64 efi_mem_attributes (unsigned
extern void efi_initialize_iomem_resources(struct resource *code_resource,
struct resource *data_resource);
extern efi_status_t phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc);
-extern inline unsigned long __init efi_get_time(void);
-extern inline int __init efi_set_rtc_mmss(unsigned long nowtime);
+extern unsigned long __init efi_get_time(void);
+extern int __init efi_set_rtc_mmss(unsigned long nowtime);
extern struct efi_memory_map memmap;
/*
-------
--- linux-2.6.2-rc2/include/linux/sched.h.orig Mon Jan 26 11:17:39 2004
+++ linux-2.6.2-rc2/include/linux/sched.h Mon Jan 26 11:18:35 2004
@@ -670,7 +670,7 @@ static inline int capable(int cap)
extern struct mm_struct * mm_alloc(void);
/* mmdrop drops the mm and the page tables */
-extern inline void FASTCALL(__mmdrop(struct mm_struct *));
+extern void FASTCALL(__mmdrop(struct mm_struct *));
static inline void mmdrop(struct mm_struct * mm)
{
if (atomic_dec_and_test(&mm->mm_count))
-------
--- linux-2.6.2-rc2/include/linux/bio.h.orig Mon Jan 26 11:22:45 2004
+++ linux-2.6.2-rc2/include/linux/bio.h Mon Jan 26 11:23:05 2004
@@ -231,8 +231,8 @@ extern void bio_put(struct bio *);
extern void bio_endio(struct bio *, unsigned int, int);
struct request_queue;
-extern inline int bio_phys_segments(struct request_queue *, struct bio *);
-extern inline int bio_hw_segments(struct request_queue *, struct bio *);
+extern int bio_phys_segments(struct request_queue *, struct bio *);
+extern int bio_hw_segments(struct request_queue *, struct bio *);
extern inline void __bio_clone(struct bio *, struct bio *);
extern struct bio *bio_clone(struct bio *, int);
-------
--- linux-2.6.2-rc2/include/linux/elevator.h.orig Mon Jan 26 11:25:09 2004
+++ linux-2.6.2-rc2/include/linux/elevator.h Mon Jan 26 11:25:30 2004
@@ -96,9 +96,9 @@ extern elevator_t iosched_as;
extern int elevator_init(request_queue_t *, elevator_t *);
extern void elevator_exit(request_queue_t *);
-extern inline int elv_rq_merge_ok(struct request *, struct bio *);
-extern inline int elv_try_merge(struct request *, struct bio *);
-extern inline int elv_try_last_merge(request_queue_t *, struct bio *);
+extern int elv_rq_merge_ok(struct request *, struct bio *);
+extern int elv_try_merge(struct request *, struct bio *);
+extern int elv_try_last_merge(request_queue_t *, struct bio *);
/*
* Return values from elevator merger
-------
--- linux-2.6.2-rc2/include/linux/ide.h.orig Mon Jan 26 11:27:37 2004
+++ linux-2.6.2-rc2/include/linux/ide.h Mon Jan 26 11:28:36 2004
@@ -1417,12 +1417,12 @@ typedef struct pkt_task_s {
void *special;
} pkt_task_t;
-extern inline u32 ide_read_24(ide_drive_t *);
+extern u32 ide_read_24(ide_drive_t *);
-extern inline void SELECT_DRIVE(ide_drive_t *);
-extern inline void SELECT_INTERRUPT(ide_drive_t *);
-extern inline void SELECT_MASK(ide_drive_t *, int);
-extern inline void QUIRK_LIST(ide_drive_t *);
+extern void SELECT_DRIVE(ide_drive_t *);
+extern void SELECT_INTERRUPT(ide_drive_t *);
+extern void SELECT_MASK(ide_drive_t *, int);
+extern void QUIRK_LIST(ide_drive_t *);
extern void ata_input_data(ide_drive_t *, void *, u32);
extern void ata_output_data(ide_drive_t *, void *, u32);
-------
I understand if you won't apply these int your tree. Perhaps the same
fixes are on their way into the vanilla kernel from Andrew's tree. If
that's the case, you can feel free to ignore these patches.
Tim Cambrant
On Sun, Jan 25, 2004 at 06:48:24PM -0800, Linus Torvalds wrote:
>...
> Summary of changes from v2.6.2-rc1 to v2.6.2-rc2
> ============================================
>...
> Jean Tourrilhes:
> o [IRDA]: Update dongle api
> o [IRDA]: Update actisys-sir driver
> o [IRDA]: Update esr-sir driver
> o [IRDA]: Update tekram-sir driver
> o [IRDA]: Add litelink-sir driver
> o [IRDA]: Add act200l-sir driver
> o [IRDA]: Add girbil-sir driver
> o [IRDA]: Add ma600-sir driver
> o [IRDA]: Add mcp2120-sir driver
> o [IRDA]: Add old_belkin-sir driver
> o [IRDA]: Kconfig changes to enable new drivers into the build, from
> Martin Diehl
>...
This change causes the following compile error when trying to compile
an old plus a new version of one driver statically into the kernel:
<-- snip -->
...
LD drivers/net/irda/built-in.o
drivers/net/irda/girbil-sir.o(.init.text+0x0): In function `girbil_init':
: multiple definition of `girbil_init'
drivers/net/irda/girbil.o(.init.text+0x0): first defined here
drivers/net/irda/girbil-sir.o(.exit.text+0x0): In function `girbil_cleanup':
: multiple definition of `girbil_cleanup'
drivers/net/irda/girbil.o(.exit.text+0x0): first defined here
drivers/net/irda/old_belkin-sir.o(.init.text+0x0): In function `old_belkin_init':
: multiple definition of `old_belkin_init'
drivers/net/irda/old_belkin.o(.init.text+0x0): first defined here
drivers/net/irda/old_belkin-sir.o(.exit.text+0x0): In function
`old_belkin_cleanup':
: multiple definition of `old_belkin_cleanup'
drivers/net/irda/old_belkin.o(.exit.text+0x0): first defined here
drivers/net/irda/mcp2120-sir.o(.init.text+0x0): In function `mcp2120_init':
: multiple definition of `mcp2120_init'
drivers/net/irda/mcp2120.o(.init.text+0x0): first defined here
drivers/net/irda/mcp2120-sir.o(.exit.text+0x0): In function `mcp2120_cleanup':
: multiple definition of `mcp2120_cleanup'
drivers/net/irda/mcp2120.o(.exit.text+0x0): first defined here
drivers/net/irda/act200l-sir.o(.init.text+0x0): In function `act200l_init':
: multiple definition of `act200l_init'
drivers/net/irda/act200l.o(.init.text+0x0): first defined here
drivers/net/irda/act200l-sir.o(.exit.text+0x0): In function `act200l_cleanup':
: multiple definition of `act200l_cleanup'
drivers/net/irda/act200l.o(.exit.text+0x0): first defined here
make[3]: *** [drivers/net/irda/built-in.o] Error 1
<-- snip -->
The patch below fixes this issue by disallowing building an old driver
if the new driver was included staticallly.
Please apply
Adrian
--- linux-2.6.2-rc2-full/drivers/net/irda/Kconfig.old 2004-01-26 19:40:41.000000000 +0100
+++ linux-2.6.2-rc2-full/drivers/net/irda/Kconfig 2004-01-26 19:46:43.000000000 +0100
@@ -201,7 +201,7 @@
config GIRBIL_DONGLE_OLD
tristate "Greenwich GIrBIL dongle"
- depends on DONGLE_OLD && IRDA
+ depends on DONGLE_OLD && IRDA && GIRBIL_DONGLE!=y
help
Say Y here if you want to build support for the Greenwich GIrBIL
dongle. To compile it as a module, choose M here. The Greenwich
@@ -223,7 +223,7 @@
config MCP2120_DONGLE_OLD
tristate "Microchip MCP2120"
- depends on DONGLE_OLD && IRDA
+ depends on DONGLE_OLD && IRDA && MCP2120_DONGLE!=y
help
Say Y here if you want to build support for the Microchip MCP2120
dongle. To compile it as a module, choose M here. The MCP2120 dongle
@@ -237,7 +237,7 @@
config OLD_BELKIN_DONGLE_OLD
tristate "Old Belkin dongle"
- depends on DONGLE_OLD && IRDA
+ depends on DONGLE_OLD && IRDA && OLD_BELKIN_DONGLE!=y
help
Say Y here if you want to build support for the Adaptec Airport 1000
and 2000 dongles. To compile it as a module, choose M here: the module
@@ -246,7 +246,7 @@
config ACT200L_DONGLE_OLD
tristate "ACTiSYS IR-200L dongle (EXPERIMENTAL)"
- depends on DONGLE_OLD && EXPERIMENTAL && IRDA
+ depends on DONGLE_OLD && EXPERIMENTAL && IRDA && ACT200L_DONGLE!=y
help
Say Y here if you want to build support for the ACTiSYS IR-200L
dongle. To compile it as a module, choose M here. The ACTiSYS
From: Adrian Bunk <[email protected]>
Date: Mon, 26 Jan 2004 21:58:29 +0100
This change causes the following compile error when trying to compile
an old plus a new version of one driver statically into the kernel:
That's not the right fix, just mark these init routines static.
I'll do that, thanks for the report.
On Mon, Jan 26, 2004 at 12:57:13PM -0800, David S. Miller wrote:
> From: Adrian Bunk <[email protected]>
> Date: Mon, 26 Jan 2004 21:58:29 +0100
>
> This change causes the following compile error when trying to compile
> an old plus a new version of one driver statically into the kernel:
>
> That's not the right fix, just mark these init routines static.
>
> I'll do that, thanks for the report.
I've just sent the following patch to Andrew (following his
bug report), and I think it's slightly better and safer. Sorry I
forgot to cc you.
Jean
---------------------------------------------------------
diff -u -p linux/drivers/net/irda.d6b/act200l-sir.c linux/drivers/net/irda/act200l-sir.c
--- linux/drivers/net/irda.d6b/act200l-sir.c Thu Jan 22 16:43:35 2004
+++ linux/drivers/net/irda/act200l-sir.c Mon Jan 26 09:42:08 2004
@@ -93,12 +93,12 @@ static struct dongle_driver act200l = {
.set_speed = act200l_change_speed,
};
-int __init act200l_init(void)
+int __init act200l_sir_init(void)
{
return irda_register_dongle(&act200l);
}
-void __exit act200l_cleanup(void)
+void __exit act200l_sir_cleanup(void)
{
irda_unregister_dongle(&act200l);
}
@@ -254,5 +254,5 @@ MODULE_DESCRIPTION("ACTiSYS ACT-IR200L d
MODULE_LICENSE("GPL");
MODULE_ALIAS("irda-dongle-10"); /* IRDA_ACT200L_DONGLE */
-module_init(act200l_init);
-module_exit(act200l_cleanup);
+module_init(act200l_sir_init);
+module_exit(act200l_sir_cleanup);
diff -u -p linux/drivers/net/irda.d6b/girbil-sir.c linux/drivers/net/irda/girbil-sir.c
--- linux/drivers/net/irda.d6b/girbil-sir.c Thu Jan 22 16:43:39 2004
+++ linux/drivers/net/irda/girbil-sir.c Mon Jan 26 09:39:51 2004
@@ -72,12 +72,12 @@ static struct dongle_driver girbil = {
.set_speed = girbil_change_speed,
};
-int __init girbil_init(void)
+int __init girbil_sir_init(void)
{
return irda_register_dongle(&girbil);
}
-void __exit girbil_cleanup(void)
+void __exit girbil_sir_cleanup(void)
{
irda_unregister_dongle(&girbil);
}
@@ -254,5 +254,5 @@ MODULE_DESCRIPTION("Greenwich GIrBIL don
MODULE_LICENSE("GPL");
MODULE_ALIAS("irda-dongle-4"); /* IRDA_GIRBIL_DONGLE */
-module_init(girbil_init);
-module_exit(girbil_cleanup);
+module_init(girbil_sir_init);
+module_exit(girbil_sir_cleanup);
diff -u -p linux/drivers/net/irda.d6b/mcp2120-sir.c linux/drivers/net/irda/mcp2120-sir.c
--- linux/drivers/net/irda.d6b/mcp2120-sir.c Thu Jan 22 16:43:49 2004
+++ linux/drivers/net/irda/mcp2120-sir.c Mon Jan 26 09:41:41 2004
@@ -49,12 +49,12 @@ static struct dongle_driver mcp2120 = {
.set_speed = mcp2120_change_speed,
};
-int __init mcp2120_init(void)
+int __init mcp2120_sir_init(void)
{
return irda_register_dongle(&mcp2120);
}
-void __exit mcp2120_cleanup(void)
+void __exit mcp2120_sir_cleanup(void)
{
irda_unregister_dongle(&mcp2120);
}
@@ -226,5 +226,5 @@ MODULE_DESCRIPTION("Microchip MCP2120");
MODULE_LICENSE("GPL");
MODULE_ALIAS("irda-dongle-9"); /* IRDA_MCP2120_DONGLE */
-module_init(mcp2120_init);
-module_exit(mcp2120_cleanup);
+module_init(mcp2120_sir_init);
+module_exit(mcp2120_sir_cleanup);
diff -u -p linux/drivers/net/irda.d6b/old_belkin-sir.c linux/drivers/net/irda/old_belkin-sir.c
--- linux/drivers/net/irda.d6b/old_belkin-sir.c Thu Jan 22 16:43:52 2004
+++ linux/drivers/net/irda/old_belkin-sir.c Mon Jan 26 09:41:06 2004
@@ -78,12 +78,12 @@ static struct dongle_driver old_belkin =
.set_speed = old_belkin_change_speed,
};
-int __init old_belkin_init(void)
+int __init old_belkin_sir_init(void)
{
return irda_register_dongle(&old_belkin);
}
-void __exit old_belkin_cleanup(void)
+void __exit old_belkin_sir_cleanup(void)
{
irda_unregister_dongle(&old_belkin);
}
@@ -152,5 +152,5 @@ MODULE_DESCRIPTION("Belkin (old) SmartBe
MODULE_LICENSE("GPL");
MODULE_ALIAS("irda-dongle-7"); /* IRDA_OLD_BELKIN_DONGLE */
-module_init(old_belkin_init);
-module_exit(old_belkin_cleanup);
+module_init(old_belkin_sir_init);
+module_exit(old_belkin_sir_cleanup);
From: Jean Tourrilhes <[email protected]>
Date: Mon, 26 Jan 2004 13:16:03 -0800
I've just sent the following patch to Andrew (following his
bug report), and I think it's slightly better and safer. Sorry I
forgot to cc you.
In my personal opinion it's worse not better.
Andrew, back out jt's version of the fix from your tree, I'll
send Linus the correct fix (attached below). I verified that
nothing external wants to get at any of these symbols.
Thanks everyone.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1520 -> 1.1521
# drivers/net/irda/via-ircc.c 1.6 -> 1.7
# drivers/net/irda/nsc-ircc.c 1.29 -> 1.30
# drivers/net/irda/girbil.c 1.8 -> 1.9
# drivers/net/irda/ep7211_ir.c 1.5 -> 1.6
# drivers/net/irda/litelink-sir.c 1.1 -> 1.2
# drivers/net/irda/tekram-sir.c 1.4 -> 1.5
# drivers/net/irda/act200l-sir.c 1.1 -> 1.2
# drivers/net/irda/w83977af_ir.c 1.23 -> 1.24
# drivers/net/irda/ali-ircc.c 1.24 -> 1.25
# drivers/net/irda/ma600.c 1.7 -> 1.8
# drivers/net/irda/girbil-sir.c 1.1 -> 1.2
# drivers/net/irda/act200l.c 1.7 -> 1.8
# drivers/net/irda/esi.c 1.6 -> 1.7
# drivers/net/irda/litelink.c 1.6 -> 1.7
# drivers/net/irda/tekram.c 1.9 -> 1.10
# drivers/net/irda/actisys-sir.c 1.4 -> 1.5
# drivers/net/irda/smsc-ircc2.c 1.8 -> 1.9
# drivers/net/irda/ma600-sir.c 1.1 -> 1.2
# drivers/net/irda/irport.c 1.21 -> 1.22
# drivers/net/irda/mcp2120-sir.c 1.1 -> 1.2
# drivers/net/irda/old_belkin-sir.c 1.1 -> 1.2
# drivers/net/irda/old_belkin.c 1.8 -> 1.9
# drivers/net/irda/mcp2120.c 1.7 -> 1.8
# drivers/net/irda/actisys.c 1.9 -> 1.10
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/01/26 [email protected] 1.1521
# [IRDA]: Mark init/exit functions of drivers static to fix build.
# --------------------------------------------
#
diff -Nru a/drivers/net/irda/act200l-sir.c b/drivers/net/irda/act200l-sir.c
--- a/drivers/net/irda/act200l-sir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/act200l-sir.c Mon Jan 26 13:20:40 2004
@@ -93,12 +93,12 @@
.set_speed = act200l_change_speed,
};
-int __init act200l_init(void)
+static int __init act200l_init(void)
{
return irda_register_dongle(&act200l);
}
-void __exit act200l_cleanup(void)
+static void __exit act200l_cleanup(void)
{
irda_unregister_dongle(&act200l);
}
diff -Nru a/drivers/net/irda/act200l.c b/drivers/net/irda/act200l.c
--- a/drivers/net/irda/act200l.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/act200l.c Mon Jan 26 13:20:40 2004
@@ -92,12 +92,12 @@
.owner = THIS_MODULE,
};
-int __init act200l_init(void)
+static int __init act200l_init(void)
{
return irda_device_register_dongle(&dongle);
}
-void __exit act200l_cleanup(void)
+static void __exit act200l_cleanup(void)
{
irda_device_unregister_dongle(&dongle);
}
diff -Nru a/drivers/net/irda/actisys-sir.c b/drivers/net/irda/actisys-sir.c
--- a/drivers/net/irda/actisys-sir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/actisys-sir.c Mon Jan 26 13:20:40 2004
@@ -89,7 +89,7 @@
.set_speed = actisys_change_speed,
};
-int __init actisys_sir_init(void)
+static int __init actisys_sir_init(void)
{
int ret;
@@ -107,7 +107,7 @@
return 0;
}
-void __exit actisys_sir_cleanup(void)
+static void __exit actisys_sir_cleanup(void)
{
/* We have to remove both dongles */
irda_unregister_dongle(&act220l_plus);
diff -Nru a/drivers/net/irda/actisys.c b/drivers/net/irda/actisys.c
--- a/drivers/net/irda/actisys.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/actisys.c Mon Jan 26 13:20:40 2004
@@ -91,7 +91,7 @@
* So, we register a dongle of each sort and let irattach
* pick the right one...
*/
-int __init actisys_init(void)
+static int __init actisys_init(void)
{
int ret;
@@ -108,7 +108,7 @@
return 0;
}
-void __exit actisys_cleanup(void)
+static void __exit actisys_cleanup(void)
{
/* We have to remove both dongles */
irda_device_unregister_dongle(&dongle);
diff -Nru a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
--- a/drivers/net/irda/ali-ircc.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/ali-ircc.c Mon Jan 26 13:20:40 2004
@@ -133,7 +133,7 @@
* Initialize chip. Find out whay kinds of chips we are dealing with
* and their configuation registers address
*/
-int __init ali_ircc_init(void)
+static int __init ali_ircc_init(void)
{
ali_chip_t *chip;
chipio_t info;
diff -Nru a/drivers/net/irda/ep7211_ir.c b/drivers/net/irda/ep7211_ir.c
--- a/drivers/net/irda/ep7211_ir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/ep7211_ir.c Mon Jan 26 13:20:40 2004
@@ -97,7 +97,7 @@
* Initialize EP7211 I/R module
*
*/
-int __init ep7211_ir_init(void)
+static int __init ep7211_ir_init(void)
{
return irda_device_register_dongle(&dongle);
}
diff -Nru a/drivers/net/irda/esi.c b/drivers/net/irda/esi.c
--- a/drivers/net/irda/esi.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/esi.c Mon Jan 26 13:20:40 2004
@@ -52,12 +52,12 @@
.owner = THIS_MODULE,
};
-int __init esi_init(void)
+static int __init esi_init(void)
{
return irda_device_register_dongle(&dongle);
}
-void __exit esi_cleanup(void)
+static void __exit esi_cleanup(void)
{
irda_device_unregister_dongle(&dongle);
}
diff -Nru a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c
--- a/drivers/net/irda/girbil-sir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/girbil-sir.c Mon Jan 26 13:20:40 2004
@@ -72,12 +72,12 @@
.set_speed = girbil_change_speed,
};
-int __init girbil_init(void)
+static int __init girbil_init(void)
{
return irda_register_dongle(&girbil);
}
-void __exit girbil_cleanup(void)
+static void __exit girbil_cleanup(void)
{
irda_unregister_dongle(&girbil);
}
diff -Nru a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c
--- a/drivers/net/irda/girbil.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/girbil.c Mon Jan 26 13:20:40 2004
@@ -71,12 +71,12 @@
.owner = THIS_MODULE,
};
-int __init girbil_init(void)
+static int __init girbil_init(void)
{
return irda_device_register_dongle(&dongle);
}
-void __exit girbil_cleanup(void)
+static void __exit girbil_cleanup(void)
{
irda_device_unregister_dongle(&dongle);
}
diff -Nru a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
--- a/drivers/net/irda/irport.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/irport.c Mon Jan 26 13:20:40 2004
@@ -98,7 +98,7 @@
EXPORT_SYMBOL(irport_net_open);
EXPORT_SYMBOL(irport_net_close);
-int __init irport_init(void)
+static int __init irport_init(void)
{
int i;
diff -Nru a/drivers/net/irda/litelink-sir.c b/drivers/net/irda/litelink-sir.c
--- a/drivers/net/irda/litelink-sir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/litelink-sir.c Mon Jan 26 13:20:40 2004
@@ -64,12 +64,12 @@
.set_speed = litelink_change_speed,
};
-int __init litelink_sir_init(void)
+static int __init litelink_sir_init(void)
{
return irda_register_dongle(&litelink);
}
-void __exit litelink_sir_cleanup(void)
+static void __exit litelink_sir_cleanup(void)
{
irda_unregister_dongle(&litelink);
}
diff -Nru a/drivers/net/irda/litelink.c b/drivers/net/irda/litelink.c
--- a/drivers/net/irda/litelink.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/litelink.c Mon Jan 26 13:20:40 2004
@@ -56,12 +56,12 @@
.owner = THIS_MODULE,
};
-int __init litelink_init(void)
+static int __init litelink_init(void)
{
return irda_device_register_dongle(&dongle);
}
-void __exit litelink_cleanup(void)
+static void __exit litelink_cleanup(void)
{
irda_device_unregister_dongle(&dongle);
}
diff -Nru a/drivers/net/irda/ma600-sir.c b/drivers/net/irda/ma600-sir.c
--- a/drivers/net/irda/ma600-sir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/ma600-sir.c Mon Jan 26 13:20:40 2004
@@ -66,13 +66,13 @@
};
-int __init ma600_sir_init(void)
+static int __init ma600_sir_init(void)
{
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
return irda_register_dongle(&ma600);
}
-void __exit ma600_sir_cleanup(void)
+static void __exit ma600_sir_cleanup(void)
{
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
irda_unregister_dongle(&ma600);
diff -Nru a/drivers/net/irda/ma600.c b/drivers/net/irda/ma600.c
--- a/drivers/net/irda/ma600.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/ma600.c Mon Jan 26 13:20:40 2004
@@ -82,13 +82,13 @@
.owner = THIS_MODULE,
};
-int __init ma600_init(void)
+static int __init ma600_init(void)
{
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
return irda_device_register_dongle(&dongle);
}
-void __exit ma600_cleanup(void)
+static void __exit ma600_cleanup(void)
{
IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
irda_device_unregister_dongle(&dongle);
diff -Nru a/drivers/net/irda/mcp2120-sir.c b/drivers/net/irda/mcp2120-sir.c
--- a/drivers/net/irda/mcp2120-sir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/mcp2120-sir.c Mon Jan 26 13:20:40 2004
@@ -49,12 +49,12 @@
.set_speed = mcp2120_change_speed,
};
-int __init mcp2120_init(void)
+static int __init mcp2120_init(void)
{
return irda_register_dongle(&mcp2120);
}
-void __exit mcp2120_cleanup(void)
+static void __exit mcp2120_cleanup(void)
{
irda_unregister_dongle(&mcp2120);
}
diff -Nru a/drivers/net/irda/mcp2120.c b/drivers/net/irda/mcp2120.c
--- a/drivers/net/irda/mcp2120.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/mcp2120.c Mon Jan 26 13:20:40 2004
@@ -48,12 +48,12 @@
.owner = THIS_MODULE,
};
-int __init mcp2120_init(void)
+static int __init mcp2120_init(void)
{
return irda_device_register_dongle(&dongle);
}
-void __exit mcp2120_cleanup(void)
+static void __exit mcp2120_cleanup(void)
{
irda_device_unregister_dongle(&dongle);
}
diff -Nru a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
--- a/drivers/net/irda/nsc-ircc.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/nsc-ircc.c Mon Jan 26 13:20:40 2004
@@ -155,7 +155,7 @@
* Initialize chip. Just try to find out how many chips we are dealing with
* and where they are
*/
-int __init nsc_ircc_init(void)
+static int __init nsc_ircc_init(void)
{
chipio_t info;
nsc_chip_t *chip;
diff -Nru a/drivers/net/irda/old_belkin-sir.c b/drivers/net/irda/old_belkin-sir.c
--- a/drivers/net/irda/old_belkin-sir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/old_belkin-sir.c Mon Jan 26 13:20:40 2004
@@ -78,12 +78,12 @@
.set_speed = old_belkin_change_speed,
};
-int __init old_belkin_init(void)
+static int __init old_belkin_init(void)
{
return irda_register_dongle(&old_belkin);
}
-void __exit old_belkin_cleanup(void)
+static void __exit old_belkin_cleanup(void)
{
irda_unregister_dongle(&old_belkin);
}
diff -Nru a/drivers/net/irda/old_belkin.c b/drivers/net/irda/old_belkin.c
--- a/drivers/net/irda/old_belkin.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/old_belkin.c Mon Jan 26 13:20:40 2004
@@ -82,12 +82,12 @@
.owner = THIS_MODULE,
};
-int __init old_belkin_init(void)
+static int __init old_belkin_init(void)
{
return irda_device_register_dongle(&dongle);
}
-void __exit old_belkin_cleanup(void)
+static void __exit old_belkin_cleanup(void)
{
irda_device_unregister_dongle(&dongle);
}
diff -Nru a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
--- a/drivers/net/irda/smsc-ircc2.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/smsc-ircc2.c Mon Jan 26 13:20:40 2004
@@ -322,7 +322,7 @@
* Initialize chip. Just try to find out how many chips we are dealing with
* and where they are
*/
-int __init smsc_ircc_init(void)
+static int __init smsc_ircc_init(void)
{
int ret=-ENODEV;
@@ -1727,7 +1727,7 @@
return 0;
}
-void __exit smsc_ircc_cleanup(void)
+static void __exit smsc_ircc_cleanup(void)
{
int i;
diff -Nru a/drivers/net/irda/tekram-sir.c b/drivers/net/irda/tekram-sir.c
--- a/drivers/net/irda/tekram-sir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/tekram-sir.c Mon Jan 26 13:20:40 2004
@@ -59,7 +59,7 @@
.set_speed = tekram_change_speed,
};
-int __init tekram_sir_init(void)
+static int __init tekram_sir_init(void)
{
if (tekram_delay < 1 || tekram_delay > 500)
tekram_delay = 200;
@@ -68,7 +68,7 @@
return irda_register_dongle(&tekram);
}
-void __exit tekram_sir_cleanup(void)
+static void __exit tekram_sir_cleanup(void)
{
irda_unregister_dongle(&tekram);
}
diff -Nru a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c
--- a/drivers/net/irda/tekram.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/tekram.c Mon Jan 26 13:20:40 2004
@@ -52,12 +52,12 @@
.owner = THIS_MODULE,
};
-int __init tekram_init(void)
+static int __init tekram_init(void)
{
return irda_device_register_dongle(&dongle);
}
-void __exit tekram_cleanup(void)
+static void __exit tekram_cleanup(void)
{
irda_device_unregister_dongle(&dongle);
}
diff -Nru a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
--- a/drivers/net/irda/via-ircc.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/via-ircc.c Mon Jan 26 13:20:40 2004
@@ -145,7 +145,7 @@
*
* Initialize chip. Just find out chip type and resource.
*/
-int __init via_ircc_init(void)
+static int __init via_ircc_init(void)
{
int rc;
diff -Nru a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
--- a/drivers/net/irda/w83977af_ir.c Mon Jan 26 13:20:40 2004
+++ b/drivers/net/irda/w83977af_ir.c Mon Jan 26 13:20:40 2004
@@ -110,7 +110,7 @@
* Initialize chip. Just try to find out how many chips we are dealing with
* and where they are
*/
-int __init w83977af_init(void)
+static int __init w83977af_init(void)
{
int i;
@@ -129,7 +129,7 @@
* Close all configured chips
*
*/
-void __exit w83977af_cleanup(void)
+static void __exit w83977af_cleanup(void)
{
int i;
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Linus Torvalds wrote:
| It's being uploaded right now, and the BK trees should already
| be uptodate.
|
| There's a x86-64 update and IRDA updates here, and a number of USB storage
| fixes. The rest is pretty small. Full changelog from -rc1 appended.
| Tom Rini:
| o Elvis^H^H^H^H^HPaul has left the building
so, he left with the "I can enter The Plug & Play Setup" ;)
bad thing:
* Device Drivers >> Plug & Play Setup is no longer accessible [was in -rc1]
good thing:
my | \ on my japanese 106 key PS/2 keyboard works... without loading my
setkeys file. magic? santa?
- --
Clemens Schwaighofer - IT Engineer & System Administration
==========================================================
Tequila Japan, 6-17-2 Ginza Chuo-ku, Tokyo 104-8167, JAPAN
Tel: +81-(0)3-3545-7703 Fax: +81-(0)3-3545-7343
http://www.tequila.jp
==========================================================
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFAFcwYjBz/yQjBxz8RAm90AKDkwcIHaydiP2ZWMQqZZ98Uf9rI/gCgqQxr
eD6/9RcY9fUJwVIx4X20Tyw=
=jYIq
-----END PGP SIGNATURE-----
Linus Torvalds wrote:
> It's being uploaded right now, and the BK trees should already
> be uptodate.
>
> There's a x86-64 update and IRDA updates here, and a number of USB storage
> fixes. The rest is pretty small. Full changelog from -rc1 appended.
>
> Linus
>
Did someone change the Intel CPU detection code in this version?
It won't boot on my dual athlon MP system.
2.6.2-rc1 does boot.
thomas
I knew I should of check the mm's first..
2.6.2-rc2 won't boot, 2.6.2-rc2-mm1 does..
sorry.
thomas
Thomas Davis wrote:
> Linus Torvalds wrote:
>
>> It's being uploaded right now, and the BK trees should already
>> be uptodate.
>>
>> There's a x86-64 update and IRDA updates here, and a number of USB
>> storage
>> fixes. The rest is pretty small. Full changelog from -rc1 appended.
>>
>> Linus
>>
>
> Did someone change the Intel CPU detection code in this version?
>
> It won't boot on my dual athlon MP system.
>
> 2.6.2-rc1 does boot.
>
> thomas
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/