evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Browse source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_open
  m68k: Fix redefinition of pgprot_noncached
  arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg
  m68k: cnt reaches -1, not 0
  m68k: count can reach 51, not 50
This commit is contained in:
Linus Torvalds 2009-08-26 20:16:38 -07:00
commit 533995ed85
7 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/m68k/amiga/config.c
View file

@ -574,10 +574,11 @@ static int a2000_hwclk(int op, struct rtc_time *t)
tod_2000.cntrl1 = TOD2000_CNTRL1_HOLD; tod_2000.cntrl1 = TOD2000_CNTRL1_HOLD;
while ((tod_2000.cntrl1 & TOD2000_CNTRL1_BUSY) && cnt--) { while ((tod_2000.cntrl1 & TOD2000_CNTRL1_BUSY) && cnt) {
tod_2000.cntrl1 &= ~TOD2000_CNTRL1_HOLD; tod_2000.cntrl1 &= ~TOD2000_CNTRL1_HOLD;
udelay(70); udelay(70);
tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD; tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD;
--cnt;
} }
if (!cnt) if (!cnt)
@ -649,10 +650,11 @@ static int amiga_set_clock_mmss(unsigned long nowtime)
tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD; tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD;
while ((tod_2000.cntrl1 & TOD2000_CNTRL1_BUSY) && cnt--) { while ((tod_2000.cntrl1 & TOD2000_CNTRL1_BUSY) && cnt) {
tod_2000.cntrl1 &= ~TOD2000_CNTRL1_HOLD; tod_2000.cntrl1 &= ~TOD2000_CNTRL1_HOLD;
udelay(70); udelay(70);
tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD; tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD;
--cnt;
} }
if (!cnt) if (!cnt)

10
arch/m68k/include/asm/motorola_pgalloc.h
View file

@ -36,12 +36,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres
return NULL; return NULL;
pte = kmap(page); pte = kmap(page);
if (pte) { __flush_page_to_ram(pte);
__flush_page_to_ram(pte); flush_tlb_kernel_page(pte);
flush_tlb_kernel_page(pte); nocache_page(pte);
nocache_page(pte); kunmap(page);
}
kunmap(pte);
pgtable_page_ctor(page); pgtable_page_ctor(page);
return page; return page;
} }

3
arch/m68k/include/asm/pgtable_mm.h
View file

@ -135,8 +135,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm-generic/pgtable.h>
/* /*
* Macro to mark a page protection value as "uncacheable". * Macro to mark a page protection value as "uncacheable".
*/ */
@ -154,6 +152,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \ ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \
: (prot))) : (prot)))
#include <asm-generic/pgtable.h>
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
/* /*

4
arch/m68k/include/asm/unistd.h
View file

@ -334,10 +334,12 @@
#define __NR_inotify_init1 328 #define __NR_inotify_init1 328
#define __NR_preadv 329 #define __NR_preadv 329
#define __NR_pwritev 330 #define __NR_pwritev 330
#define __NR_rt_tgsigqueueinfo 331
#define __NR_perf_counter_open 332
#ifdef __KERNEL__ #ifdef __KERNEL__
#define NR_syscalls 331 #define NR_syscalls 333
#define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_READDIR

2
arch/m68k/kernel/entry.S
View file

@ -755,4 +755,6 @@ sys_call_table:
.long sys_inotify_init1 .long sys_inotify_init1
.long sys_preadv .long sys_preadv
.long sys_pwritev /* 330 */ .long sys_pwritev /* 330 */
.long sys_rt_tgsigqueueinfo
.long sys_perf_counter_open

2
arch/m68knommu/kernel/syscalltable.S
View file

@ -349,6 +349,8 @@ ENTRY(sys_call_table)
.long sys_inotify_init1 .long sys_inotify_init1
.long sys_preadv .long sys_preadv
.long sys_pwritev /* 330 */ .long sys_pwritev /* 330 */
.long sys_rt_tgsigqueueinfo
.long sys_perf_counter_open
.rept NR_syscalls-(.-sys_call_table)/4 .rept NR_syscalls-(.-sys_call_table)/4
.long sys_ni_syscall .long sys_ni_syscall

2
drivers/macintosh/via-maciisi.c
View file

@ -288,7 +288,7 @@ static void maciisi_sync(struct adb_request *req)
} }
/* This could be BAD... when the ADB controller doesn't respond /* This could be BAD... when the ADB controller doesn't respond
* for this long, it's probably not coming back :-( */ * for this long, it's probably not coming back :-( */
if(count >= 50) /* Hopefully shouldn't happen */ if (count > 50) /* Hopefully shouldn't happen */
printk(KERN_ERR "maciisi_send_request: poll timed out!\n"); printk(KERN_ERR "maciisi_send_request: poll timed out!\n");
} }