adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Linus Torvalds 2005-05-05 16:23:24 -07:00
commit 47c297529b
5 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/sparc/kernel/process.c
View file

@ -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

4
arch/sparc64/kernel/process.c
View file

@ -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

2
arch/sparc64/kernel/sparc64_ksyms.c
View file

@ -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

2
arch/sparc64/mm/init.c
View file

@ -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;

9
include/asm-sparc64/pgalloc.h
View file

@ -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);