diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-09 14:12:10 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-09 14:12:10 +0800 |
| commit | eff6a902ff6b8a42f768c4b78fc63b9b8d0a41d9 (patch) | |
| tree | 30e8be36bf1402fc30696cdb1599598c6cf7d837 /arch/powerpc | |
| parent | a779989fd4ccf6a58237ab3932559d8e60e157b6 (diff) | |
| parent | 4ccf212fb84d79b75fc66a2e26ac6bdbab0aedbf (diff) | |
Merge tag 'v3.14.32' into linux-linaro-lsk-v3.14
This is the 3.14.32 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 bc5fbc201bcb..f89389f634d7 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]; |