projects/linux·commit f4cc74c9

Merge tag 'microblaze-v5.14' of git://git.monstr.eu/linux-2.6-microblaze

f4cc74c9 · Linus Torvalds <[email protected]> · 2021-06-30 15:36:48 -07:00

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
Commit
f4cc74c9382d8b02181cfdc6d29ee5bc7a1f7d02
Parents
92183137 · 14a83249

Merge commit. Changes below are compared with the first parent: 92183137.

Changes

2 files changed · +1 −4

FileStatusAddDelContent
arch/microblaze/Makefilemodified+1−1View file
arch/microblaze/include/asm/page.hmodified+0−3View file

arch/microblaze/Makefile

View file
diff --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 file
diff --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).