diff options
| author | Thomas Mingarelli <Thomas.Mingarelli@hp.com> | 2008-06-12 16:20:32 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2008-06-17 16:43:48 -0400 |
| commit | 58c2709c2b551704f289cb3442a41d2a0cf40b6e (patch) | |
| tree | 394768e0faa44f7aea674c476468d42ecf3bc7c1 | |
| parent | c8988f968240069aeae16d8cf9f59096a085eb27 (diff) | |
Revert "[WATCHDOG] make watchdog/hpwdt.c:asminline_call() static"
The driver needs the asmlinkage tag and the CFLAGS line in the Makefile.
Without it the driver doesn't work.
Signed-off-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 6a63535fc04d..2bc1f74433ce 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
| @@ -145,8 +145,8 @@ MODULE_DEVICE_TABLE(pci, hpwdt_devices); | |||
| 145 | 145 | ||
| 146 | #define HPWDT_ARCH 32 | 146 | #define HPWDT_ARCH 32 |
| 147 | 147 | ||
| 148 | static void asminline_call(struct cmn_registers *pi86Regs, | 148 | asmlinkage void asminline_call(struct cmn_registers *pi86Regs, |
| 149 | unsigned long *pRomEntry) | 149 | unsigned long *pRomEntry) |
| 150 | { | 150 | { |
| 151 | asm("pushl %ebp \n\t" | 151 | asm("pushl %ebp \n\t" |
| 152 | "movl %esp, %ebp \n\t" | 152 | "movl %esp, %ebp \n\t" |
| @@ -333,8 +333,8 @@ static int __devinit detect_cru_service(void) | |||
| 333 | 333 | ||
| 334 | #define HPWDT_ARCH 64 | 334 | #define HPWDT_ARCH 64 |
| 335 | 335 | ||
| 336 | static void asminline_call(struct cmn_registers *pi86Regs, | 336 | asmlinkage void asminline_call(struct cmn_registers *pi86Regs, |
| 337 | unsigned long *pRomEntry) | 337 | unsigned long *pRomEntry) |
| 338 | { | 338 | { |
| 339 | asm("pushq %rbp \n\t" | 339 | asm("pushq %rbp \n\t" |
| 340 | "movq %rsp, %rbp \n\t" | 340 | "movq %rsp, %rbp \n\t" |
