iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Metag architecture changes for v4.4

Browse Source 
A fix for 4KiB stacks with SMP, and a change of maintenance status to
 "Odd Fixes".
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJWQdwqAAoJEGwLaZPeOHZ6ykEP+gOlJhibJT1uzB/ZgMwT+fMd
 6NWaCyv5bm7fN0WMwMYQKPrKTMxz2gglfvHRaKdlYXXxAkmev/9rKL1RBlmd+yPH
 sNdZsTqQDpJx2pt8vi5PaVMz+p5B1RmzjLwQWqHjUqLIZ3N9+WG7wl+jLPZCW/qH
 F1fuiL7FaEKn6mg2Rh0i+DWSnda2eY6JOAbHDGtI1ukjN+2eYac5mx8uUF+yH6lW
 7hUfMwp1RxDNqov2AMwq3OqHsgubtzUhCX/7urBRttSlEPnLLSyL11l2/1ij6iDP
 vPAw8tUmHFFwLiSgszEnw57ebKhYizBBXFdtAN/R3kuRzG2gDXZ/9JZnusmD3v0p
 pk1ixLdg28SqVKoKOc6Seq/k3xZVB+3ZurFD0vlL+hHE4oUAHjs3K+WfyOkVYSnq
 c24vwxq5vYOHABw40qGD+rPpKvdk6MsO5Kqa7P2VxfA1HpbJSjqRxoap9Yax3bmN
 gWn3OZIaCSxbXavxkgzx9dokJvgWqTLbUnszdWmE2SHbfElmJZpQ2pK1XrxPyju+
 +PyfbHRp25UwkpT2Izzfb8FVTxUrplvJwU2QgGWtZZzUJzu2+HiNdm4JPLDbdbZh
 l38dma3e7hl6BzLS6BFRh80DtsWm+dWwd6vh7I0+C2uNGV45N7wyCXPoxeDV1mru
 LIk6L41SLUz52pYFUEIx
 =I+wL
 -----END PGP SIGNATURE-----

Merge tag 'metag-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

Pull metag arch updates from James Hogan:
 "A fix for 4KiB stacks with SMP, and a change of maintenance status to
  'Odd Fixes'"

* tag 'metag-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  MAINTAINERS: Change Meta arch port status to Odd Fixes
  metag: Turn irq_ctx_* macros into static inlines
  metag: SMP: Fix 4KiB stack setup on secondary CPUs
This commit is contained in:
Linus Torvalds 2015-11-10 16:24:25 -08:00
commit c6de7f1754
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -6994,7 +6994,7 @@ F: Documentation/hwmon/menf21bmc
METAG ARCHITECTURE METAG ARCHITECTURE
M: James Hogan <james.hogan@imgtec.com> M: James Hogan <james.hogan@imgtec.com>
L: linux-metag@vger.kernel.org L: linux-metag@vger.kernel.org
S: Supported S: Odd Fixes
F: arch/metag/ F: arch/metag/
F: Documentation/metag/ F: Documentation/metag/
F: Documentation/devicetree/bindings/metag/ F: Documentation/devicetree/bindings/metag/

8
arch/metag/include/asm/irq.h
View File

@ -6,8 +6,12 @@ extern void irq_ctx_init(int cpu);
extern void irq_ctx_exit(int cpu); extern void irq_ctx_exit(int cpu);
# define __ARCH_HAS_DO_SOFTIRQ # define __ARCH_HAS_DO_SOFTIRQ
#else #else
# define irq_ctx_init(cpu) do { } while (0) static inline void irq_ctx_init(int cpu)
# define irq_ctx_exit(cpu) do { } while (0) {
}
static inline void irq_ctx_exit(int cpu)
{
}
#endif #endif
void tbi_startup_interrupt(int); void tbi_startup_interrupt(int);

2
arch/metag/kernel/smp.c
View File

@ -312,6 +312,7 @@ void cpu_die(void)
{ {
local_irq_disable(); local_irq_disable();
idle_task_exit(); idle_task_exit();
irq_ctx_exit(smp_processor_id());
(void)cpu_report_death(); (void)cpu_report_death();
@ -366,6 +367,7 @@ asmlinkage void secondary_start_kernel(void)
panic("No TBI found!"); panic("No TBI found!");
per_cpu_trap_init(cpu); per_cpu_trap_init(cpu);
irq_ctx_init(cpu);
preempt_disable(); preempt_disable();