diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-09 14:11:45 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-09 14:11:45 +0800 |
| commit | ceafc84623c8ef94c13a87363277a595988b2b79 (patch) | |
| tree | b2513b053aedcca198dfbf2ec4c4ea64ede77cfb /arch/powerpc | |
| parent | 692d96aa22dea8bb80018c6a76556ad6afd464a6 (diff) | |
| parent | 87dc7c99c72e49461fba277c81871525700821fb (diff) | |
Merge tag 'v3.10.68' into linux-linaro-lsk
This is the 3.10.68 stable release
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/xmon/xmon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 94599a65cc66..89e57280d2e2 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -288,6 +288,7 @@ static inline void disable_surveillance(void) args.token = rtas_token("set-indicator"); if (args.token == RTAS_UNKNOWN_SERVICE) return; + args.token = cpu_to_be32(args.token); args.nargs = cpu_to_be32(3); args.nret = cpu_to_be32(1); args.rets = &args.args[3]; |