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

Commit 533995ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents cc674c81 9848484f

arch/m68k/amiga/config.c

+4 −2
Original line number Diff line number Diff line
@@ -574,10 +574,11 @@ static int a2000_hwclk(int op, struct rtc_time *t) 


	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;

		udelay(70);

		tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD;

		--cnt;

	}



	if (!cnt)
@@ -649,10 +650,11 @@ static int amiga_set_clock_mmss(unsigned long nowtime) 


		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;

			udelay(70);

			tod_2000.cntrl1 |= TOD2000_CNTRL1_HOLD;

			--cnt;

		}



		if (!cnt)

arch/m68k/include/asm/motorola_pgalloc.h

+4 −6
Original line number Diff line number Diff line
@@ -36,12 +36,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres 
		return NULL;



	pte = kmap(page);

	if (pte) {

	__flush_page_to_ram(pte);

	flush_tlb_kernel_page(pte);

	nocache_page(pte);

	}

	kunmap(pte);

	kunmap(page);

	pgtable_page_ctor(page);

	return page;

}

arch/m68k/include/asm/pgtable_mm.h

+1 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, 
#endif



#ifndef __ASSEMBLY__

#include <asm-generic/pgtable.h>



/*

 * 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))	\

	    : (prot)))



#include <asm-generic/pgtable.h>

#endif /* !__ASSEMBLY__ */



/*

arch/m68k/include/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -334,10 +334,12 @@ 
#define __NR_inotify_init1	328

#define __NR_preadv		329

#define __NR_pwritev		330

#define __NR_rt_tgsigqueueinfo	331

#define __NR_perf_counter_open	332



#ifdef __KERNEL__



#define NR_syscalls		331

#define NR_syscalls		333



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

arch/m68k/kernel/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -755,4 +755,6 @@ sys_call_table: 
	.long sys_inotify_init1

	.long sys_preadv

	.long sys_pwritev		/* 330 */

	.long sys_rt_tgsigqueueinfo

	.long sys_perf_counter_open