summaryrefslogtreecommitdiffstats
path: root/arch/arc/include/asm/mm-arch-hooks.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-08-05 23:55:52 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-08-06 00:00:32 +0200
commitb7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8 (patch)
tree221d6c5be36fa3b2133200ebc3e520d4382dca8f /arch/arc/include/asm/mm-arch-hooks.h
parentx86/apic: Drop local_irq_save/restore in timer callbacks (diff)
parentLinux 4.2-rc4 (diff)
downloadlinux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.tar.xz
linux-b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8.zip
Merge branch 'linus' into x86/apic
Pull in upstream changes to avoid conflicts
Diffstat (limited to 'arch/arc/include/asm/mm-arch-hooks.h')
-rw-r--r--arch/arc/include/asm/mm-arch-hooks.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arc/include/asm/mm-arch-hooks.h b/arch/arc/include/asm/mm-arch-hooks.h
deleted file mode 100644
index c37541c5f8ba..000000000000
--- a/arch/arc/include/asm/mm-arch-hooks.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Architecture specific mm hooks
- *
- * Copyright (C) 2015, IBM Corporation
- * Author: Laurent Dufour <ldufour@linux.vnet.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _ASM_ARC_MM_ARCH_HOOKS_H
-#define _ASM_ARC_MM_ARCH_HOOKS_H
-
-#endif /* _ASM_ARC_MM_ARCH_HOOKS_H */