ARM: p2v: drop redundant 'type' argument from __pv_stub (0869f3b9) · Commits · 戴 / test

arch/arm/include/asm/memory.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -183,14 +183,14 @@ extern const void __pv_table_begin, __pv_table_end;
		#define PHYS_OFFSET ((phys_addr_t)__pv_phys_pfn_offset << PAGE_SHIFT)
		#define PHYS_PFN_OFFSET (__pv_phys_pfn_offset)

		#define __pv_stub(from,to,instr,type) \
		#define __pv_stub(from,to,instr) \
		__asm__("@ __pv_stub\n" \
		"1: " instr " %0, %1, %2\n" \
		" .pushsection .pv_table,\"a\"\n" \
		" .long 1b\n" \
		" .popsection\n" \
		: "=r" (to) \
		: "r" (from), "I" (type))
		: "r" (from), "I" (__PV_BITS_31_24))

		#define __pv_stub_mov_hi(t) \
		__asm__ volatile("@ __pv_stub_mov\n" \
		@@ -217,7 +217,7 @@ static inline phys_addr_t __virt_to_phys_nodebug(unsigned long x)
		phys_addr_t t;

		if (sizeof(phys_addr_t) == 4) {
		__pv_stub(x, t, "add", __PV_BITS_31_24);
		__pv_stub(x, t, "add");
		} else {
		__pv_stub_mov_hi(t);
		__pv_add_carry_stub(x, t);
		@@ -235,7 +235,7 @@ static inline unsigned long __phys_to_virt(phys_addr_t x)
		* assembler expression receives 32 bit argument
		* in place where 'r' 32 bit operand is expected.
		*/
		__pv_stub((unsigned long) x, t, "sub", __PV_BITS_31_24);
		__pv_stub((unsigned long) x, t, "sub");
		return t;
		}