Fix linux-2.6.18-xen.hg build on ia64 build using gcc-3.2
Subsystems (4)
PATCH 1/1 Fix linux-2.6.18-xen.hg build on ia64 build using gcc-3.2
These patches are backports from git. They fix compilation of linux-2.6.18-xen.hg on ia64 using gcc-3.2.
6 files changed, 12 insertions(+), 8 deletions(-) drivers/acpi/resources/rsxface.c | 2 -- drivers/input/gameport/gameport.c | 2 -- include/linux/moduleparam.h | 12 +++++++++++- kernel/hrtimer.c | 2 +- net/core/neighbour.c | 1 - net/core/skbuff.c | 1 -
PATCH 1/1 Fix section type conflict in hrtimer.c
1 file changed, 1 insertion(+), 1 deletion(-)
kernel/hrtimer.c | 2 +-
# HG changeset patch
# User Aron Griffis <[email protected]>
# Date 1204392186 18000
# Node ID 3bbd64171a6c9cbfa1486e621c2de0cef698d6bb # Parent eb906651be99d2e93850f809a70c32bf60881b01 Fix section type conflict in hrtimer.c
Backport from git d316c57ff6bfad9557462b9100f25c6260d2b774
kernel/hrtimer.c +1 -1
@@ -59,7 +59,7 @@ static ktime_t ktime_get(void)* * returns the time in ktime_t format */ -static ktime_t ktime_get_real (void ) +ktime_t ktime_get_real (void ) {struct timespec now;
PATCH 1/1 Fix section type mismatch in rsxface.c
In reply to Aron Griffis1 file changed, 2 deletions(-)
drivers/acpi/resources/rsxface.c | 2 --
# HG changeset patch
# User Aron Griffis <[email protected]>
# Date 1204392186 18000
# Node ID af1aa1f9d90899ef8026332d6c67175721666a1c # Parent 3bbd64171a6c9cbfa1486e621c2de0cef698d6bb Fix section type mismatch in rsxface.c
Backport from git cd5bfea278987ebfe60f3ff92a01696b17c4f978
drivers/acpi/resources/rsxface.c +0 -2
@@ -476,8 +476,6 @@ acpi_rs_match_vendor_resource(struct acpreturn (AE_CTRL_TERMINATE ); } -ACPI_EXPORT_SYMBOL (acpi_rs_match_vendor_resource) -/******************************************************************************* * * FUNCTION: acpi_walk_resources
PATCH 1/1 moduleparam: fix ia64 compile failure
In reply to Aron Griffis1 file changed, 11 insertions(+), 1 deletion(-)
include/linux/moduleparam.h | 12 +++++++++++-
# HG changeset patch
# User Aron Griffis <[email protected]>
# Date 1204392186 18000
# Node ID 48139104906664e9ee9c83a53a45a0c1c61a1200 # Parent af1aa1f9d90899ef8026332d6c67175721666a1c
moduleparam: fix ia64 compile failure
Backport from git 91d35dd93e14c34539a8005183ea500f25caad02
include/linux/moduleparam.h +11 -1
@@ -58,13 +58,23 @@ struct kparam_arrayvoid *elem; }; +/* On alpha, ia64 and ppc64 relocations to global data cannot go into +read-only sections (which is part of respective UNIX ABI on these +platforms). So 'const' makes no sense and even causes compile failures +with some compilers. */ +#if defined(CONFIG_ALPHA ) || defined(CONFIG_IA64 ) || defined(CONFIG_PPC64 ) +#define __moduleparam_const +#else +#define __moduleparam_const const +#endif +/* This is the fundamental function for registering boot/module parameters. perm sets the visibility in driverfs: 000 means it's not there, read bits mean it's readable, write bits mean it's writable. */ #define __module_param_call (prefix, name, set, get, arg, perm) \ static char __param_str_##name[] = prefix #name; \ - static struct kernel_param const __param_##name \ + static struct kernel_param __moduleparam_const __param_##name \ __attribute_used__ \ __attribute__ ((unused,__section__ ("__param"),aligned(sizeof(void *)))) \ = { __param_str_##name, perm, set, get, arg }
PATCH 1/1 Fix section type conflict in skbuff.c
In reply to Aron Griffis1 file changed, 1 deletion(-)
net/core/skbuff.c | 1 -
# HG changeset patch
# User Aron Griffis <[email protected]>
# Date 1204392186 18000
# Node ID 64ee350b4f8a3a5a5d996072cdf8c444b507b27f # Parent 48139104906664e9ee9c83a53a45a0c1c61a1200 Fix section type conflict in skbuff.c
Backport from git 2cd052e44329dd2b42eb958f8f346b053de6e2cd
net/core/skbuff.c +0 -1
@@ -2076,7 +2076,6 @@ EXPORT_SYMBOL(pskb_expand_head);EXPORT_SYMBOL (pskb_expand_head);EXPORT_SYMBOL (skb_checksum);EXPORT_SYMBOL (skb_clone); -EXPORT_SYMBOL (skb_clone_fraglist);EXPORT_SYMBOL (skb_copy);EXPORT_SYMBOL (skb_copy_and_csum_bits);EXPORT_SYMBOL (skb_copy_and_csum_dev);
PATCH 1/1 Fix section type mismatch in neighbor.c
In reply to Aron Griffis1 file changed, 1 deletion(-)
net/core/neighbour.c | 1 -
# HG changeset patch
# User Aron Griffis <[email protected]>
# Date 1204392186 18000
# Node ID 7f75eee8db633c2172747b0abfb61e4cdd999a42 # Parent 64ee350b4f8a3a5a5d996072cdf8c444b507b27f Fix section type mismatch in neighbor.c
Backport from git e92b43a3455d3e817c13481bb3ea3cd29d0a47f4
net/core/neighbour.c +0 -1
@@ -2679,7 +2679,6 @@ EXPORT_SYMBOL(neigh_table_init);EXPORT_SYMBOL (neigh_table_init);EXPORT_SYMBOL (neigh_table_init_no_netlink);EXPORT_SYMBOL (neigh_update); -EXPORT_SYMBOL (neigh_update_hhs);EXPORT_SYMBOL (pneigh_enqueue);EXPORT_SYMBOL (pneigh_lookup);EXPORT_SYMBOL (neightbl_dump_info);
PATCH 1/1 Fix section type mismatch in gameport.c
In reply to Aron Griffis1 file changed, 2 deletions(-)
drivers/input/gameport/gameport.c | 2 --
# HG changeset patch
# User Aron Griffis <[email protected]>
# Date 1204392186 18000
# Node ID 301f0f2edfb4f4405bd12ddcd7b64d57298b6894 # Parent 7f75eee8db633c2172747b0abfb61e4cdd999a42 Fix section type mismatch in gameport.c
Backport from git f5ad58675149077b2046905d54fb831873288058
drivers/input/gameport/gameport.c +0 -2
@@ -37,8 +37,6 @@ EXPORT_SYMBOL(gameport_open);EXPORT_SYMBOL (gameport_open);EXPORT_SYMBOL (gameport_close);EXPORT_SYMBOL (gameport_rescan); -EXPORT_SYMBOL (gameport_cooked_read); -EXPORT_SYMBOL (gameport_set_name);EXPORT_SYMBOL (gameport_set_phys);EXPORT_SYMBOL (gameport_start_polling);EXPORT_SYMBOL (gameport_stop_polling);