Merge tag 'microblaze-v5.14' of git://git.monstr.eu/linux-2.6-microblaze
Merge commit. Changes below are compared with the first parent: 92183137.
Changes
2 files changed · +1 −4
| File | Status | Add | Del | Content |
|---|---|---|---|---|
| arch/microblaze/Makefile | modified | +1 | −1 | View file |
| arch/microblaze/include/asm/page.h | modified | +0 | −3 | View file |
arch/microblaze/Makefile
View filediff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index b41f323..6d4af39 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -3,7 +3,7 @@ KBUILD_DEFCONFIG := mmu_defconfig
UTS_SYSNAME = -DUTS_SYSNAME=\"Linux\"
-# What CPU vesion are we building for, and crack it open
+# What CPU version are we building for, and crack it open
# as major.minor.rev
CPU_VER := $(shell echo $(CONFIG_XILINX_MICROBLAZE0_HW_VER))
CPU_MAJOR := $(shell echo $(CPU_VER) | cut -d '.' -f 1)
arch/microblaze/include/asm/page.h
View filediff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h
index bf681f2..ce55097 100644
--- a/arch/microblaze/include/asm/page.h
+++ b/arch/microblaze/include/asm/page.h
@@ -35,9 +35,6 @@
#define ARCH_SLAB_MINALIGN L1_CACHE_BYTES
-#define PAGE_UP(addr) (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr) ((addr)&(~((PAGE_SIZE)-1)))
-
/*
* PAGE_OFFSET -- the first address of the first page of memory. With MMU
* it is set to the kernel start address (aligned on a page boundary).