diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-01 00:36:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-01 00:36:48 +0200 |
| commit | f4cc74c9382d8b02181cfdc6d29ee5bc7a1f7d02 (patch) | |
| tree | a8d4ad8d097005901c7c60c82b86a405f8d4eb46 | |
| parent | Merge tag 'safesetid-5.14' of git://github.com/micah-morton/linux (diff) | |
| parent | arch: microblaze: Fix spelling mistake "vesion" -> "version" (diff) | |
| download | linux-f4cc74c9382d8b02181cfdc6d29ee5bc7a1f7d02.tar.xz linux-f4cc74c9382d8b02181cfdc6d29ee5bc7a1f7d02.zip | |
Merge tag 'microblaze-v5.14' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
- Remove unused PAGE_UP/DOWN macros
- Fix trivial spelling mistake
* tag 'microblaze-v5.14' of git://git.monstr.eu/linux-2.6-microblaze:
arch: microblaze: Fix spelling mistake "vesion" -> "version"
microblaze: Cleanup unused functions
| -rw-r--r-- | arch/microblaze/Makefile | 2 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/page.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index b41f323e1fde..6d4af39e3890 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) diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h index bf681f272f72..ce550978f4fc 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). |