tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] Remove MT_NONSHARED_DEVICE alias

Use MT_DEVICE_NONSHARED instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by
Russell King 9b727abd db5b7169

+7 -9
-2
arch/arm/include/asm/mach/map.h
··· 26 26 #define MT_MEMORY 8 27 27 #define MT_ROM 9 28 28 29 - #define MT_NONSHARED_DEVICE MT_DEVICE_NONSHARED 30 - 31 29 #ifdef CONFIG_MMU 32 30 extern void iotable_init(struct map_desc *, int); 33 31 #else
+1 -1
arch/arm/mach-mx3/mm.c
··· 49 49 .virtual = AVIC_BASE_ADDR_VIRT, 50 50 .pfn = __phys_to_pfn(AVIC_BASE_ADDR), 51 51 .length = AVIC_SIZE, 52 - .type = MT_NONSHARED_DEVICE 52 + .type = MT_DEVICE_NONSHARED 53 53 }, 54 54 }; 55 55
+3 -3
arch/arm/mach-mx3/mx31ads.c
··· 92 92 .virtual = AIPS1_BASE_ADDR_VIRT, 93 93 .pfn = __phys_to_pfn(AIPS1_BASE_ADDR), 94 94 .length = AIPS1_SIZE, 95 - .type = MT_NONSHARED_DEVICE 95 + .type = MT_DEVICE_NONSHARED 96 96 }, { 97 97 .virtual = SPBA0_BASE_ADDR_VIRT, 98 98 .pfn = __phys_to_pfn(SPBA0_BASE_ADDR), 99 99 .length = SPBA0_SIZE, 100 - .type = MT_NONSHARED_DEVICE 100 + .type = MT_DEVICE_NONSHARED 101 101 }, { 102 102 .virtual = AIPS2_BASE_ADDR_VIRT, 103 103 .pfn = __phys_to_pfn(AIPS2_BASE_ADDR), 104 104 .length = AIPS2_SIZE, 105 - .type = MT_NONSHARED_DEVICE 105 + .type = MT_DEVICE_NONSHARED 106 106 }, { 107 107 .virtual = CS4_BASE_ADDR_VIRT, 108 108 .pfn = __phys_to_pfn(CS4_BASE_ADDR),
+3 -3
arch/arm/mach-mx3/mx31lite.c
··· 45 45 .virtual = AIPS1_BASE_ADDR_VIRT, 46 46 .pfn = __phys_to_pfn(AIPS1_BASE_ADDR), 47 47 .length = AIPS1_SIZE, 48 - .type = MT_NONSHARED_DEVICE 48 + .type = MT_DEVICE_NONSHARED 49 49 }, { 50 50 .virtual = SPBA0_BASE_ADDR_VIRT, 51 51 .pfn = __phys_to_pfn(SPBA0_BASE_ADDR), 52 52 .length = SPBA0_SIZE, 53 - .type = MT_NONSHARED_DEVICE 53 + .type = MT_DEVICE_NONSHARED 54 54 }, { 55 55 .virtual = AIPS2_BASE_ADDR_VIRT, 56 56 .pfn = __phys_to_pfn(AIPS2_BASE_ADDR), 57 57 .length = AIPS2_SIZE, 58 - .type = MT_NONSHARED_DEVICE 58 + .type = MT_DEVICE_NONSHARED 59 59 }, { 60 60 .virtual = CS4_BASE_ADDR_VIRT, 61 61 .pfn = __phys_to_pfn(CS4_BASE_ADDR),