aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-s390
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-s390')
-rw-r--r--include/asm-s390/cio.h4
-rw-r--r--include/asm-s390/timex.h1
-rw-r--r--include/asm-s390/tlbflush.h3
3 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-s390/cio.h b/include/asm-s390/cio.h
index 123b557c3ff4..0818ecd30ca6 100644
--- a/include/asm-s390/cio.h
+++ b/include/asm-s390/cio.h
@@ -397,6 +397,10 @@ struct cio_iplinfo {
397 397
398extern int cio_get_iplinfo(struct cio_iplinfo *iplinfo); 398extern int cio_get_iplinfo(struct cio_iplinfo *iplinfo);
399 399
400/* Function from drivers/s390/cio/chsc.c */
401int chsc_sstpc(void *page, unsigned int op, u16 ctrl);
402int chsc_sstpi(void *page, void *result, size_t size);
403
400#endif 404#endif
401 405
402#endif 406#endif
diff --git a/include/asm-s390/timex.h b/include/asm-s390/timex.h
index 6dd7eecbb8e4..d744c3d62de5 100644
--- a/include/asm-s390/timex.h
+++ b/include/asm-s390/timex.h
@@ -83,5 +83,6 @@ static inline cycles_t get_cycles(void)
83 83
84int get_sync_clock(unsigned long long *clock); 84int get_sync_clock(unsigned long long *clock);
85void init_cpu_timer(void); 85void init_cpu_timer(void);
86unsigned long long monotonic_clock(void);
86 87
87#endif 88#endif
diff --git a/include/asm-s390/tlbflush.h b/include/asm-s390/tlbflush.h
index de723470c5d4..9e57a93d7de1 100644
--- a/include/asm-s390/tlbflush.h
+++ b/include/asm-s390/tlbflush.h
@@ -17,9 +17,10 @@ static inline void __tlb_flush_local(void)
17/* 17/*
18 * Flush all tlb entries on all cpus. 18 * Flush all tlb entries on all cpus.
19 */ 19 */
20void smp_ptlb_all(void);
21
20static inline void __tlb_flush_global(void) 22static inline void __tlb_flush_global(void)
21{ 23{
22 extern void smp_ptlb_all(void);
23 register unsigned long reg2 asm("2"); 24 register unsigned long reg2 asm("2");
24 register unsigned long reg3 asm("3"); 25 register unsigned long reg3 asm("3");
25 register unsigned long reg4 asm("4"); 26 register unsigned long reg4 asm("4");