hc
2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd
kernel/arch/ia64/include/asm/processor.h
....@@ -280,15 +280,6 @@
280280 __u64 map_base; /* base address for get_unmapped_area() */
281281 __u64 rbs_bot; /* the base address for the RBS */
282282 int last_fph_cpu; /* CPU that may hold the contents of f32-f127 */
283
-
284
-#ifdef CONFIG_PERFMON
285
- void *pfm_context; /* pointer to detailed PMU context */
286
- unsigned long pfm_needs_checking; /* when >0, pending perfmon work on kernel exit */
287
-# define INIT_THREAD_PM .pfm_context = NULL, \
288
- .pfm_needs_checking = 0UL,
289
-#else
290
-# define INIT_THREAD_PM
291
-#endif
292283 unsigned long dbr[IA64_NUM_DBG_REGS];
293284 unsigned long ibr[IA64_NUM_DBG_REGS];
294285 struct ia64_fpreg fph[96]; /* saved/loaded on demand */
....@@ -301,7 +292,6 @@
301292 .map_base = DEFAULT_MAP_BASE, \
302293 .rbs_bot = STACK_TOP - DEFAULT_USER_STACK_SIZE, \
303294 .last_fph_cpu = -1, \
304
- INIT_THREAD_PM \
305295 .dbr = {0, }, \
306296 .ibr = {0, }, \
307297 .fph = {{{{0}}}, } \
....@@ -552,7 +542,7 @@
552542 {
553543 unsigned int reg = vector / 64;
554544 unsigned int bit = vector % 64;
555
- u64 irr;
545
+ unsigned long irr;
556546
557547 switch (reg) {
558548 case 0: irr = ia64_getreg(_IA64_REG_CR_IRR0); break;
....@@ -601,12 +591,6 @@
601591
602592 *unat = (*unat & ~mask) | (nat << bit);
603593 }
604
-
605
-/*
606
- * Get the current instruction/program counter value.
607
- */
608
-#define current_text_addr() \
609
- ({ void *_pc; _pc = (void *)ia64_getreg(_IA64_REG_IP); _pc; })
610594
611595 static inline __u64
612596 ia64_get_ivr (void)
....@@ -684,8 +668,6 @@
684668 IDLE_NOMWAIT, IDLE_POLL};
685669
686670 void default_idle(void);
687
-
688
-#define ia64_platform_is(x) (strcmp(x, ia64_platform_name) == 0)
689671
690672 #endif /* !__ASSEMBLY__ */
691673