diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-27 18:12:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-27 18:12:21 -0800 |
| commit | 3ae86f1a9f2f2bc628ea5ab91dd097a6e6ad210f (patch) | |
| tree | 4e895b5aedd774ff55c0f6008471765307b54b78 /arch/mips/pmcs-msp71xx/msp_setup.c | |
| parent | db0665012cc9cbc0445678e3fcce102791f721ce (diff) | |
| parent | 930c0f708e156613c37b97cf583c4c6b07d99cce (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
- Fix bitrot in __get_user_unaligned()
- EVA userspace accessor bug fixes.
- Fix for build issues with certain toolchains.
- Fix build error for VDSO with particular toolchain versions.
- Fix build error due to a variable that should have been removed by an
earlier patch
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Fix bitrot in __get_user_unaligned()
MIPS: Fix build error due to unused variables.
MIPS: VDSO: Fix build error
MIPS: CPS: drop .set mips64r2 directives
MIPS: uaccess: Take EVA into account in [__]clear_user
MIPS: uaccess: Take EVA into account in __copy_from_user()
MIPS: uaccess: Fix strlen_user with EVA
Diffstat (limited to 'arch/mips/pmcs-msp71xx/msp_setup.c')
| -rw-r--r-- | arch/mips/pmcs-msp71xx/msp_setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/pmcs-msp71xx/msp_setup.c b/arch/mips/pmcs-msp71xx/msp_setup.c index 78b2ef49dbc7..9d293b3e9130 100644 --- a/arch/mips/pmcs-msp71xx/msp_setup.c +++ b/arch/mips/pmcs-msp71xx/msp_setup.c @@ -39,7 +39,6 @@ extern void msp_serial_setup(void); void msp7120_reset(void) { void *start, *end, *iptr; - register int i; /* Diasble all interrupts */ local_irq_disable(); |