diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 10:10:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 10:10:02 -0700 |
| commit | b247759642cc96a75122907cc898b4c43b4f86ce (patch) | |
| tree | 568e6ab08f2b986ff0b1ef80318c6c56c5d2ef42 /arch/parisc/install.sh | |
| parent | 61e312914cc82c085c945f88e5a53d507dd7d0d4 (diff) | |
| parent | 5b879d78bc0818aa710f5d4d9abbfc2aca075cc3 (diff) | |
Merge branch 'parisc-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"The PA-RISC updates for v3.11 include a gcc miscompilation fix,
gzip-compressed vmlinuz support, a fix in the PCI code for ATI FireGL
support on c8000 machines, a fix to prevent that %sr1 is being
clobbered and a few smaller optimizations and documentation updates"
* 'parisc-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix gcc miscompilation in pa_memcpy()
parisc: Ensure volatile space register %sr1 is not clobbered
parisc: optimize mtsp(0,sr) inline assembly
parisc: switch to gzip-compressed vmlinuz kernel
parisc: document the shadow registers
parisc: more capabilities info in /proc/cpuinfo
parisc: fix LMMIO mismatch between PAT length and MASK register
Diffstat (limited to 'arch/parisc/install.sh')
| -rw-r--r-- | arch/parisc/install.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/install.sh b/arch/parisc/install.sh index e593fc8d58b..4da682b466d 100644 --- a/arch/parisc/install.sh +++ b/arch/parisc/install.sh @@ -26,13 +26,13 @@ if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi # Default install -if [ -f $4/vmlinux ]; then - mv $4/vmlinux $4/vmlinux.old +if [ -f $4/vmlinuz ]; then + mv $4/vmlinuz $4/vmlinuz.old fi if [ -f $4/System.map ]; then mv $4/System.map $4/System.old fi -cat $2 > $4/vmlinux +cat $2 > $4/vmlinuz cp $3 $4/System.map |