Commit f4cc74c9 authored Jun 30, 2021 by Linus Torvalds

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

parents 92183137 14a83249

arch/microblaze/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+0 −3

Original line number	Diff line number	Diff line
		@@ -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).