diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:36:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 07:36:55 -0800 |
| commit | 4caca5f917ce991dc67fbb42fa82a1f044538e23 (patch) | |
| tree | 29c9dadc3ab4aed954d8900f7171b44cd7a873bd /drivers/staging/hv/Hv.h | |
| parent | f8c7e6c2038a96f427911264a0c1448c9e3c2a9e (diff) | |
| parent | 7692fd4d441afac728cb83fdd33349d5ba07406c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: hv: fix smp problems in the hyperv core code
Staging: et131x: Fix 2.6.33rc1 regression in et131x
Staging: asus_oled: fix oops in 2.6.32.2
Diffstat (limited to 'drivers/staging/hv/Hv.h')
| -rw-r--r-- | drivers/staging/hv/Hv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h index 5379e4bfc56..fce4b5cdac3 100644 --- a/drivers/staging/hv/Hv.h +++ b/drivers/staging/hv/Hv.h @@ -93,7 +93,7 @@ static const struct hv_guid VMBUS_SERVICE_ID = { }, }; -#define MAX_NUM_CPUS 1 +#define MAX_NUM_CPUS 32 struct hv_input_signal_event_buffer { @@ -137,8 +137,8 @@ extern u16 HvPostMessage(union hv_connection_id connectionId, extern u16 HvSignalEvent(void); -extern int HvSynicInit(u32 irqVector); +extern void HvSynicInit(void *irqarg); -extern void HvSynicCleanup(void); +extern void HvSynicCleanup(void *arg); #endif /* __HV_H__ */ |