diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-03-17 14:14:12 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-03-17 14:14:12 -0400 |
| commit | 325d1605542960903c88409b199734a3d8fc6612 (patch) | |
| tree | 9d8eeed393a3b5dcadd1ddb6b76634b464fd6bc7 /arch/mips/kernel/signal.c | |
| parent | 3c5ead52ed68406c0ee789024c4ae581be8bcee4 (diff) | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/mips/kernel/signal.c')
| -rw-r--r-- | arch/mips/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index 5922342bca39..dbbe0ce48d89 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c | |||
| @@ -84,7 +84,7 @@ static int protected_save_fp_context(struct sigcontext __user *sc) | |||
| 84 | 84 | ||
| 85 | static int protected_restore_fp_context(struct sigcontext __user *sc) | 85 | static int protected_restore_fp_context(struct sigcontext __user *sc) |
| 86 | { | 86 | { |
| 87 | int err, tmp; | 87 | int err, tmp __maybe_unused; |
| 88 | while (1) { | 88 | while (1) { |
| 89 | lock_fpu_owner(); | 89 | lock_fpu_owner(); |
| 90 | own_fpu_inatomic(0); | 90 | own_fpu_inatomic(0); |