mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-30 07:06:45 +07:00
ab54ee80aa
We have conflicting type qualifiers for "freg_t" in s390's ptrace.h and the iphase atm device driver, which causes the compile error below. Unfortunately the s390 typedef can't be renamed, since it's a user visible api, nor can I change the include order in s390 code to avoid the conflict. So simply rename the iphase typedef to a new name. Fixes this compile error: In file included from drivers/atm/iphase.c:66:0: drivers/atm/iphase.h:639:25: error: conflicting type qualifiers for 'freg_t' In file included from next/arch/s390/include/asm/ptrace.h:9:0, from next/arch/s390/include/asm/lowcore.h:12, from next/arch/s390/include/asm/thread_info.h:30, from include/linux/thread_info.h:54, from include/linux/preempt.h:9, from include/linux/spinlock.h:50, from include/linux/seqlock.h:29, from include/linux/time.h:5, from include/linux/stat.h:18, from include/linux/module.h:10, from drivers/atm/iphase.c:43: next/arch/s390/include/uapi/asm/ptrace.h:197:3: note: previous declaration of 'freg_t' was here Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
.gitignore | ||
adummy.c | ||
ambassador.c | ||
ambassador.h | ||
atmtcp.c | ||
eni.c | ||
eni.h | ||
firestream.c | ||
firestream.h | ||
fore200e.c | ||
fore200e.h | ||
he.c | ||
he.h | ||
horizon.c | ||
horizon.h | ||
idt77105.c | ||
idt77105.h | ||
idt77252_tables.h | ||
idt77252.c | ||
idt77252.h | ||
iphase.c | ||
iphase.h | ||
Kconfig | ||
lanai.c | ||
Makefile | ||
midway.h | ||
nicstar.c | ||
nicstar.h | ||
nicstarmac.c | ||
nicstarmac.copyright | ||
solos-attrlist.c | ||
solos-pci.c | ||
suni.c | ||
suni.h | ||
tonga.h | ||
uPD98401.h | ||
uPD98402.c | ||
uPD98402.h | ||
zatm.c | ||
zatm.h | ||
zeprom.h |