Commit b7c1dee7 authored by Jun Nakajima's avatar Jun Nakajima Committed by Linus Torvalds

[PATCH] fixes for building kernel 2.5.45 using Intel compiler

I like Alan's idea: IGNLABEL("HmacRxAccepted")
parent 60cd84fd
...@@ -110,7 +110,7 @@ asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int turn_on) ...@@ -110,7 +110,7 @@ asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int turn_on)
asmlinkage int sys_iopl(unsigned long unused) asmlinkage int sys_iopl(unsigned long unused)
{ {
struct pt_regs * regs = (struct pt_regs *) &unused; volatile struct pt_regs * regs = (struct pt_regs *) &unused;
unsigned int level = regs->ebx; unsigned int level = regs->ebx;
unsigned int old = (regs->eflags >> 12) & 3; unsigned int old = (regs->eflags >> 12) & 3;
......
...@@ -97,12 +97,12 @@ static struct pci_driver airo_driver = { ...@@ -97,12 +97,12 @@ static struct pci_driver airo_driver = {
infront of the label, that statistic will not be included in the list infront of the label, that statistic will not be included in the list
of statistics in the /proc filesystem */ of statistics in the /proc filesystem */
#define IGNLABEL 0&(int) #define IGNLABEL(comment) 0
static char *statsLabels[] = { static char *statsLabels[] = {
"RxOverrun", "RxOverrun",
IGNLABEL "RxPlcpCrcErr", IGNLABEL("RxPlcpCrcErr"),
IGNLABEL "RxPlcpFormatErr", IGNLABEL("RxPlcpFormatErr"),
IGNLABEL "RxPlcpLengthErr", IGNLABEL("RxPlcpLengthErr"),
"RxMacCrcErr", "RxMacCrcErr",
"RxMacCrcOk", "RxMacCrcOk",
"RxWepErr", "RxWepErr",
...@@ -146,15 +146,15 @@ static char *statsLabels[] = { ...@@ -146,15 +146,15 @@ static char *statsLabels[] = {
"HostRxBc", "HostRxBc",
"HostRxUc", "HostRxUc",
"HostRxDiscard", "HostRxDiscard",
IGNLABEL "HmacTxMc", IGNLABEL("HmacTxMc"),
IGNLABEL "HmacTxBc", IGNLABEL("HmacTxBc"),
IGNLABEL "HmacTxUc", IGNLABEL("HmacTxUc"),
IGNLABEL "HmacTxFail", IGNLABEL("HmacTxFail"),
IGNLABEL "HmacRxMc", IGNLABEL("HmacRxMc"),
IGNLABEL "HmacRxBc", IGNLABEL("HmacRxBc"),
IGNLABEL "HmacRxUc", IGNLABEL("HmacRxUc"),
IGNLABEL "HmacRxDiscard", IGNLABEL("HmacRxDiscard"),
IGNLABEL "HmacRxAccepted", IGNLABEL("HmacRxAccepted"),
"SsidMismatch", "SsidMismatch",
"ApMismatch", "ApMismatch",
"RatesMismatch", "RatesMismatch",
...@@ -162,26 +162,26 @@ static char *statsLabels[] = { ...@@ -162,26 +162,26 @@ static char *statsLabels[] = {
"AuthTimeout", "AuthTimeout",
"AssocReject", "AssocReject",
"AssocTimeout", "AssocTimeout",
IGNLABEL "ReasonOutsideTable", IGNLABEL("ReasonOutsideTable"),
IGNLABEL "ReasonStatus1", IGNLABEL("ReasonStatus1"),
IGNLABEL "ReasonStatus2", IGNLABEL("ReasonStatus2"),
IGNLABEL "ReasonStatus3", IGNLABEL("ReasonStatus3"),
IGNLABEL "ReasonStatus4", IGNLABEL("ReasonStatus4"),
IGNLABEL "ReasonStatus5", IGNLABEL("ReasonStatus5"),
IGNLABEL "ReasonStatus6", IGNLABEL("ReasonStatus6"),
IGNLABEL "ReasonStatus7", IGNLABEL("ReasonStatus7"),
IGNLABEL "ReasonStatus8", IGNLABEL("ReasonStatus8"),
IGNLABEL "ReasonStatus9", IGNLABEL("ReasonStatus9"),
IGNLABEL "ReasonStatus10", IGNLABEL("ReasonStatus10"),
IGNLABEL "ReasonStatus11", IGNLABEL("ReasonStatus11"),
IGNLABEL "ReasonStatus12", IGNLABEL("ReasonStatus12"),
IGNLABEL "ReasonStatus13", IGNLABEL("ReasonStatus13"),
IGNLABEL "ReasonStatus14", IGNLABEL("ReasonStatus14"),
IGNLABEL "ReasonStatus15", IGNLABEL("ReasonStatus15"),
IGNLABEL "ReasonStatus16", IGNLABEL("ReasonStatus16"),
IGNLABEL "ReasonStatus17", IGNLABEL("ReasonStatus17"),
IGNLABEL "ReasonStatus18", IGNLABEL("ReasonStatus18"),
IGNLABEL "ReasonStatus19", IGNLABEL("ReasonStatus19"),
"RxMan", "RxMan",
"TxMan", "TxMan",
"RxRefresh", "RxRefresh",
......
...@@ -193,6 +193,7 @@ static inline int try_inc_mod_count(struct module *mod) ...@@ -193,6 +193,7 @@ static inline int try_inc_mod_count(struct module *mod)
#define spin_lock_bh(lock) do {start_bh_atomic();spin_lock(lock);} while(0) #define spin_lock_bh(lock) do {start_bh_atomic();spin_lock(lock);} while(0)
#define spin_unlock_bh(lock) do {spin_unlock(lock);end_bh_atomic();} while(0) #define spin_unlock_bh(lock) do {spin_unlock(lock);end_bh_atomic();} while(0)
#else #else
#include <linux/interrupt.h>
#include <asm/softirq.h> #include <asm/softirq.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#endif #endif
......
...@@ -425,11 +425,11 @@ sys_init_module(const char *name_user, struct module *mod_user) ...@@ -425,11 +425,11 @@ sys_init_module(const char *name_user, struct module *mod_user)
printk(KERN_ERR "init_module: mod->deps out of bounds.\n"); printk(KERN_ERR "init_module: mod->deps out of bounds.\n");
goto err2; goto err2;
} }
if (mod->init && !mod_bound(mod->init, 0, mod)) { if (mod->init && !mod_bound((unsigned long)mod->init, 0, mod)) {
printk(KERN_ERR "init_module: mod->init out of bounds.\n"); printk(KERN_ERR "init_module: mod->init out of bounds.\n");
goto err2; goto err2;
} }
if (mod->cleanup && !mod_bound(mod->cleanup, 0, mod)) { if (mod->cleanup && !mod_bound((unsigned long)mod->cleanup, 0, mod)) {
printk(KERN_ERR "init_module: mod->cleanup out of bounds.\n"); printk(KERN_ERR "init_module: mod->cleanup out of bounds.\n");
goto err2; goto err2;
} }
...@@ -449,7 +449,7 @@ sys_init_module(const char *name_user, struct module *mod_user) ...@@ -449,7 +449,7 @@ sys_init_module(const char *name_user, struct module *mod_user)
goto err2; goto err2;
} }
if (mod_member_present(mod, can_unload) if (mod_member_present(mod, can_unload)
&& mod->can_unload && !mod_bound(mod->can_unload, 0, mod)) { && mod->can_unload && !mod_bound((unsigned long)mod->can_unload, 0, mod)) {
printk(KERN_ERR "init_module: mod->can_unload out of bounds.\n"); printk(KERN_ERR "init_module: mod->can_unload out of bounds.\n");
goto err2; goto err2;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment