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

Commit 0db2812a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull arch/tile updates from Chris Metcalf:
 "Note that one of the changes converts my old cmetcalf@tilera.com email
  in MAINTAINERS to the cmetcalf@ezchip.com email that you see on this
  email"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: update MAINTAINERS email to EZchip
  tile: avoid undefined behavior with regs[TREG_TP] etc
  arch: tile: kernel: kgdb.c: Use memcpy() instead of pointer copy one by one
  tile: Use the more common pr_warn instead of pr_warning
  arch: tile: gxio: Export symbols for module using in 'mpipe.c'
  arch: tile: kernel: signal.c: Use __copy_from/to_user() instead of __get/put_user()
parents eb64c3c6 c47b15c4

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -9614,7 +9614,7 @@ F: include/uapi/linux/tipc*.h 
F:	net/tipc/



TILE ARCHITECTURE

M:	Chris Metcalf <cmetcalf@tilera.com>

M:	Chris Metcalf <cmetcalf@ezchip.com>

W:	http://www.tilera.com/scm/

S:	Supported

F:	arch/tile/

arch/tile/gxio/mpipe.c

+4 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ int gxio_mpipe_set_timestamp(gxio_mpipe_context_t *context, 
					    (uint64_t)ts->tv_nsec,

					    (uint64_t)cycles);

}

EXPORT_SYMBOL_GPL(gxio_mpipe_set_timestamp);



int gxio_mpipe_get_timestamp(gxio_mpipe_context_t *context,

			     struct timespec *ts)
@@ -485,11 +486,13 @@ int gxio_mpipe_get_timestamp(gxio_mpipe_context_t *context, 
	}

	return ret;

}

EXPORT_SYMBOL_GPL(gxio_mpipe_get_timestamp);



int gxio_mpipe_adjust_timestamp(gxio_mpipe_context_t *context, int64_t delta)

{

	return gxio_mpipe_adjust_timestamp_aux(context, delta);

}

EXPORT_SYMBOL_GPL(gxio_mpipe_adjust_timestamp);



/* Get our internal context used for link name access.  This context is

 *  special in that it is not associated with an mPIPE service domain.
@@ -542,6 +545,7 @@ int gxio_mpipe_link_instance(const char *link_name) 


	return gxio_mpipe_info_instance_aux(context, name);

}

EXPORT_SYMBOL_GPL(gxio_mpipe_link_instance);



int gxio_mpipe_link_enumerate_mac(int idx, char *link_name, uint8_t *link_mac)

{

arch/tile/include/asm/io.h

+2 −3
Original line number Diff line number Diff line
@@ -396,8 +396,7 @@ extern void ioport_unmap(void __iomem *addr); 
static inline long ioport_panic(void)

{

#ifdef __tilegx__

	panic("PCI IO space support is disabled. Configure the kernel with"

	      " CONFIG_TILE_PCI_IO to enable it");

	panic("PCI IO space support is disabled. Configure the kernel with CONFIG_TILE_PCI_IO to enable it");

#else

	panic("inb/outb and friends do not exist on tile");

#endif
@@ -406,7 +405,7 @@ static inline long ioport_panic(void) 


static inline void __iomem *ioport_map(unsigned long port, unsigned int len)

{

	pr_info("ioport_map: mapping IO resources is unsupported on tile.\n");

	pr_info("ioport_map: mapping IO resources is unsupported on tile\n");

	return NULL;

}

arch/tile/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -235,9 +235,9 @@ static inline void __pte_clear(pte_t *ptep) 
#define pte_donemigrate(x) hv_pte_set_present(hv_pte_clear_migrating(x))



#define pte_ERROR(e) \

	pr_err("%s:%d: bad pte 0x%016llx.\n", __FILE__, __LINE__, pte_val(e))

	pr_err("%s:%d: bad pte 0x%016llx\n", __FILE__, __LINE__, pte_val(e))

#define pgd_ERROR(e) \

	pr_err("%s:%d: bad pgd 0x%016llx.\n", __FILE__, __LINE__, pgd_val(e))

	pr_err("%s:%d: bad pgd 0x%016llx\n", __FILE__, __LINE__, pgd_val(e))



/* Return PA and protection info for a given kernel VA. */

int va_to_cpa_and_pte(void *va, phys_addr_t *cpa, pte_t *pte);

arch/tile/include/asm/pgtable_64.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static inline int pud_huge_page(pud_t pud) 
}



#define pmd_ERROR(e) \

	pr_err("%s:%d: bad pmd 0x%016llx.\n", __FILE__, __LINE__, pmd_val(e))

	pr_err("%s:%d: bad pmd 0x%016llx\n", __FILE__, __LINE__, pmd_val(e))



static inline void pud_clear(pud_t *pudp)

{