[Linux-mips-commits]CVS: linux/include/asm-mips64 pgtable.h,1.2,1.3

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv13986

Modified Files:
	pgtable.h 
Log Message:
Synced up.

Index: pgtable.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/pgtable.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pgtable.h	2001/07/20 17:47:49	1.2
--- pgtable.h	2001/09/04 16:16:34	1.3
***************
*** 269,298 ****
   * and a page entry and page directory to the page they refer to.
   */
! extern inline unsigned long pmd_page(pmd_t pmd)
  {
  	return pmd_val(pmd);
  }
  
! extern inline unsigned long pgd_page(pgd_t pgd)
  {
  	return pgd_val(pgd);
  }
  
! extern inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
  {
  	pmd_val(*pmdp) = (((unsigned long) ptep) & PAGE_MASK);
  }
  
! extern inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
  {
  	pgd_val(*pgdp) = (((unsigned long) pmdp) & PAGE_MASK);
  }
  
! extern inline int pte_none(pte_t pte)
  {
  	return !pte_val(pte);
  }
  
! extern inline int pte_present(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_PRESENT;
--- 269,298 ----
   * and a page entry and page directory to the page they refer to.
   */
! static inline unsigned long pmd_page(pmd_t pmd)
  {
  	return pmd_val(pmd);
  }
  
! static inline unsigned long pgd_page(pgd_t pgd)
  {
  	return pgd_val(pgd);
  }
  
! static inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
  {
  	pmd_val(*pmdp) = (((unsigned long) ptep) & PAGE_MASK);
  }
  
! static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
  {
  	pgd_val(*pgdp) = (((unsigned long) pmdp) & PAGE_MASK);
  }
  
! static inline int pte_none(pte_t pte)
  {
  	return !pte_val(pte);
  }
  
! static inline int pte_present(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_PRESENT;
***************
*** 304,313 ****
   * hook is made available.
   */
! extern inline void set_pte(pte_t *ptep, pte_t pteval)
  {
  	*ptep = pteval;
  }
  
! extern inline void pte_clear(pte_t *ptep)
  {
  	set_pte(ptep, __pte(0));
--- 304,313 ----
   * hook is made available.
   */
! static inline void set_pte(pte_t *ptep, pte_t pteval)
  {
  	*ptep = pteval;
  }
  
! static inline void pte_clear(pte_t *ptep)
  {
  	set_pte(ptep, __pte(0));
***************
*** 324,343 ****
   * Empty pmd entries point to the invalid_pte_table.
   */
! extern inline int pmd_none(pmd_t pmd)
  {
  	return pmd_val(pmd) == (unsigned long) invalid_pte_table;
  }
  
! extern inline int pmd_bad(pmd_t pmd)
  {
  	return pmd_val(pmd) &~ PAGE_MASK;
  }
  
! extern inline int pmd_present(pmd_t pmd)
  {
  	return pmd_val(pmd) != (unsigned long) invalid_pte_table;
  }
  
! extern inline void pmd_clear(pmd_t *pmdp)
  {
  	pmd_val(*pmdp) = ((unsigned long) invalid_pte_table);
--- 324,343 ----
   * Empty pmd entries point to the invalid_pte_table.
   */
! static inline int pmd_none(pmd_t pmd)
  {
  	return pmd_val(pmd) == (unsigned long) invalid_pte_table;
  }
  
! static inline int pmd_bad(pmd_t pmd)
  {
  	return pmd_val(pmd) &~ PAGE_MASK;
  }
  
! static inline int pmd_present(pmd_t pmd)
  {
  	return pmd_val(pmd) != (unsigned long) invalid_pte_table;
  }
  
! static inline void pmd_clear(pmd_t *pmdp)
  {
  	pmd_val(*pmdp) = ((unsigned long) invalid_pte_table);
***************
*** 347,366 ****
   * Empty pgd entries point to the invalid_pmd_table.
   */
! extern inline int pgd_none(pgd_t pgd)
  {
  	return pgd_val(pgd) == (unsigned long) invalid_pmd_table;
  }
  
! extern inline int pgd_bad(pgd_t pgd)
  {
  	return pgd_val(pgd) &~ PAGE_MASK;
  }
  
! extern inline int pgd_present(pgd_t pgd)
  {
  	return pgd_val(pgd) != (unsigned long) invalid_pmd_table;
  }
  
! extern inline void pgd_clear(pgd_t *pgdp)
  {
  	pgd_val(*pgdp) = ((unsigned long) invalid_pmd_table);
--- 347,366 ----
   * Empty pgd entries point to the invalid_pmd_table.
   */
! static inline int pgd_none(pgd_t pgd)
  {
  	return pgd_val(pgd) == (unsigned long) invalid_pmd_table;
  }
  
! static inline int pgd_bad(pgd_t pgd)
  {
  	return pgd_val(pgd) &~ PAGE_MASK;
  }
  
! static inline int pgd_present(pgd_t pgd)
  {
  	return pgd_val(pgd) != (unsigned long) invalid_pmd_table;
  }
  
! static inline void pgd_clear(pgd_t *pgdp)
  {
  	pgd_val(*pgdp) = ((unsigned long) invalid_pmd_table);
***************
*** 385,409 ****
   * Undefined behaviour if not..
   */
! extern inline int pte_read(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_READ;
  }
  
! extern inline int pte_write(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_WRITE;
  }
  
! extern inline int pte_dirty(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_MODIFIED;
  }
  
! extern inline int pte_young(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_ACCESSED;
  }
  
! extern inline pte_t pte_wrprotect(pte_t pte)
  {
  	pte_val(pte) &= ~(_PAGE_WRITE | _PAGE_SILENT_WRITE);
--- 385,409 ----
   * Undefined behaviour if not..
   */
! static inline int pte_read(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_READ;
  }
  
! static inline int pte_write(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_WRITE;
  }
  
! static inline int pte_dirty(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_MODIFIED;
  }
  
! static inline int pte_young(pte_t pte)
  {
  	return pte_val(pte) & _PAGE_ACCESSED;
  }
  
! static inline pte_t pte_wrprotect(pte_t pte)
  {
  	pte_val(pte) &= ~(_PAGE_WRITE | _PAGE_SILENT_WRITE);
***************
*** 411,415 ****
  }
  
! extern inline pte_t pte_rdprotect(pte_t pte)
  {
  	pte_val(pte) &= ~(_PAGE_READ | _PAGE_SILENT_READ);
--- 411,415 ----
  }
  
! static inline pte_t pte_rdprotect(pte_t pte)
  {
  	pte_val(pte) &= ~(_PAGE_READ | _PAGE_SILENT_READ);
***************
*** 417,421 ****
  }
  
! extern inline pte_t pte_mkclean(pte_t pte)
  {
  	pte_val(pte) &= ~(_PAGE_MODIFIED|_PAGE_SILENT_WRITE);
--- 417,421 ----
  }
  
! static inline pte_t pte_mkclean(pte_t pte)
  {
  	pte_val(pte) &= ~(_PAGE_MODIFIED|_PAGE_SILENT_WRITE);
***************
*** 423,427 ****
  }
  
! extern inline pte_t pte_mkold(pte_t pte)
  {
  	pte_val(pte) &= ~(_PAGE_ACCESSED|_PAGE_SILENT_READ);
--- 423,427 ----
  }
  
! static inline pte_t pte_mkold(pte_t pte)
  {
  	pte_val(pte) &= ~(_PAGE_ACCESSED|_PAGE_SILENT_READ);
***************
*** 429,433 ****
  }
  
! extern inline pte_t pte_mkwrite(pte_t pte)
  {
  	pte_val(pte) |= _PAGE_WRITE;
--- 429,433 ----
  }
  
! static inline pte_t pte_mkwrite(pte_t pte)
  {
  	pte_val(pte) |= _PAGE_WRITE;
***************
*** 437,441 ****
  }
  
! extern inline pte_t pte_mkread(pte_t pte)
  {
  	pte_val(pte) |= _PAGE_READ;
--- 437,441 ----
  }
  
! static inline pte_t pte_mkread(pte_t pte)
  {
  	pte_val(pte) |= _PAGE_READ;
***************
*** 445,449 ****
  }
  
! extern inline pte_t pte_mkdirty(pte_t pte)
  {
  	pte_val(pte) |= _PAGE_MODIFIED;
--- 445,449 ----
  }
  
! static inline pte_t pte_mkdirty(pte_t pte)
  {
  	pte_val(pte) |= _PAGE_MODIFIED;
***************
*** 453,457 ****
  }
  
! extern inline pte_t pte_mkyoung(pte_t pte)
  {
  	pte_val(pte) |= _PAGE_ACCESSED;
--- 453,457 ----
  }
  
! static inline pte_t pte_mkyoung(pte_t pte)
  {
  	pte_val(pte) |= _PAGE_ACCESSED;
***************
*** 482,491 ****
  })
  
! extern inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
  {
  	return __pte(physpage | pgprot_val(pgprot));
  }
  
! extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
  {
  	return __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot));
--- 482,491 ----
  })
  
! static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
  {
  	return __pte(physpage | pgprot_val(pgprot));
  }
  
! static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
  {
  	return __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot));
***************
*** 500,504 ****
  
  /* to find an entry in a page-table-directory */
! extern inline pgd_t *pgd_offset(struct mm_struct *mm, unsigned long address)
  {
  	return mm->pgd + pgd_index(address);
--- 500,504 ----
  
  /* to find an entry in a page-table-directory */
! static inline pgd_t *pgd_offset(struct mm_struct *mm, unsigned long address)
  {
  	return mm->pgd + pgd_index(address);
***************
*** 506,510 ****
  
  /* Find an entry in the second-level page table.. */
! extern inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
  {
  	return (pmd_t *) pgd_page(*dir) +
--- 506,510 ----
  
  /* Find an entry in the second-level page table.. */
! static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
  {
  	return (pmd_t *) pgd_page(*dir) +
***************
*** 513,517 ****
  
  /* Find an entry in the third-level page table.. */ 
! extern inline pte_t *pte_offset(pmd_t * dir, unsigned long address)
  {
  	return (pte_t *) (pmd_page(*dir)) +
--- 513,517 ----
  
  /* Find an entry in the third-level page table.. */ 
! static inline pte_t *pte_offset(pmd_t * dir, unsigned long address)
  {
  	return (pte_t *) (pmd_page(*dir)) +
***************
*** 535,539 ****
   * low 32 bits zero.
   */
! extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
  { pte_t pte; pte_val(pte) = (type << 32) | (offset << 40); return pte; }
  
--- 535,539 ----
   * low 32 bits zero.
   */
! static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
  { pte_t pte; pte_val(pte) = (type << 32) | (offset << 40); return pte; }
  
***************
*** 551,555 ****
  
  /* TLB operations. */
! extern inline void tlb_probe(void)
  {
  	__asm__ __volatile__(
--- 551,555 ----
  
  /* TLB operations. */
! static inline void tlb_probe(void)
  {
  	__asm__ __volatile__(
***************
*** 559,563 ****
  }
  
! extern inline void tlb_read(void)
  {
  	__asm__ __volatile__(
--- 559,563 ----
  }
  
! static inline void tlb_read(void)
  {
  	__asm__ __volatile__(
***************
*** 567,571 ****
  }
  
! extern inline void tlb_write_indexed(void)
  {
  	__asm__ __volatile__(
--- 567,571 ----
  }
  
! static inline void tlb_write_indexed(void)
  {
  	__asm__ __volatile__(
***************
*** 575,579 ****
  }
  
! extern inline void tlb_write_random(void)
  {
  	__asm__ __volatile__(
--- 575,579 ----
  }
  
! static inline void tlb_write_random(void)
  {
  	__asm__ __volatile__(
***************
*** 586,590 ****
  
  /* CP0_PAGEMASK register */
! extern inline unsigned long get_pagemask(void)
  {
  	unsigned long val;
--- 586,590 ----
  
  /* CP0_PAGEMASK register */
! static inline unsigned long get_pagemask(void)
  {
  	unsigned long val;
***************
*** 598,602 ****
  }
  
! extern inline void set_pagemask(unsigned long val)
  {
  	__asm__ __volatile__(
--- 598,602 ----
  }
  
! static inline void set_pagemask(unsigned long val)
  {
  	__asm__ __volatile__(
***************
*** 608,612 ****
  
  /* CP0_ENTRYLO0 and CP0_ENTRYLO1 registers */
! extern inline unsigned long get_entrylo0(void)
  {
  	unsigned long val;
--- 608,612 ----
  
  /* CP0_ENTRYLO0 and CP0_ENTRYLO1 registers */
! static inline unsigned long get_entrylo0(void)
  {
  	unsigned long val;
***************
*** 620,624 ****
  }
  
! extern inline void set_entrylo0(unsigned long val)
  {
  	__asm__ __volatile__(
--- 620,624 ----
  }
  
! static inline void set_entrylo0(unsigned long val)
  {
  	__asm__ __volatile__(
***************
*** 629,633 ****
  }
  
! extern inline unsigned long get_entrylo1(void)
  {
  	unsigned long val;
--- 629,633 ----
  }
  
! static inline unsigned long get_entrylo1(void)
  {
  	unsigned long val;
***************
*** 641,645 ****
  }
  
! extern inline void set_entrylo1(unsigned long val)
  {
  	__asm__ __volatile__(
--- 641,645 ----
  }
  
! static inline void set_entrylo1(unsigned long val)
  {
  	__asm__ __volatile__(
***************
*** 651,655 ****
  
  /* CP0_ENTRYHI register */
! extern inline unsigned long get_entryhi(void)
  {
  	unsigned long val;
--- 651,655 ----
  
  /* CP0_ENTRYHI register */
! static inline unsigned long get_entryhi(void)
  {
  	unsigned long val;
***************
*** 664,668 ****
  }
  
! extern inline void set_entryhi(unsigned long val)
  {
  	__asm__ __volatile__(
--- 664,668 ----
  }
  
! static inline void set_entryhi(unsigned long val)
  {
  	__asm__ __volatile__(
***************
*** 674,678 ****
  
  /* CP0_INDEX register */
! extern inline unsigned int get_index(void)
  {
  	unsigned long val;
--- 674,678 ----
  
  /* CP0_INDEX register */
! static inline unsigned int get_index(void)
  {
  	unsigned long val;
***************
*** 686,690 ****
  }
  
! extern inline void set_index(unsigned int val)
  {
  	__asm__ __volatile__(
--- 686,690 ----
  }
  
! static inline void set_index(unsigned int val)
  {
  	__asm__ __volatile__(
***************
*** 696,700 ****
  
  /* CP0_WIRED register */
! extern inline unsigned long get_wired(void)
  {
  	unsigned long val;
--- 696,700 ----
  
  /* CP0_WIRED register */
! static inline unsigned long get_wired(void)
  {
  	unsigned long val;
***************
*** 708,712 ****
  }
  
! extern inline void set_wired(unsigned long val)
  {
  	__asm__ __volatile__(
--- 708,712 ----
  }
  
! static inline void set_wired(unsigned long val)
  {
  	__asm__ __volatile__(
***************
*** 717,721 ****
  }
  
! extern inline unsigned long get_info(void)
  {
  	unsigned long val;
--- 717,721 ----
  }
  
! static inline unsigned long get_info(void)
  {
  	unsigned long val;
***************
*** 731,735 ****
  
  /* CP0_TAGLO and CP0_TAGHI registers */
! extern inline unsigned long get_taglo(void)
  {
  	unsigned long val;
--- 731,735 ----
  
  /* CP0_TAGLO and CP0_TAGHI registers */
! static inline unsigned long get_taglo(void)
  {
  	unsigned long val;
***************
*** 743,747 ****
  }
  
! extern inline void set_taglo(unsigned long val)
  {
  	__asm__ __volatile__(
--- 743,747 ----
  }
  
! static inline void set_taglo(unsigned long val)
  {
  	__asm__ __volatile__(
***************
*** 752,756 ****
  }
  
! extern inline unsigned long get_taghi(void)
  {
  	unsigned long val;
--- 752,756 ----
  }
  
! static inline unsigned long get_taghi(void)
  {
  	unsigned long val;
***************
*** 764,768 ****
  }
  
! extern inline void set_taghi(unsigned long val)
  {
  	__asm__ __volatile__(
--- 764,768 ----
  }
  
! static inline void set_taghi(unsigned long val)
  {
  	__asm__ __volatile__(
***************
*** 774,778 ****
  
  /* CP0_CONTEXT register */
! extern inline unsigned long get_context(void)
  {
  	unsigned long val;
--- 774,778 ----
  
  /* CP0_CONTEXT register */
! static inline unsigned long get_context(void)
  {
  	unsigned long val;
***************
*** 787,791 ****
  }
  
! extern inline void set_context(unsigned long val)
  {
  	__asm__ __volatile__(
--- 787,791 ----
  }
  
! static inline void set_context(unsigned long val)
  {
  	__asm__ __volatile__(