Skip to content

Commit 7cc4766

Browse files
torvaldstorvalds
committed
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Convert ia64 to use int-ll64.h [IA64] Fix build error in paravirt_patchlist.c [IA64] ia64 does not need umount2() syscall [IA64] hook up new rt_tgsigqueueinfo syscall [IA64] msi_ia64.c dmar_msi_type should be static [IA64] remove obsolete hw_interrupt_type [IA64] remove obsolete irq_desc_t typedef [IA64] remove obsolete no_irq_type [IA64] unexport fpswa.h
2 parents 55a6fbf + 27f70c3 commit 7cc4766

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+238
-231
lines changed

‎arch/ia64/hp/common/sba_iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1787,7 +1787,7 @@ static struct ioc_iommu ioc_iommu_info[] __initdata = {
17871787
};
17881788

17891789
static struct ioc * __init
1790-
ioc_init(u64 hpa, void *handle)
1790+
ioc_init(unsigned long hpa, void *handle)
17911791
{
17921792
struct ioc *ioc;
17931793
struct ioc_iommu *info;

‎arch/ia64/hp/sim/hpsim_irq.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ hpsim_set_affinity_noop(unsigned int a, const struct cpumask *b)
2727
return 0;
2828
}
2929

30-
static struct hw_interrupt_type irq_type_hp_sim = {
30+
static struct irq_chip irq_type_hp_sim = {
3131
.name = "hpsim",
3232
.startup = hpsim_irq_startup,
3333
.shutdown = hpsim_irq_noop,
@@ -41,12 +41,12 @@ static struct hw_interrupt_type irq_type_hp_sim = {
4141
void __init
4242
hpsim_irq_init (void)
4343
{
44-
irq_desc_t *idesc;
44+
struct irq_desc *idesc;
4545
int i;
4646

4747
for (i = 0; i < NR_IRQS; ++i) {
4848
idesc = irq_desc + i;
49-
if (idesc->chip == &no_irq_type)
49+
if (idesc->chip == &no_irq_chip)
5050
idesc->chip = &irq_type_hp_sim;
5151
}
5252
}

‎arch/ia64/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ include include/asm-generic/Kbuild.asm
22

33
header-y += break.h
44
header-y += fpu.h
5-
header-y += fpswa.h
65
header-y += ia64regs.h
76
header-y += intel_intrin.h
87
header-y += perfmon_default_smpl.h

‎arch/ia64/include/asm/gcc_intrin.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ register unsigned long ia64_r13 asm ("r13") __used;
388388

389389
#define ia64_native_thash(addr) \
390390
({ \
391-
__u64 ia64_intri_res; \
391+
unsigned long ia64_intri_res; \
392392
asm volatile ("thash %0=%1" : "=r"(ia64_intri_res) : "r" (addr)); \
393393
ia64_intri_res; \
394394
})
@@ -419,7 +419,7 @@ register unsigned long ia64_r13 asm ("r13") __used;
419419

420420
#define ia64_tpa(addr) \
421421
({ \
422-
__u64 ia64_pa; \
422+
unsigned long ia64_pa; \
423423
asm volatile ("tpa %0 = %1" : "=r"(ia64_pa) : "r"(addr) : "memory"); \
424424
ia64_pa; \
425425
})
@@ -444,50 +444,50 @@ register unsigned long ia64_r13 asm ("r13") __used;
444444

445445
#define ia64_native_get_cpuid(index) \
446446
({ \
447-
__u64 ia64_intri_res; \
447+
unsigned long ia64_intri_res; \
448448
asm volatile ("mov %0=cpuid[%r1]" : "=r"(ia64_intri_res) : "rO"(index)); \
449449
ia64_intri_res; \
450450
})
451451

452452
#define __ia64_get_dbr(index) \
453453
({ \
454-
__u64 ia64_intri_res; \
454+
unsigned long ia64_intri_res; \
455455
asm volatile ("mov %0=dbr[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
456456
ia64_intri_res; \
457457
})
458458

459459
#define ia64_get_ibr(index) \
460460
({ \
461-
__u64 ia64_intri_res; \
461+
unsigned long ia64_intri_res; \
462462
asm volatile ("mov %0=ibr[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
463463
ia64_intri_res; \
464464
})
465465

466466
#define ia64_get_pkr(index) \
467467
({ \
468-
__u64 ia64_intri_res; \
468+
unsigned long ia64_intri_res; \
469469
asm volatile ("mov %0=pkr[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
470470
ia64_intri_res; \
471471
})
472472

473473
#define ia64_get_pmc(index) \
474474
({ \
475-
__u64 ia64_intri_res; \
475+
unsigned long ia64_intri_res; \
476476
asm volatile ("mov %0=pmc[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
477477
ia64_intri_res; \
478478
})
479479

480480

481481
#define ia64_native_get_pmd(index) \
482482
({ \
483-
__u64 ia64_intri_res; \
483+
unsigned long ia64_intri_res; \
484484
asm volatile ("mov %0=pmd[%1]" : "=r"(ia64_intri_res) : "r"(index)); \
485485
ia64_intri_res; \
486486
})
487487

488488
#define ia64_native_get_rr(index) \
489489
({ \
490-
__u64 ia64_intri_res; \
490+
unsigned long ia64_intri_res; \
491491
asm volatile ("mov %0=rr[%1]" : "=r"(ia64_intri_res) : "r" (index)); \
492492
ia64_intri_res; \
493493
})

‎arch/ia64/include/asm/hw_irq.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ extern struct irq_cfg irq_cfg[NR_IRQS];
106106
#define irq_to_domain(x) irq_cfg[(x)].domain
107107
DECLARE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq);
108108

109-
extern struct hw_interrupt_type irq_type_ia64_lsapic; /* CPU-internal interrupt controller */
109+
extern struct irq_chip irq_type_ia64_lsapic; /* CPU-internal interrupt controller */
110110

111111
#ifdef CONFIG_PARAVIRT_GUEST
112112
#include <asm/paravirt.h>
@@ -146,7 +146,7 @@ static inline void ia64_native_resend_irq(unsigned int vector)
146146
* Default implementations for the irq-descriptor API:
147147
*/
148148

149-
extern irq_desc_t irq_desc[NR_IRQS];
149+
extern struct irq_desc irq_desc[NR_IRQS];
150150

151151
#ifndef CONFIG_IA64_GENERIC
152152
static inline ia64_vector __ia64_irq_to_vector(int irq)

‎arch/ia64/include/asm/mca.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -72,39 +72,39 @@ typedef struct ia64_mc_info_s {
7272
struct ia64_sal_os_state {
7373

7474
/* SAL to OS */
75-
u64 os_gp; /* GP of the os registered with the SAL, physical */
76-
u64 pal_proc; /* PAL_PROC entry point, physical */
77-
u64 sal_proc; /* SAL_PROC entry point, physical */
78-
u64 rv_rc; /* MCA - Rendezvous state, INIT - reason code */
79-
u64 proc_state_param; /* from R18 */
80-
u64 monarch; /* 1 for a monarch event, 0 for a slave */
75+
unsigned long os_gp; /* GP of the os registered with the SAL, physical */
76+
unsigned long pal_proc; /* PAL_PROC entry point, physical */
77+
unsigned long sal_proc; /* SAL_PROC entry point, physical */
78+
unsigned long rv_rc; /* MCA - Rendezvous state, INIT - reason code */
79+
unsigned long proc_state_param; /* from R18 */
80+
unsigned long monarch; /* 1 for a monarch event, 0 for a slave */
8181

8282
/* common */
83-
u64 sal_ra; /* Return address in SAL, physical */
84-
u64 sal_gp; /* GP of the SAL - physical */
83+
unsigned long sal_ra; /* Return address in SAL, physical */
84+
unsigned long sal_gp; /* GP of the SAL - physical */
8585
pal_min_state_area_t *pal_min_state; /* from R17. physical in asm, virtual in C */
8686
/* Previous values of IA64_KR(CURRENT) and IA64_KR(CURRENT_STACK).
8787
* Note: if the MCA/INIT recovery code wants to resume to a new context
8888
* then it must change these values to reflect the new kernel stack.
8989
*/
90-
u64 prev_IA64_KR_CURRENT; /* previous value of IA64_KR(CURRENT) */
91-
u64 prev_IA64_KR_CURRENT_STACK;
90+
unsigned long prev_IA64_KR_CURRENT; /* previous value of IA64_KR(CURRENT) */
91+
unsigned long prev_IA64_KR_CURRENT_STACK;
9292
struct task_struct *prev_task; /* previous task, NULL if it is not useful */
9393
/* Some interrupt registers are not saved in minstate, pt_regs or
9494
* switch_stack. Because MCA/INIT can occur when interrupts are
9595
* disabled, we need to save the additional interrupt registers over
9696
* MCA/INIT and resume.
9797
*/
98-
u64 isr;
99-
u64 ifa;
100-
u64 itir;
101-
u64 iipa;
102-
u64 iim;
103-
u64 iha;
98+
unsigned long isr;
99+
unsigned long ifa;
100+
unsigned long itir;
101+
unsigned long iipa;
102+
unsigned long iim;
103+
unsigned long iha;
104104

105105
/* OS to SAL */
106-
u64 os_status; /* OS status to SAL, enum below */
107-
u64 context; /* 0 if return to same context
106+
unsigned long os_status; /* OS status to SAL, enum below */
107+
unsigned long context; /* 0 if return to same context
108108
1 if return to new context */
109109
};
110110

@@ -150,7 +150,7 @@ extern void ia64_slave_init_handler(void);
150150
extern void ia64_mca_cmc_vector_setup(void);
151151
extern int ia64_reg_MCA_extension(int (*fn)(void *, struct ia64_sal_os_state *));
152152
extern void ia64_unreg_MCA_extension(void);
153-
extern u64 ia64_get_rnat(u64 *);
153+
extern unsigned long ia64_get_rnat(unsigned long *);
154154
extern void ia64_mca_printk(const char * fmt, ...)
155155
__attribute__ ((format (printf, 1, 2)));
156156

‎arch/ia64/include/asm/meminit.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#define IA64_MAX_RSVD_REGIONS 9
2626

2727
struct rsvd_region {
28-
unsigned long start; /* virtual address of beginning of element */
29-
unsigned long end; /* virtual address of end of element + 1 */
28+
u64 start; /* virtual address of beginning of element */
29+
u64 end; /* virtual address of end of element + 1 */
3030
};
3131

3232
extern struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1];
@@ -35,13 +35,13 @@ extern int num_rsvd_regions;
3535
extern void find_memory (void);
3636
extern void reserve_memory (void);
3737
extern void find_initrd (void);
38-
extern int filter_rsvd_memory (unsigned long start, unsigned long end, void *arg);
39-
extern int filter_memory (unsigned long start, unsigned long end, void *arg);
40-
extern unsigned long efi_memmap_init(unsigned long *s, unsigned long *e);
41-
extern int find_max_min_low_pfn (unsigned long , unsigned long, void *);
38+
extern int filter_rsvd_memory (u64 start, u64 end, void *arg);
39+
extern int filter_memory (u64 start, u64 end, void *arg);
40+
extern unsigned long efi_memmap_init(u64 *s, u64 *e);
41+
extern int find_max_min_low_pfn (u64, u64, void *);
4242

4343
extern unsigned long vmcore_find_descriptor_size(unsigned long address);
44-
extern int reserve_elfcorehdr(unsigned long *start, unsigned long *end);
44+
extern int reserve_elfcorehdr(u64 *start, u64 *end);
4545

4646
/*
4747
* For rounding an address to the next IA64_GRANULE_SIZE or order
@@ -63,8 +63,8 @@ extern int register_active_ranges(u64 start, u64 len, int nid);
6363
# define LARGE_GAP 0x40000000 /* Use virtual mem map if hole is > than this */
6464
extern unsigned long vmalloc_end;
6565
extern struct page *vmem_map;
66-
extern int find_largest_hole (u64 start, u64 end, void *arg);
67-
extern int create_mem_map_page_table (u64 start, u64 end, void *arg);
66+
extern int find_largest_hole(u64 start, u64 end, void *arg);
67+
extern int create_mem_map_page_table(u64 start, u64 end, void *arg);
6868
extern int vmemmap_find_next_valid_pfn(int, int);
6969
#else
7070
static inline int vmemmap_find_next_valid_pfn(int node, int i)

‎arch/ia64/include/asm/pal.h

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -989,8 +989,8 @@ ia64_pal_cache_read (pal_cache_line_id_u_t line_id, u64 physical_addr)
989989
}
990990

991991
/* Return summary information about the hierarchy of caches controlled by the processor */
992-
static inline s64
993-
ia64_pal_cache_summary (u64 *cache_levels, u64 *unique_caches)
992+
static inline long ia64_pal_cache_summary(unsigned long *cache_levels,
993+
unsigned long *unique_caches)
994994
{
995995
struct ia64_pal_retval iprv;
996996
PAL_CALL(iprv, PAL_CACHE_SUMMARY, 0, 0, 0);
@@ -1038,8 +1038,8 @@ ia64_pal_copy_pal (u64 target_addr, u64 alloc_size, u64 processor, u64 *pal_proc
10381038
}
10391039

10401040
/* Return the number of instruction and data debug register pairs */
1041-
static inline s64
1042-
ia64_pal_debug_info (u64 *inst_regs, u64 *data_regs)
1041+
static inline long ia64_pal_debug_info(unsigned long *inst_regs,
1042+
unsigned long *data_regs)
10431043
{
10441044
struct ia64_pal_retval iprv;
10451045
PAL_CALL(iprv, PAL_DEBUG_INFO, 0, 0, 0);
@@ -1074,8 +1074,7 @@ ia64_pal_fixed_addr (u64 *global_unique_addr)
10741074
}
10751075

10761076
/* Get base frequency of the platform if generated by the processor */
1077-
static inline s64
1078-
ia64_pal_freq_base (u64 *platform_base_freq)
1077+
static inline long ia64_pal_freq_base(unsigned long *platform_base_freq)
10791078
{
10801079
struct ia64_pal_retval iprv;
10811080
PAL_CALL(iprv, PAL_FREQ_BASE, 0, 0, 0);
@@ -1437,7 +1436,7 @@ ia64_pal_proc_set_features (u64 feature_select)
14371436
* possible.
14381437
*/
14391438
typedef struct ia64_ptce_info_s {
1440-
u64 base;
1439+
unsigned long base;
14411440
u32 count[2];
14421441
u32 stride[2];
14431442
} ia64_ptce_info_t;
@@ -1478,9 +1477,9 @@ ia64_pal_register_info (u64 info_request, u64 *reg_info_1, u64 *reg_info_2)
14781477
}
14791478

14801479
typedef union pal_hints_u {
1481-
u64 ph_data;
1480+
unsigned long ph_data;
14821481
struct {
1483-
u64 si : 1,
1482+
unsigned long si : 1,
14841483
li : 1,
14851484
reserved : 62;
14861485
} pal_hints_s;
@@ -1489,8 +1488,8 @@ typedef union pal_hints_u {
14891488
/* Return information about the register stack and RSE for this processor
14901489
* implementation.
14911490
*/
1492-
static inline s64
1493-
ia64_pal_rse_info (u64 *num_phys_stacked, pal_hints_u_t *hints)
1491+
static inline long ia64_pal_rse_info(unsigned long *num_phys_stacked,
1492+
pal_hints_u_t *hints)
14941493
{
14951494
struct ia64_pal_retval iprv;
14961495
PAL_CALL(iprv, PAL_RSE_INFO, 0, 0, 0);
@@ -1608,8 +1607,7 @@ ia64_pal_vm_info (u64 tc_level, u64 tc_type, pal_tc_info_u_t *tc_info, u64 *tc_
16081607
/* Get page size information about the virtual memory characteristics of the processor
16091608
* implementation.
16101609
*/
1611-
static inline s64
1612-
ia64_pal_vm_page_size (u64 *tr_pages, u64 *vw_pages)
1610+
static inline s64 ia64_pal_vm_page_size(u64 *tr_pages, u64 *vw_pages)
16131611
{
16141612
struct ia64_pal_retval iprv;
16151613
PAL_CALL(iprv, PAL_VM_PAGE_SIZE, 0, 0, 0);

‎arch/ia64/include/asm/processor.h

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -187,40 +187,40 @@ union ia64_rr {
187187
* state comes earlier:
188188
*/
189189
struct cpuinfo_ia64 {
190-
__u32 softirq_pending;
191-
__u64 itm_delta; /* # of clock cycles between clock ticks */
192-
__u64 itm_next; /* interval timer mask value to use for next clock tick */
193-
__u64 nsec_per_cyc; /* (1000000000<<IA64_NSEC_PER_CYC_SHIFT)/itc_freq */
194-
__u64 unimpl_va_mask; /* mask of unimplemented virtual address bits (from PAL) */
195-
__u64 unimpl_pa_mask; /* mask of unimplemented physical address bits (from PAL) */
196-
__u64 itc_freq; /* frequency of ITC counter */
197-
__u64 proc_freq; /* frequency of processor */
198-
__u64 cyc_per_usec; /* itc_freq/1000000 */
199-
__u64 ptce_base;
200-
__u32 ptce_count[2];
201-
__u32 ptce_stride[2];
190+
unsigned int softirq_pending;
191+
unsigned long itm_delta; /* # of clock cycles between clock ticks */
192+
unsigned long itm_next; /* interval timer mask value to use for next clock tick */
193+
unsigned long nsec_per_cyc; /* (1000000000<<IA64_NSEC_PER_CYC_SHIFT)/itc_freq */
194+
unsigned long unimpl_va_mask; /* mask of unimplemented virtual address bits (from PAL) */
195+
unsigned long unimpl_pa_mask; /* mask of unimplemented physical address bits (from PAL) */
196+
unsigned long itc_freq; /* frequency of ITC counter */
197+
unsigned long proc_freq; /* frequency of processor */
198+
unsigned long cyc_per_usec; /* itc_freq/1000000 */
199+
unsigned long ptce_base;
200+
unsigned int ptce_count[2];
201+
unsigned int ptce_stride[2];
202202
struct task_struct *ksoftirqd; /* kernel softirq daemon for this CPU */
203203

204204
#ifdef CONFIG_SMP
205-
__u64 loops_per_jiffy;
205+
unsigned long loops_per_jiffy;
206206
int cpu;
207-
__u32 socket_id; /* physical processor socket id */
208-
__u16 core_id; /* core id */
209-
__u16 thread_id; /* thread id */
210-
__u16 num_log; /* Total number of logical processors on
207+
unsigned int socket_id; /* physical processor socket id */
208+
unsigned short core_id; /* core id */
209+
unsigned short thread_id; /* thread id */
210+
unsigned short num_log; /* Total number of logical processors on
211211
* this socket that were successfully booted */
212-
__u8 cores_per_socket; /* Cores per processor socket */
213-
__u8 threads_per_core; /* Threads per core */
212+
unsigned char cores_per_socket; /* Cores per processor socket */
213+
unsigned char threads_per_core; /* Threads per core */
214214
#endif
215215

216216
/* CPUID-derived information: */
217-
__u64 ppn;
218-
__u64 features;
219-
__u8 number;
220-
__u8 revision;
221-
__u8 model;
222-
__u8 family;
223-
__u8 archrev;
217+
unsigned long ppn;
218+
unsigned long features;
219+
unsigned char number;
220+
unsigned char revision;
221+
unsigned char model;
222+
unsigned char family;
223+
unsigned char archrev;
224224
char vendor[16];
225225
char *model_name;
226226

@@ -329,8 +329,8 @@ struct thread_struct {
329329
#else
330330
# define INIT_THREAD_PM
331331
#endif
332-
__u64 dbr[IA64_NUM_DBG_REGS];
333-
__u64 ibr[IA64_NUM_DBG_REGS];
332+
unsigned long dbr[IA64_NUM_DBG_REGS];
333+
unsigned long ibr[IA64_NUM_DBG_REGS];
334334
struct ia64_fpreg fph[96]; /* saved/loaded on demand */
335335
};
336336

0 commit comments

Comments
 (0)