diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-27 10:54:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-27 10:54:11 -0700 |
| commit | f9abf53af4c78b08da44d841d23308c4f4d74c83 (patch) | |
| tree | d6da18a9904884196112835cdb76e8c2a84e4fde /arch/tile/include | |
| parent | ba4f67899f9b3091744da4a4ce4057123ed02c4e (diff) | |
| parent | cdf8b4633075f2171d440d2e37c9c2609019a81a (diff) | |
| download | linux-stable-f9abf53af4c78b08da44d841d23308c4f4d74c83.tar.gz linux-stable-f9abf53af4c78b08da44d841d23308c4f4d74c83.tar.bz2 linux-stable-f9abf53af4c78b08da44d841d23308c4f4d74c83.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile architecture updates from Chris Metcalf:
"A few stray changes"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
tile: support gcc 7 optimization to use __multi3
tile 32-bit big-endian: fix bugs in syscall argument order
tile: allow disabling CONFIG_EARLY_PRINTK
Diffstat (limited to 'arch/tile/include')
| -rw-r--r-- | arch/tile/include/asm/elf.h | 1 | ||||
| -rw-r--r-- | arch/tile/include/asm/setup.h | 5 | ||||
| -rw-r--r-- | arch/tile/include/uapi/asm/auxvec.h | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/arch/tile/include/asm/elf.h b/arch/tile/include/asm/elf.h index c505d77e4d06..e9d54a06736f 100644 --- a/arch/tile/include/asm/elf.h +++ b/arch/tile/include/asm/elf.h @@ -129,6 +129,7 @@ extern int dump_task_regs(struct task_struct *, elf_gregset_t *); struct linux_binprm; extern int arch_setup_additional_pages(struct linux_binprm *bprm, int executable_stack); +/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */ #define ARCH_DLINFO \ do { \ NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \ diff --git a/arch/tile/include/asm/setup.h b/arch/tile/include/asm/setup.h index e98909033e5b..2a0347af0702 100644 --- a/arch/tile/include/asm/setup.h +++ b/arch/tile/include/asm/setup.h @@ -25,7 +25,12 @@ #define MAXMEM_PFN PFN_DOWN(MAXMEM) int tile_console_write(const char *buf, int count); + +#ifdef CONFIG_EARLY_PRINTK void early_panic(const char *fmt, ...); +#else +#define early_panic panic +#endif /* Init-time routine to do tile-specific per-cpu setup. */ void setup_cpu(int boot); diff --git a/arch/tile/include/uapi/asm/auxvec.h b/arch/tile/include/uapi/asm/auxvec.h index c93e92709f14..f497123ed980 100644 --- a/arch/tile/include/uapi/asm/auxvec.h +++ b/arch/tile/include/uapi/asm/auxvec.h @@ -18,4 +18,6 @@ /* The vDSO location. */ #define AT_SYSINFO_EHDR 33 +#define AT_VECTOR_SIZE_ARCH 1 /* entries in ARCH_DLINFO */ + #endif /* _ASM_TILE_AUXVEC_H */ |