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

Commit 47c29752 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git

parents fd4e5f29 7cc1712b

arch/sparc/kernel/process.c

+0 −5
Original line number Diff line number Diff line
@@ -83,9 +83,6 @@ void default_idle(void) 
 */

void cpu_idle(void)

{

	if (current->pid != 0)

		goto out;



	/* endless idle loop with no priority at all */

	for (;;) {

		if (ARCH_SUN4C_SUN4) {
@@ -126,8 +123,6 @@ void cpu_idle(void) 
		schedule();

		check_pgt_cache();

	}

out:

	return;

}



#else

arch/sparc64/kernel/process.c

+0 −4
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ void default_idle(void) 
 */

void cpu_idle(void)

{

	if (current->pid != 0)

		return;



	/* endless idle loop with no priority at all */

	for (;;) {

		/* If current->work.need_resched is zero we should really
@@ -80,7 +77,6 @@ void cpu_idle(void) 
		schedule();

		check_pgt_cache();

	}

	return;

}



#else

arch/sparc64/kernel/sparc64_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ EXPORT_SYMBOL(verify_compat_iovec); 


EXPORT_SYMBOL(dump_thread);

EXPORT_SYMBOL(dump_fpu);

EXPORT_SYMBOL(__pte_alloc_one_kernel);

EXPORT_SYMBOL(pte_alloc_one_kernel);

#ifndef CONFIG_SMP

EXPORT_SYMBOL(pgt_quicklists);

#endif

arch/sparc64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ struct pgtable_cache_struct pgt_quicklists; 
#else

#define DC_ALIAS_SHIFT	0

#endif

pte_t *__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)

pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)

{

	struct page *page;

	unsigned long color;

include/asm-sparc64/pgalloc.h

+2 −7
Original line number Diff line number Diff line
@@ -122,17 +122,12 @@ static __inline__ void free_pmd_slow(pmd_t *pmd) 
#define pmd_populate(MM,PMD,PTE_PAGE)		\

	pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE))



extern pte_t *__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address);



static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)

{

	return __pte_alloc_one_kernel(mm, address);

}

extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address);



static inline struct page *

pte_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	pte_t *pte = __pte_alloc_one_kernel(mm, addr);

	pte_t *pte = pte_alloc_one_kernel(mm, addr);



	if (pte)

		return virt_to_page(pte);