diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-22 03:23:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-22 03:23:13 -0400 |
| commit | 8decf868790b48a727d7e7ca164f2bcd3c1389c0 (patch) | |
| tree | b759a5f861f842af7ea76f9011b579d06e9d5508 /arch/um/os-Linux/skas/mem.c | |
| parent | 3fc72370186be2f9d4d6ef06d99e1caa5d92c564 (diff) | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'arch/um/os-Linux/skas/mem.c')
| -rw-r--r-- | arch/um/os-Linux/skas/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c index d261f170d120..e771398be5f3 100644 --- a/arch/um/os-Linux/skas/mem.c +++ b/arch/um/os-Linux/skas/mem.c | |||
| @@ -39,7 +39,7 @@ static unsigned long syscall_regs[MAX_REG_NR]; | |||
| 39 | 39 | ||
| 40 | static int __init init_syscall_regs(void) | 40 | static int __init init_syscall_regs(void) |
| 41 | { | 41 | { |
| 42 | get_safe_registers(syscall_regs); | 42 | get_safe_registers(syscall_regs, NULL); |
| 43 | syscall_regs[REGS_IP_INDEX] = STUB_CODE + | 43 | syscall_regs[REGS_IP_INDEX] = STUB_CODE + |
| 44 | ((unsigned long) &batch_syscall_stub - | 44 | ((unsigned long) &batch_syscall_stub - |
| 45 | (unsigned long) &__syscall_stub_start); | 45 | (unsigned long) &__syscall_stub_start); |