diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:36:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:36:43 +0100 |
| commit | a3251c1a36f595046bea03935ebe37a1e1f1f1d7 (patch) | |
| tree | 14b51f8bf1d7e1bb35697cb4704255b51b15baa9 /arch/sh/include/asm | |
| parent | x86/softirq/64: Inline do_softirq_own_stack() (diff) | |
| parent | x86/pv: Rework arch_local_irq_restore() to not use popf (diff) | |
| download | linux-dev-a3251c1a36f595046bea03935ebe37a1e1f1f1d7.tar.xz linux-dev-a3251c1a36f595046bea03935ebe37a1e1f1f1d7.zip | |
Merge branch 'x86/paravirt' into x86/entry
Merge in the recent paravirt changes to resolve conflicts caused
by objtool annotations.
Conflicts:
arch/x86/xen/xen-asm.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/include/asm')
| -rw-r--r-- | arch/sh/include/asm/gpio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/gpio.h b/arch/sh/include/asm/gpio.h index 351918894e86..d643250f0a0f 100644 --- a/arch/sh/include/asm/gpio.h +++ b/arch/sh/include/asm/gpio.h @@ -16,7 +16,6 @@ #include <cpu/gpio.h> #endif -#define ARCH_NR_GPIOS 512 #include <asm-generic/gpio.h> #ifdef CONFIG_GPIOLIB |