Commit 9ca4c642 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc updates from David Miller:

 1) Add a proper .exit.data section.

 2) Fix ipc64_perm type definition, from Arnd Bergmann.

 3) Support folded p4d page tables on sparc64, from Mike Rapport.

 4) Remove uses of struct timex, also from Arnd Bergmann.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  y2038: sparc: remove use of struct timex
  sparc64: add support for folded p4d page tables
  sparc/console: kill off obsolete declarations
  sparc32: fix struct ipc64_perm type definition
  sparc32, leon: Stop adding vendor and device id to prom ambapp path components
  sparc: Add .exit.data section.
  sparc: remove unneeded uapi/asm/statfs.h
parents 11f2534b d68712ee

arch/sparc/include/asm/pgalloc_64.h

+3 −3
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


extern struct kmem_cache *pgtable_cache;



static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)

static inline void __p4d_populate(p4d_t *p4d, pud_t *pud)

{

	pgd_set(pgd, pud);

	p4d_set(p4d, pud);

}



#define pgd_populate(MM, PGD, PUD)	__pgd_populate(PGD, PUD)

#define p4d_populate(MM, P4D, PUD)	__p4d_populate(P4D, PUD)



static inline pgd_t *pgd_alloc(struct mm_struct *mm)

{

arch/sparc/include/asm/pgtable_64.h

+12 −12
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * the SpitFire page tables.

 */



#include <asm-generic/5level-fixup.h>

#include <asm-generic/pgtable-nop4d.h>

#include <linux/compiler.h>

#include <linux/const.h>

#include <asm/types.h>
@@ -810,9 +810,9 @@ static inline int pmd_present(pmd_t pmd) 


#define pud_bad(pud)			(pud_val(pud) & ~PAGE_MASK)



#define pgd_none(pgd)			(!pgd_val(pgd))

#define p4d_none(p4d)			(!p4d_val(p4d))



#define pgd_bad(pgd)			(pgd_val(pgd) & ~PAGE_MASK)

#define p4d_bad(p4d)			(p4d_val(p4d) & ~PAGE_MASK)



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

void set_pmd_at(struct mm_struct *mm, unsigned long addr,
@@ -859,13 +859,13 @@ static inline unsigned long pud_page_vaddr(pud_t pud) 
#define pmd_clear(pmdp)			(pmd_val(*(pmdp)) = 0UL)

#define pud_present(pud)		(pud_val(pud) != 0U)

#define pud_clear(pudp)			(pud_val(*(pudp)) = 0UL)

#define pgd_page_vaddr(pgd)		\

	((unsigned long) __va(pgd_val(pgd)))

#define pgd_present(pgd)		(pgd_val(pgd) != 0U)

#define pgd_clear(pgdp)			(pgd_val(*(pgdp)) = 0UL)

#define p4d_page_vaddr(p4d)		\

	((unsigned long) __va(p4d_val(p4d)))

#define p4d_present(p4d)		(p4d_val(p4d) != 0U)

#define p4d_clear(p4dp)			(p4d_val(*(p4dp)) = 0UL)



/* only used by the stubbed out hugetlb gup code, should never be called */

#define pgd_page(pgd)			NULL

#define p4d_page(p4d)			NULL



static inline unsigned long pud_large(pud_t pud)

{
@@ -884,8 +884,8 @@ static inline unsigned long pud_pfn(pud_t pud) 
/* Same in both SUN4V and SUN4U.  */

#define pte_none(pte) 			(!pte_val(pte))



#define pgd_set(pgdp, pudp)	\

	(pgd_val(*(pgdp)) = (__pa((unsigned long) (pudp))))

#define p4d_set(p4dp, pudp)	\

	(p4d_val(*(p4dp)) = (__pa((unsigned long) (pudp))))



/* to find an entry in a page-table-directory. */

#define pgd_index(address)	(((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
@@ -896,8 +896,8 @@ static inline unsigned long pud_pfn(pud_t pud) 


/* Find an entry in the third-level page table.. */

#define pud_index(address)	(((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))

#define pud_offset(pgdp, address)	\

	((pud_t *) pgd_page_vaddr(*(pgdp)) + pud_index(address))

#define pud_offset(p4dp, address)	\

	((pud_t *) p4d_page_vaddr(*(p4dp)) + pud_index(address))



/* Find an entry in the second-level page table.. */

#define pmd_offset(pudp, address)	\

arch/sparc/include/uapi/asm/ipcbuf.h

+11 −11
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
struct ipc64_perm

{

	__kernel_key_t		key;

	__kernel_uid_t	uid;

	__kernel_gid_t	gid;

	__kernel_uid_t	cuid;

	__kernel_gid_t	cgid;

	__kernel_uid32_t	uid;

	__kernel_gid32_t	gid;

	__kernel_uid32_t	cuid;

	__kernel_gid32_t	cgid;

#ifndef __arch64__

	unsigned short		__pad0;

#endif

arch/sparc/include/uapi/asm/statfs.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef ___ASM_SPARC_STATFS_H

#define ___ASM_SPARC_STATFS_H



#include <asm-generic/statfs.h>



#endif

arch/sparc/kernel/prom_32.c

+4 −14
Original line number Diff line number Diff line
@@ -132,12 +132,13 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf) 
		regs->which_io, regs->phys_addr);

}



/* "name:vendor:device@irq,addrlo" */

/* "name@irq,addrlo" */

static void __init ambapp_path_component(struct device_node *dp, char *tmp_buf)

{

	const char *name = of_get_property(dp, "name", NULL);

	struct amba_prom_registers *regs;

	unsigned int *intr, *device, *vendor, reg0;

	unsigned int *intr;

	unsigned int reg0;

	struct property *prop;

	int interrupt = 0;
@@ -159,18 +160,7 @@ static void __init ambapp_path_component(struct device_node *dp, char *tmp_buf) 
	else

		intr = prop->value;



	prop = of_find_property(dp, "vendor", NULL);

	if (!prop)

		return;

	vendor = prop->value;

	prop = of_find_property(dp, "device", NULL);

	if (!prop)

		return;

	device = prop->value;



	sprintf(tmp_buf, "%s:%d:%d@%x,%x",

		name, *vendor, *device,

		*intr, reg0);

	sprintf(tmp_buf, "%s@%x,%x", name, *intr, reg0);

}



static void __init __build_path_component(struct device_node *dp, char *tmp_buf)

CRA Git | Maintained and supported by SUSTech CRA and CCSE