diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-18 11:26:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-18 11:26:16 -0800 |
| commit | cb81fc6a3cf694345f29858624e5d9f3509d30d4 (patch) | |
| tree | 2e2fa481841b97cc61632bdc411bec3606d5051f /arch/parisc/lib/delay.c | |
| parent | Merge branch 'WIP.x86-pti.entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | parisc: Reduce thread stack to 16 kb (diff) | |
| download | linux-dev-cb81fc6a3cf694345f29858624e5d9f3509d30d4.tar.xz linux-dev-cb81fc6a3cf694345f29858624e5d9f3509d30d4.zip | |
Merge branch 'parisc-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"There are two important fixes here:
- Add PCI quirks to disable built-in a serial AUX and a graphics
cards from specific GSP (management board) PCI cards. This fixes
boot via serial console on rp3410 and rp3440 machines.
- Revert the "Re-enable interrups early" patch which was added to
kernel v4.10. It can trigger stack overflows and thus silent data
corruption. With this patch reverted we can lower our thread stack
back to 16kb again.
The other patches are minor cleanups: avoid duplicate includes,
indenting fixes, correctly align variable in asm code"
* 'parisc-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Reduce thread stack to 16 kb
Revert "parisc: Re-enable interrupts early"
parisc: remove duplicate includes
parisc: Hide Diva-built-in serial aux and graphics card
parisc: Align os_hpmc_size on word boundary
parisc: Fix indenting in puts()
Diffstat (limited to 'arch/parisc/lib/delay.c')
| -rw-r--r-- | arch/parisc/lib/delay.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/lib/delay.c b/arch/parisc/lib/delay.c index 7eab4bb8abe6..66e506520505 100644 --- a/arch/parisc/lib/delay.c +++ b/arch/parisc/lib/delay.c @@ -16,9 +16,7 @@ #include <linux/preempt.h> #include <linux/init.h> -#include <asm/processor.h> #include <asm/delay.h> - #include <asm/special_insns.h> /* for mfctl() */ #include <asm/processor.h> /* for boot_cpu_data */ |