The patch titled
net drivers: fix section attributes for gcc
has been removed from the -mm tree. Its filename is
net-drivers-fix-section-attributes-for-gcc.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
If CONFIG_HOTPLUG=n, gcc doesn't like some __initdata to be const (rodata)
and other __initdata not const, so make the non-const __initdata const.
gcc errors:
drivers/net/bnx2.c:66: error: version causes a section type conflict
drivers/net/starfire.c:338: error: version causes a section type conflict
drivers/net/typhoon.c:137: error: version causes a section type conflict
drivers/net/natsemi.c:241: error: version causes a section type conflict
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/bnx2.c | 2 +-
drivers/net/natsemi.c | 2 +-
drivers/net/starfire.c | 2 +-
drivers/net/typhoon.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/net/bnx2.c~net-drivers-fix-section-attributes-for-gcc drivers/net/bnx2.c
--- devel/drivers/net/bnx2.c~net-drivers-fix-section-attributes-for-gcc 2006-04-10 23:21:20.000000000 -0700
+++ devel-akpm/drivers/net/bnx2.c 2006-04-10 23:21:20.000000000 -0700
@@ -63,7 +63,7 @@
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (5*HZ)
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
"Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("Michael Chan <mchan@xxxxxxxxxxxx>");
diff -puN drivers/net/natsemi.c~net-drivers-fix-section-attributes-for-gcc drivers/net/natsemi.c
--- devel/drivers/net/natsemi.c~net-drivers-fix-section-attributes-for-gcc 2006-04-10 23:21:20.000000000 -0700
+++ devel-akpm/drivers/net/natsemi.c 2006-04-10 23:21:20.000000000 -0700
@@ -238,7 +238,7 @@ static int full_duplex[MAX_UNITS];
#define NATSEMI_RX_LIMIT 2046 /* maximum supported by hardware */
/* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
KERN_INFO DRV_NAME " dp8381x driver, version "
DRV_VERSION ", " DRV_RELDATE "\n"
KERN_INFO " originally by Donald Becker <becker@xxxxxxxxx>\n"
diff -puN drivers/net/starfire.c~net-drivers-fix-section-attributes-for-gcc drivers/net/starfire.c
--- devel/drivers/net/starfire.c~net-drivers-fix-section-attributes-for-gcc 2006-04-10 23:21:20.000000000 -0700
+++ devel-akpm/drivers/net/starfire.c 2006-04-10 23:21:20.000000000 -0700
@@ -335,7 +335,7 @@ do { \
/* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
KERN_INFO "starfire.c:v1.03 7/26/2000 Written by Donald Becker <becker@xxxxxxxxx>\n"
KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";
diff -puN drivers/net/typhoon.c~net-drivers-fix-section-attributes-for-gcc drivers/net/typhoon.c
--- devel/drivers/net/typhoon.c~net-drivers-fix-section-attributes-for-gcc 2006-04-10 23:21:20.000000000 -0700
+++ devel-akpm/drivers/net/typhoon.c 2006-04-10 23:21:20.000000000 -0700
@@ -134,7 +134,7 @@ static const int multicast_filter_limit
#include "typhoon.h"
#include "typhoon-firmware.h"
-static char version[] __devinitdata =
+static const char version[] __devinitdata =
"typhoon.c: version " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("David Dillow <dave@xxxxxxxxxxxxxx>");
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
origin.patch
config-exit-if-no-beginning-filename.patch
git-mtd.patch
areca-raid-linux-scsi-driver.patch
git-watchdog.patch
softmac-uses-wiress-ext.patch
bcm43-wireless-fix-printk-format-warnings.patch
bcm43-fix-config-menu-alignment.patch
x86-cpuid-and-msr-notifier-callback-section-mismatches.patch
doc-vm-hugetlbpage-update-2.patch
ipmi-fix-devinit-placement.patch
config-update-usage-help-info.patch
add-poisonh-and-patch-primary-users.patch
update-2-drivers-for-poisonh.patch
tpm_infineon-section-fixup.patch
radeonfb-section-mismatches.patch
savagefb-fix-section-mismatch-warnings.patch
acpi-identify-which-device-is-not-power-manageable.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
