adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse source 
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  Add Fenghua Yu as temporary co-maintainer for ia64
  [IA64] address compiler warnings perfmon.c/salinfo.c
  [IA64] Remove unnecessary semicolons
  [IA64] sprintf should not be used with same source & destination address
This commit is contained in:
Linus Torvalds 2009-06-30 19:01:52 -07:00
commit 58580c8645
8 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MAINTAINERS
View file

@ -2851,7 +2851,9 @@ S: Maintained
IA64 (Itanium) PLATFORM IA64 (Itanium) PLATFORM
P: Tony Luck P: Tony Luck
P: Fenghua Yu
M: tony.luck@intel.com M: tony.luck@intel.com
M: fenghua.yu@intel.com
L: linux-ia64@vger.kernel.org L: linux-ia64@vger.kernel.org
W: http://www.ia64-linux.org/ W: http://www.ia64-linux.org/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git

2
arch/ia64/kernel/esi.c
View file

@ -65,7 +65,7 @@ static int __init esi_init (void)
} }
if (!esi) if (!esi)
return -ENODEV;; return -ENODEV;
systab = __va(esi); systab = __va(esi);

2
arch/ia64/kernel/perfmon.c
View file

@ -5603,7 +5603,7 @@ pfm_interrupt_handler(int irq, void *arg)
* /proc/perfmon interface, for debug only * /proc/perfmon interface, for debug only
*/ */
#define PFM_PROC_SHOW_HEADER ((void *)nr_cpu_ids+1) #define PFM_PROC_SHOW_HEADER ((void *)(long)nr_cpu_ids+1)
static void * static void *
pfm_proc_start(struct seq_file *m, loff_t *pos) pfm_proc_start(struct seq_file *m, loff_t *pos)

2
arch/ia64/kernel/salinfo.c
View file

@ -192,7 +192,7 @@ struct salinfo_platform_oemdata_parms {
static void static void
salinfo_work_to_do(struct salinfo_data *data) salinfo_work_to_do(struct salinfo_data *data)
{ {
down_trylock(&data->mutex); (void)(down_trylock(&data->mutex) ?: 0);
up(&data->mutex); up(&data->mutex);
} }

6
arch/ia64/kvm/process.c
View file

@ -130,7 +130,7 @@ static void collect_interruption(struct kvm_vcpu *vcpu)
if (vdcr & IA64_DCR_PP) { if (vdcr & IA64_DCR_PP) {
vpsr |= IA64_PSR_PP; vpsr |= IA64_PSR_PP;
} else { } else {
vpsr &= ~IA64_PSR_PP;; vpsr &= ~IA64_PSR_PP;
} }
vcpu_set_psr(vcpu, vpsr); vcpu_set_psr(vcpu, vpsr);
@ -594,11 +594,11 @@ static void set_pal_call_data(struct kvm_vcpu *vcpu)
p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30); p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30);
break; break;
case PAL_BRAND_INFO: case PAL_BRAND_INFO:
p->u.pal_data.gr29 = gr29;; p->u.pal_data.gr29 = gr29;
p->u.pal_data.gr30 = kvm_trans_pal_call_args(vcpu, gr30); p->u.pal_data.gr30 = kvm_trans_pal_call_args(vcpu, gr30);
break; break;
default: default:
p->u.pal_data.gr29 = gr29;; p->u.pal_data.gr29 = gr29;
p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30); p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30);
} }
p->u.pal_data.gr28 = gr28; p->u.pal_data.gr28 = gr28;

2
arch/ia64/kvm/vcpu.c
View file

@ -406,7 +406,7 @@ void getreg(unsigned long regnum, unsigned long *val,
* Now look at registers in [0-31] range and init correct UNAT * Now look at registers in [0-31] range and init correct UNAT
*/ */
addr = (unsigned long)regs; addr = (unsigned long)regs;
unat = &regs->eml_unat;; unat = &regs->eml_unat;
addr += gr_info[regnum]; addr += gr_info[regnum];

4
arch/ia64/kvm/vtlb.c
View file

@ -135,7 +135,7 @@ struct thash_data *__vtr_lookup(struct kvm_vcpu *vcpu, u64 va, int type)
u64 rid; u64 rid;
rid = vcpu_get_rr(vcpu, va); rid = vcpu_get_rr(vcpu, va);
rid = rid & RR_RID_MASK;; rid = rid & RR_RID_MASK;
if (type == D_TLB) { if (type == D_TLB) {
if (vcpu_quick_region_check(vcpu->arch.dtr_regions, va)) { if (vcpu_quick_region_check(vcpu->arch.dtr_regions, va)) {
for (trp = (struct thash_data *)&vcpu->arch.dtrs, i = 0; for (trp = (struct thash_data *)&vcpu->arch.dtrs, i = 0;
@ -518,7 +518,7 @@ struct thash_data *vtlb_lookup(struct kvm_vcpu *v, u64 va, int is_data)
struct thash_cb *hcb = &v->arch.vtlb; struct thash_cb *hcb = &v->arch.vtlb;
cch = __vtr_lookup(v, va, is_data);; cch = __vtr_lookup(v, va, is_data);
if (cch) if (cch)
return cch; return cch;

3
arch/ia64/sn/kernel/io_common.c
View file

@ -435,7 +435,8 @@ void sn_generate_path(struct pci_bus *pci_bus, char *address)
bricktype = MODULE_GET_BTYPE(moduleid); bricktype = MODULE_GET_BTYPE(moduleid);
if ((bricktype == L1_BRICKTYPE_191010) || if ((bricktype == L1_BRICKTYPE_191010) ||
(bricktype == L1_BRICKTYPE_1932)) (bricktype == L1_BRICKTYPE_1932))
sprintf(address, "%s^%d", address, geo_slot(geoid)); sprintf(address + strlen(address), "^%d",
geo_slot(geoid));
} }
void __devinit void __devinit