From 368b8e252335725ea72d7bcbb3b1c8837b8dfeed Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Tue, 6 Sep 2011 10:23:45 +0100 Subject: ARM: zynq: convert to CONFIG_MULTI_IRQ_HANDLER Convert the zynq platform to be using the gic_handle_irq function as its primary interrupt handler. Acked-by: John Linn Signed-off-by: Marc Zyngier --- arch/arm/mach-zynq/include/mach/entry-macro.S | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/arm/mach-zynq/include') diff --git a/arch/arm/mach-zynq/include/mach/entry-macro.S b/arch/arm/mach-zynq/include/mach/entry-macro.S index 3cfc01b37461..d621fb732569 100644 --- a/arch/arm/mach-zynq/include/mach/entry-macro.S +++ b/arch/arm/mach-zynq/include/mach/entry-macro.S @@ -20,9 +20,6 @@ * GNU General Public License for more details. */ -#include -#include - .macro disable_fiq .endm -- cgit v1.2.1 From d0e6b2236a26711939bfcdd97370fedcd526a191 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Thu, 15 Sep 2011 16:30:54 -0400 Subject: ARM: big removal of now unused vmalloc.h files Signed-off-by: Nicolas Pitre --- arch/arm/mach-zynq/include/mach/vmalloc.h | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h (limited to 'arch/arm/mach-zynq/include') diff --git a/arch/arm/mach-zynq/include/mach/vmalloc.h b/arch/arm/mach-zynq/include/mach/vmalloc.h deleted file mode 100644 index 2398eff1e8b8..000000000000 --- a/arch/arm/mach-zynq/include/mach/vmalloc.h +++ /dev/null @@ -1,20 +0,0 @@ -/* arch/arm/mach-zynq/include/mach/vmalloc.h - * - * Copyright (C) 2011 Xilinx - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __MACH_VMALLOC_H__ -#define __MACH_VMALLOC_H__ - -#define VMALLOC_END 0xE0000000UL - -#endif -- cgit v1.2.1 From 5e3aa527c390377cdeea444f14ef5a28a0aab618 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 5 Nov 2011 12:36:40 +0000 Subject: ARM: restart: remove comments about adding code to arch_reset() arch_reset() is deprecated; systems should hook into system restart via the 'restart' method in the platforms machine description record. Acked-by: Nicolas Pitre Acked-by: Jamie Iles Acked-by: Tony Lindgren Signed-off-by: Russell King --- arch/arm/mach-zynq/include/mach/system.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-zynq/include') diff --git a/arch/arm/mach-zynq/include/mach/system.h b/arch/arm/mach-zynq/include/mach/system.h index 1b84d705c675..34be7ed4b678 100644 --- a/arch/arm/mach-zynq/include/mach/system.h +++ b/arch/arm/mach-zynq/include/mach/system.h @@ -22,7 +22,6 @@ static inline void arch_idle(void) static inline void arch_reset(char mode, const char *cmd) { - /* Add architecture specific reset processing here */ } #endif -- cgit v1.2.1 From f88b8979d26615ce68772cebc85c3b556571afca Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 5 Nov 2011 21:30:00 +0000 Subject: ARM: restart: remove the now empty arch_reset() Remove the now empty arch_reset() from all the mach/system.h includes, and remove its callsite. Remove arm_machine_restart() as this function no longer does anything useful. For samsung platforms, remove the include of mach/system-reset.h and plat/system-reset.h from their respective mach/system.h headers as these just define their arch_reset functions. As a result, the s3c2410 and plat-samsung system-reset.h files are no longer referenced, so remove these files entirely. Acked-by: Nicolas Pitre Acked-by: H Hartley Sweeten Acked-by: Jamie Iles Acked-by: Tony Lindgren Acked-by: Linus Walleij Signed-off-by: Russell King --- arch/arm/mach-zynq/include/mach/system.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/arm/mach-zynq/include') diff --git a/arch/arm/mach-zynq/include/mach/system.h b/arch/arm/mach-zynq/include/mach/system.h index 34be7ed4b678..8e88e0b8d2ba 100644 --- a/arch/arm/mach-zynq/include/mach/system.h +++ b/arch/arm/mach-zynq/include/mach/system.h @@ -20,8 +20,4 @@ static inline void arch_idle(void) cpu_do_idle(); } -static inline void arch_reset(char mode, const char *cmd) -{ -} - #endif -- cgit v1.2.1