Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a58a260f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixes from David Miller:
 "Three sparc bug fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc/ftrace: Fix ftrace graph time measurement
  sparc: Fix -Wstringop-overflow warning
  sparc64: Fix mapping of 64k pages with MAP_FIXED
parents 5396a018 48078d2d

arch/sparc/include/asm/hugetlb.h

+4 −2
Original line number Diff line number Diff line
@@ -24,9 +24,11 @@ static inline int is_hugepage_only_range(struct mm_struct *mm, 
static inline int prepare_hugepage_range(struct file *file,

			unsigned long addr, unsigned long len)

{

	if (len & ~HPAGE_MASK)

	struct hstate *h = hstate_file(file);



	if (len & ~huge_page_mask(h))

		return -EINVAL;

	if (addr & ~HPAGE_MASK)

	if (addr & ~huge_page_mask(h))

		return -EINVAL;

	return 0;

}

arch/sparc/include/asm/pgtable_32.h

+2 −2
Original line number Diff line number Diff line
@@ -91,9 +91,9 @@ extern unsigned long pfn_base; 
 * ZERO_PAGE is a global shared page that is always zero: used

 * for zero-mapped memory areas etc..

 */

extern unsigned long empty_zero_page;

extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];



#define ZERO_PAGE(vaddr) (virt_to_page(&empty_zero_page))

#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))



/*

 * In general all page table modifications should use the V8 atomic

arch/sparc/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extern char reboot_command[]; 
 */

extern unsigned char boot_cpu_id;



extern unsigned long empty_zero_page;

extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];



extern int serial_console;

static inline int con_is_present(void)

arch/sparc/kernel/ftrace.c

+6 −7
Original line number Diff line number Diff line
@@ -130,17 +130,16 @@ unsigned long prepare_ftrace_return(unsigned long parent, 
	if (unlikely(atomic_read(&current->tracing_graph_pause)))

		return parent + 8UL;



	if (ftrace_push_return_trace(parent, self_addr, &trace.depth,

				     frame_pointer, NULL) == -EBUSY)

		return parent + 8UL;



	trace.func = self_addr;

	trace.depth = current->curr_ret_stack + 1;



	/* Only trace if the calling function expects to */

	if (!ftrace_graph_entry(&trace)) {

		current->curr_ret_stack--;

	if (!ftrace_graph_entry(&trace))

		return parent + 8UL;



	if (ftrace_push_return_trace(parent, self_addr, &trace.depth,

				     frame_pointer, NULL) == -EBUSY)

		return parent + 8UL;

	}



	return return_hooker;

}

arch/sparc/mm/init_32.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ void __init mem_init(void) 




	/* Saves us work later. */

	memset((void *)&empty_zero_page, 0, PAGE_SIZE);

	memset((void *)empty_zero_page, 0, PAGE_SIZE);



	i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5);

	i += 1;