diff for duplicates of <20080422194855.GC14628@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 6a6120d..699971c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,8 @@ Signed-off-by: Dean Nelson <dcn@sgi.com> 3 files changed, 322 insertions(+), 506 deletions(-) Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c -=================================--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_channel.c 2008-04-22 11:20:44.000000000 -0500 +=================================================================== +--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_channel.c 2008-04-22 11:20:44.000000000 -0500 +++ linux-2.6/drivers/misc/sgi-xp/xpc_channel.c 2008-04-22 11:32:20.848407833 -0500 @@ -6,7 +6,6 @@ * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. @@ -37,16 +38,16 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c * Guarantee that the kzalloc'd memory is cacheline aligned. */ @@ -39,7 +36,7 @@ xpc_kzalloc_cacheline_aligned(size_t siz - if (*base = NULL) { + if (*base == NULL) { return NULL; } -- if ((u64) *base = L1_CACHE_ALIGN((u64) *base)) { -+ if ((u64)*base = L1_CACHE_ALIGN((u64)*base)) { +- if ((u64) *base == L1_CACHE_ALIGN((u64) *base)) { ++ if ((u64)*base == L1_CACHE_ALIGN((u64)*base)) { return *base; } kfree(*base); @@ -49,10 +46,9 @@ xpc_kzalloc_cacheline_aligned(size_t siz - if (*base = NULL) { + if (*base == NULL) { return NULL; } - return (void *) L1_CACHE_ALIGN((u64) *base); @@ -68,7 +69,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c @@ -72,7 +67,7 @@ xpc_initialize_channels(struct xpc_parti ch->local_GP = &part->local_GPs[ch_number]; - ch->local_openclose_args - &part->local_openclose_args[ch_number]; + ch->local_openclose_args = +- &part->local_openclose_args[ch_number]; + &part->local_openclose_args[ch_number]; atomic_set(&ch->kthreads_assigned, 0); @@ -103,7 +105,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c part->channels = kzalloc(sizeof(struct xpc_channel) * XPC_NCHANNELS, - GFP_KERNEL); + GFP_KERNEL); - if (part->channels = NULL) { + if (part->channels == NULL) { dev_err(xpc_chan, "can't get memory for channels\n"); return xpcNoMemory; @@ -126,11 +119,11 @@ xpc_setup_infrastructure(struct xpc_part @@ -117,7 +119,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c - GFP_KERNEL, &part->local_GPs_base); + GFP_KERNEL, + &part->local_GPs_base); - if (part->local_GPs = NULL) { + if (part->local_GPs == NULL) { kfree(part->channels); part->channels = NULL; @@ -140,7 +133,9 @@ xpc_setup_infrastructure(struct xpc_part @@ -128,7 +130,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c + GFP_KERNEL, + &part-> + remote_GPs_base); - if (part->remote_GPs = NULL) { + if (part->remote_GPs == NULL) { dev_err(xpc_chan, "can't get memory for remote get/put " "values\n"); @@ -151,12 +146,11 @@ xpc_setup_infrastructure(struct xpc_part @@ -141,9 +143,10 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c - part->local_openclose_args = xpc_kzalloc_cacheline_aligned( - XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL, - &part->local_openclose_args_base); -+ part->local_openclose_args + xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL, ++ part->local_openclose_args = ++ xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL, + &part->local_openclose_args_base); - if (part->local_openclose_args = NULL) { + if (part->local_openclose_args == NULL) { dev_err(xpc_chan, "can't get memory for local connect args\n"); kfree(part->remote_GPs_base); @@ -168,9 +162,9 @@ xpc_setup_infrastructure(struct xpc_part @@ -153,9 +156,10 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c - part->remote_openclose_args = xpc_kzalloc_cacheline_aligned( - XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL, - &part->remote_openclose_args_base); -+ part->remote_openclose_args + xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL, ++ part->remote_openclose_args = ++ xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL, + &part->remote_openclose_args_base); - if (part->remote_openclose_args = NULL) { + if (part->remote_openclose_args == NULL) { dev_err(xpc_chan, "can't get memory for remote connect args\n"); kfree(part->local_openclose_args_base); @@ -184,13 +178,11 @@ xpc_setup_infrastructure(struct xpc_part @@ -203,7 +207,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c @@ -244,7 +235,7 @@ xpc_setup_infrastructure(struct xpc_part */ xpc_vars_part[partid].GPs_pa = __pa(part->local_GPs); - xpc_vars_part[partid].openclose_args_pa - __pa(part->local_openclose_args); + xpc_vars_part[partid].openclose_args_pa = +- __pa(part->local_openclose_args); + __pa(part->local_openclose_args); xpc_vars_part[partid].IPI_amo_pa = __pa(part->local_IPI_amo_va); cpuid = raw_smp_processor_id(); /* any CPU in this partition will do */ @@ -232,7 +237,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c + DBUG_ON((u64)dst != L1_CACHE_ALIGN((u64)dst)); DBUG_ON(cnt != L1_CACHE_ALIGN(cnt)); - if (part->act_state = XPC_P_DEACTIVATING) { + if (part->act_state == XPC_P_DEACTIVATING) { return part->reason; } @@ -240,7 +245,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c - (BTE_NORMAL | BTE_WACQUIRE), NULL); + bte_ret = xp_bte_copy((u64)src, (u64)dst, (u64)cnt, + (BTE_NORMAL | BTE_WACQUIRE), NULL); - if (bte_ret = BTE_SUCCESS) { + if (bte_ret == BTE_SUCCESS) { return xpcSuccess; } @@ -291,7 +280,6 @@ xpc_pull_remote_cachelines(struct xpc_pa @@ -254,7 +259,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c @@ -301,41 +289,40 @@ xpc_pull_remote_vars_part(struct xpc_par { u8 buffer[L1_CACHE_BYTES * 2]; - struct xpc_vars_part *pulled_entry_cacheline - (struct xpc_vars_part *) L1_CACHE_ALIGN((u64) buffer); + struct xpc_vars_part *pulled_entry_cacheline = +- (struct xpc_vars_part *) L1_CACHE_ALIGN((u64) buffer); + (struct xpc_vars_part *)L1_CACHE_ALIGN((u64)buffer); struct xpc_vars_part *pulled_entry; u64 remote_entry_cacheline_pa, remote_entry_pa; @@ -264,7 +270,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c - /* pull the cacheline that contains the variables we're interested in */ - DBUG_ON(part->remote_vars_part_pa !- L1_CACHE_ALIGN(part->remote_vars_part_pa)); + DBUG_ON(part->remote_vars_part_pa != +- L1_CACHE_ALIGN(part->remote_vars_part_pa)); + L1_CACHE_ALIGN(part->remote_vars_part_pa)); DBUG_ON(sizeof(struct xpc_vars_part) != L1_CACHE_BYTES / 2); @@ -303,20 +310,22 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c @@ -353,8 +340,8 @@ xpc_pull_remote_vars_part(struct xpc_par /* validate the variables */ - if (pulled_entry->GPs_pa = 0 || -- pulled_entry->openclose_args_pa = 0 || -- pulled_entry->IPI_amo_pa = 0) { -+ pulled_entry->openclose_args_pa = 0 || -+ pulled_entry->IPI_amo_pa = 0) { + if (pulled_entry->GPs_pa == 0 || +- pulled_entry->openclose_args_pa == 0 || +- pulled_entry->IPI_amo_pa == 0) { ++ pulled_entry->openclose_args_pa == 0 || ++ pulled_entry->IPI_amo_pa == 0) { dev_err(xpc_chan, "partition %d's XPC vars_part for " "partition %d are not valid\n", partid, @@ -366,9 +353,9 @@ xpc_pull_remote_vars_part(struct xpc_par part->remote_GPs_pa = pulled_entry->GPs_pa; - part->remote_openclose_args_pa - pulled_entry->openclose_args_pa; + part->remote_openclose_args_pa = +- pulled_entry->openclose_args_pa; + pulled_entry->openclose_args_pa; - part->remote_IPI_amo_va - (AMO_t *) __va(pulled_entry->IPI_amo_pa); + part->remote_IPI_amo_va = +- (AMO_t *) __va(pulled_entry->IPI_amo_pa); + (AMO_t *)__va(pulled_entry->IPI_amo_pa); part->remote_IPI_nasid = pulled_entry->IPI_nasid; part->remote_IPI_phys_cpuid = pulled_entry->IPI_phys_cpuid; @@ -390,7 +399,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c + GFP_KERNEL, + &ch-> + local_msgqueue_base); - if (ch->local_msgqueue = NULL) { + if (ch->local_msgqueue == NULL) { continue; } @@ -497,7 +481,6 @@ xpc_allocate_local_msgqueue(struct xpc_c @@ -418,7 +427,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c + GFP_KERNEL, + &ch-> + remote_msgqueue_base); - if (ch->remote_msgqueue = NULL) { + if (ch->remote_msgqueue == NULL) { continue; } @@ -542,7 +525,6 @@ xpc_allocate_remote_msgqueue(struct xpc_ @@ -485,8 +494,9 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c @@ -660,8 +637,7 @@ xpc_notify_senders(struct xpc_channel *c */ notify_type = notify->type; - if (notify_type = 0 || -- cmpxchg(¬ify->type, notify_type, 0) !- notify_type) { + if (notify_type == 0 || +- cmpxchg(¬ify->type, notify_type, 0) != +- notify_type) { + cmpxchg(¬ify->type, notify_type, 0) != notify_type) { continue; } @@ -543,7 +553,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c - !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE)); + !(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE)); - if (part->act_state = XPC_P_DEACTIVATING) { + if (part->act_state == XPC_P_DEACTIVATING) { /* can't proceed until the other side disengages from us */ @@ -809,7 +782,7 @@ xpc_process_disconnect(struct xpc_channe @@ -576,7 +586,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c + u8 IPI_flags) { unsigned long irq_flags; - struct xpc_openclose_args *args - &part->remote_openclose_args[ch_number]; + struct xpc_openclose_args *args = +- &part->remote_openclose_args[ch_number]; + &part->remote_openclose_args[ch_number]; struct xpc_channel *ch = &part->channels[ch_number]; enum xpc_retval reason; @@ -655,7 +666,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c @@ -982,7 +950,7 @@ again: ch->partid, ch->number); - if (part->act_state = XPC_P_DEACTIVATING || + if (part->act_state == XPC_P_DEACTIVATING || - (ch->flags & XPC_C_ROPENREQUEST)) { + (ch->flags & XPC_C_ROPENREQUEST)) { spin_unlock_irqrestore(&ch->lock, irq_flags); @@ -725,7 +736,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c struct xpc_registration *registration = &xpc_registrations[ch->number]; - - if (mutex_trylock(®istration->mutex) = 0) { + if (mutex_trylock(®istration->mutex) == 0) { return xpcRetry; } @@ -1124,7 +1088,6 @@ xpc_connect_channel(struct xpc_channel * @@ -814,9 +825,9 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c xpc_msgqueue_ref(ch); - if (ch->w_remote_GP.get = ch->remote_GP.get && -- ch->w_remote_GP.put = ch->remote_GP.put) { -+ ch->w_remote_GP.put = ch->remote_GP.put) { + if (ch->w_remote_GP.get == ch->remote_GP.get && +- ch->w_remote_GP.put == ch->remote_GP.put) { ++ ch->w_remote_GP.put == ch->remote_GP.put) { /* nothing changed since GPs were last pulled */ xpc_msgqueue_deref(ch); return; @@ -943,7 +954,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c * Before proceeding with the teardown we have to wait until all @@ -1483,7 +1427,6 @@ xpc_teardown_infrastructure(struct xpc_p */ - wait_event(part->teardown_wq, (atomic_read(&part->references) = 0)); + wait_event(part->teardown_wq, (atomic_read(&part->references) == 0)); - /* now we can begin tearing down the infrastructure */ @@ -1069,8 +1080,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c - if (ch->flags & XPC_C_DISCONNECTING) { -- DBUG_ON(ch->reason = xpcInterrupted); // >>> Is this true? -+ DBUG_ON(ch->reason = xpcInterrupted); // >>> Is this true? +- DBUG_ON(ch->reason == xpcInterrupted); // >>> Is this true? ++ DBUG_ON(ch->reason == xpcInterrupted); // >>> Is this true? return ch->reason; } @@ -1078,9 +1089,9 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c if (ch->flags & XPC_C_DISCONNECTING) { ret = ch->reason; -- DBUG_ON(ch->reason = xpcInterrupted); // >>> Is this true? -+ DBUG_ON(ch->reason = xpcInterrupted); // >>> Is this true? - } else if (ret = 0) { +- DBUG_ON(ch->reason == xpcInterrupted); // >>> Is this true? ++ DBUG_ON(ch->reason == xpcInterrupted); // >>> Is this true? + } else if (ret == 0) { ret = xpcTimeout; } else { @@ -1719,20 +1652,18 @@ xpc_allocate_msg_wait(struct xpc_channel @@ -1130,10 +1141,10 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c * doesn't beat us to it. If they do, we'll have to * try again. - */ -- if (cmpxchg(&ch->w_local_GP.put, put, put + 1) = +- if (cmpxchg(&ch->w_local_GP.put, put, put + 1) == - put) { + */ -+ if (cmpxchg(&ch->w_local_GP.put, put, put + 1) = put) { ++ if (cmpxchg(&ch->w_local_GP.put, put, put + 1) == put) { /* we got the entry referenced by put */ break; } @@ -1197,8 +1208,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c while (1) { while (1) { -- if (put = (volatile s64) ch->w_local_GP.put) { -+ if (put = (volatile s64)ch->w_local_GP.put) { +- if (put == (volatile s64) ch->w_local_GP.put) { ++ if (put == (volatile s64)ch->w_local_GP.put) { break; } @@ -1213,7 +1224,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c @@ -1893,9 +1816,9 @@ xpc_send_msgs(struct xpc_channel *ch, s6 } - if (cmpxchg_rel(&ch->local_GP->put, initial_put, put) !- initial_put) { + if (cmpxchg_rel(&ch->local_GP->put, initial_put, put) != +- initial_put) { + initial_put) { /* someone else beat us to it */ - DBUG_ON((volatile s64) ch->local_GP->put < initial_put); @@ -1241,16 +1253,18 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c s64 put, msg_number = msg->number; - - DBUG_ON(notify_type = XPC_N_CALL && func = NULL); -- DBUG_ON((((u64) msg - (u64) ch->local_msgqueue) / ch->msg_size) !- msg_number % ch->local_nentries); -+ DBUG_ON((((u64)msg - (u64)ch->local_msgqueue) / ch->msg_size) !+ msg_number % ch->local_nentries); + DBUG_ON(notify_type == XPC_N_CALL && func == NULL); +- DBUG_ON((((u64) msg - (u64) ch->local_msgqueue) / ch->msg_size) != +- msg_number % ch->local_nentries); ++ DBUG_ON((((u64)msg - (u64)ch->local_msgqueue) / ch->msg_size) != ++ msg_number % ch->local_nentries); DBUG_ON(msg->flags & XPC_M_READY); if (ch->flags & XPC_C_DISCONNECTING) { @@ -1970,7 +1891,7 @@ xpc_send_msg(struct xpc_channel *ch, str * the notify entry. */ - if (cmpxchg(¬ify->type, notify_type, 0) = + if (cmpxchg(¬ify->type, notify_type, 0) == - notify_type) { + notify_type) { atomic_dec(&ch->n_to_notify); @@ -1300,7 +1314,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS); @@ -2091,11 +2008,10 @@ xpc_initiate_send_notify(partid_t partid - DBUG_ON(func = NULL); + DBUG_ON(func == NULL); ret = xpc_send_msg(&part->channels[ch_number], msg, XPC_N_CALL, - func, key); @@ -1323,7 +1337,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c @@ -2118,22 +2033,22 @@ xpc_pull_remote_msg(struct xpc_channel * msg_index = ch->next_msg_to_pull % ch->remote_nentries; - DBUG_ON(ch->next_msg_to_pull >- (volatile s64) ch->w_remote_GP.put); + DBUG_ON(ch->next_msg_to_pull >= +- (volatile s64) ch->w_remote_GP.put); - nmsgs = (volatile s64) ch->w_remote_GP.put - - ch->next_msg_to_pull; + (volatile s64)ch->w_remote_GP.put); @@ -1345,7 +1360,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c if ((ret = xpc_pull_remote_cachelines(part, msg, remote_msg, - nmsgs * ch->msg_size)) != xpcSuccess) { -+ nmsgs * ch->msg_size)) !+ xpcSuccess) { ++ nmsgs * ch->msg_size)) != ++ xpcSuccess) { dev_dbg(xpc_chan, "failed to pull %d msgs starting with" " msg %ld from partition %d, channel=%d, " @@ -1384,9 +1400,9 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c } - get = (volatile s64) ch->w_local_GP.get; -- if (get = (volatile s64) ch->w_remote_GP.put) { +- if (get == (volatile s64) ch->w_remote_GP.put) { + get = (volatile s64)ch->w_local_GP.get; -+ if (get = (volatile s64)ch->w_remote_GP.put) { ++ if (get == (volatile s64)ch->w_remote_GP.put) { break; } @@ -1397,7 +1413,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c - */ + */ - if (cmpxchg(&ch->w_local_GP.get, get, get + 1) = get) { + if (cmpxchg(&ch->w_local_GP.get, get, get + 1) == get) { /* we got the entry referenced by get */ @@ -2211,7 +2124,6 @@ xpc_get_deliverable_msg(struct xpc_chann return msg; @@ -1451,8 +1467,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c while (1) { while (1) { -- if (get = (volatile s64) ch->w_local_GP.get) { -+ if (get = (volatile s64)ch->w_local_GP.get) { +- if (get == (volatile s64) ch->w_local_GP.get) { ++ if (get == (volatile s64)ch->w_local_GP.get) { break; } @@ -1467,10 +1483,12 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c @@ -2290,10 +2200,9 @@ xpc_acknowledge_msgs(struct xpc_channel } - if (cmpxchg_rel(&ch->local_GP->get, initial_get, get) !- initial_get) { + if (cmpxchg_rel(&ch->local_GP->get, initial_get, get) != +- initial_get) { + initial_get) { /* someone else beat us to it */ -- DBUG_ON((volatile s64) ch->local_GP->get <- initial_get); +- DBUG_ON((volatile s64) ch->local_GP->get <= +- initial_get); + DBUG_ON((volatile s64)ch->local_GP->get <= initial_get); break; } @@ -1497,8 +1515,10 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c - (void *) msg, msg_number, ch->partid, ch->number); + (void *)msg, msg_number, ch->partid, ch->number); -- DBUG_ON((((u64) msg - (u64) ch->remote_msgqueue) / ch->msg_size) !- msg_number % ch->remote_nentries); -+ DBUG_ON((((u64)msg - (u64)ch->remote_msgqueue) / ch->msg_size) !+ msg_number % ch->remote_nentries); +- DBUG_ON((((u64) msg - (u64) ch->remote_msgqueue) / ch->msg_size) != +- msg_number % ch->remote_nentries); ++ DBUG_ON((((u64)msg - (u64)ch->remote_msgqueue) / ch->msg_size) != ++ msg_number % ch->remote_nentries); DBUG_ON(msg->flags & XPC_M_DONE); msg->flags |= XPC_M_DONE; @@ -1508,7 +1528,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c } - Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c -=================================--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_main.c 2008-04-22 10:54:11.000000000 -0500 +=================================================================== +--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_main.c 2008-04-22 10:54:11.000000000 -0500 +++ linux-2.6/drivers/misc/sgi-xp/xpc_main.c 2008-04-22 11:32:20.872410785 -0500 @@ -6,7 +6,6 @@ * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. @@ -1792,7 +1813,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c - (void) msleep_interruptible(250); + (void)msleep_interruptible(250); - if (part->act_state = XPC_P_DEACTIVATING) { + if (part->act_state == XPC_P_DEACTIVATING) { return part->reason; @@ -369,7 +346,6 @@ xpc_make_first_contact(struct xpc_partit return xpc_mark_partition_active(part); @@ -1824,9 +1845,9 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c - (void) wait_event_interruptible(part->channel_mgr_wq, - (atomic_read(&part->channel_mgr_requests) > 0 || - (volatile u64) part->local_IPI_amo != 0 || -- ((volatile u8) part->act_state = +- ((volatile u8) part->act_state == - XPC_P_DEACTIVATING && -- atomic_read(&part->nchannels_active) = 0 && +- atomic_read(&part->nchannels_active) == 0 && - xpc_partition_disengaged(part)))); + (void)wait_event_interruptible(part->channel_mgr_wq, + (atomic_read @@ -1834,11 +1855,11 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c + 0 || + (volatile u64)part-> + local_IPI_amo != 0 || -+ ((volatile u8)part->act_state = ++ ((volatile u8)part->act_state == + XPC_P_DEACTIVATING && + atomic_read(&part-> + nchannels_active) -+ = 0 && ++ == 0 && + xpc_partition_disengaged + (part)))); atomic_set(&part->channel_mgr_requests, 1); @@ -1859,7 +1880,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c - (void) xpc_part_ref(part); /* this will always succeed */ + (void)xpc_part_ref(part); /* this will always succeed */ - if (xpc_make_first_contact(part) = xpcSuccess) { + if (xpc_make_first_contact(part) == xpcSuccess) { xpc_channel_mgr(part); @@ -465,17 +445,15 @@ xpc_partition_up(struct xpc_partition *p xpc_teardown_infrastructure(part); @@ -2109,7 +2130,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c } @@ -843,10 +809,10 @@ xpc_create_kthreads(struct xpc_channel * - if (atomic_inc_return(&part->nchannels_engaged) = 1) + if (atomic_inc_return(&part->nchannels_engaged) == 1) xpc_mark_partition_engaged(part); } - (void) xpc_part_ref(part); @@ -2179,7 +2200,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c - /* a 'rmmod XPC' and a 'reboot' cannot both end up here together */ - DBUG_ON(xpc_exiting = 1); + DBUG_ON(xpc_exiting == 1); @@ -971,10 +934,8 @@ xpc_do_exit(enum xpc_retval reason) /* wait for the heartbeat checker thread to exit */ @@ -2197,8 +2218,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c part = &xpc_partitions[partid]; if (xpc_partition_disengaged(part) && -- part->act_state = XPC_P_INACTIVE) { -+ part->act_state = XPC_P_INACTIVE) { +- part->act_state == XPC_P_INACTIVE) { ++ part->act_state == XPC_P_INACTIVE) { continue; } @@ -2208,7 +2229,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c if (part->disengage_request_timeout > - disengage_request_timeout) { + disengage_request_timeout) { - disengage_request_timeout - part->disengage_request_timeout; + disengage_request_timeout = +- part->disengage_request_timeout; + part->disengage_request_timeout; } } @@ -2261,7 +2283,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c @@ -1047,16 +1007,15 @@ xpc_do_exit(enum xpc_retval reason) - if (reason = xpcUnloading) { + if (reason == xpcUnloading) { /* take ourselves off of the reboot_notifier_list */ - (void) unregister_reboot_notifier(&xpc_reboot_notifier); + (void)unregister_reboot_notifier(&xpc_reboot_notifier); @@ -2402,7 +2424,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c - GFP_KERNEL, &xpc_remote_copy_buffer_base); + GFP_KERNEL, + &xpc_remote_copy_buffer_base); - if (xpc_remote_copy_buffer = NULL) + if (xpc_remote_copy_buffer == NULL) return -ENOMEM; @@ -1256,7 +1207,7 @@ xpc_init(void) @@ -2417,7 +2439,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c @@ -1265,8 +1216,8 @@ xpc_init(void) init_timer(&part->disengage_request_timer); - part->disengage_request_timer.function - xpc_timeout_partition_disengage_request; + part->disengage_request_timer.function = +- xpc_timeout_partition_disengage_request; - part->disengage_request_timer.data = (unsigned long) part; + xpc_timeout_partition_disengage_request; + part->disengage_request_timer.data = (unsigned long)part; @@ -2512,7 +2535,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c - + "other partitions when dropping into kdebug."); Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c -=================================--- linux-2.6.orig/drivers/misc/sgi-xp/xpnet.c 2008-04-22 11:21:17.000000000 -0500 +=================================================================== +--- linux-2.6.orig/drivers/misc/sgi-xp/xpnet.c 2008-04-22 11:21:17.000000000 -0500 +++ linux-2.6/drivers/misc/sgi-xp/xpnet.c 2008-04-22 11:32:20.908415213 -0500 @@ -6,7 +6,6 @@ * Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved. @@ -2558,7 +2582,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c +#define XPNET_MAGIC 0x88786984 /* "XNET" */ #define XPNET_VALID_MSG(_m) \ - ((XPNET_VERSION_MAJOR(_m->version) = XPNET_VERSION_MAJOR(XPNET_VERSION)) \ + ((XPNET_VERSION_MAJOR(_m->version) == XPNET_VERSION_MAJOR(XPNET_VERSION)) \ @@ -101,7 +97,6 @@ struct xpnet_message { #define XPNET_DEVICE_NAME "xp0" @@ -2595,7 +2619,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c @@ -178,14 +171,13 @@ xpnet_receive(partid_t partid, int chann struct sk_buff *skb; bte_result_t bret; - struct xpnet_dev_private *priv - (struct xpnet_dev_private *) xpnet_device->priv; + struct xpnet_dev_private *priv = +- (struct xpnet_dev_private *) xpnet_device->priv; - + (struct xpnet_dev_private *)xpnet_device->priv; @@ -2627,7 +2652,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c @@ -227,12 +218,13 @@ xpnet_receive(partid_t partid, int chann * Move the data over from the other side. */ - if ((XPNET_VERSION_MINOR(msg->version) = 1) && + if ((XPNET_VERSION_MINOR(msg->version) == 1) && - (msg->embedded_bytes != 0)) { + (msg->embedded_bytes != 0)) { dev_dbg(xpnet, "copying embedded message. memcpy(0x%p, 0x%p, " @@ -2692,7 +2717,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c - switch(reason) { + switch (reason) { case xpcMsgReceived: /* message received */ - DBUG_ON(data = NULL); + DBUG_ON(data == NULL); - xpnet_receive(partid, channel, (struct xpnet_message *) data); + xpnet_receive(partid, channel, (struct xpnet_message *)data); @@ -2782,15 +2807,16 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c - void *__qm) + void *__qm) { -- struct xpnet_pending_msg *queued_msg - (struct xpnet_pending_msg *) __qm; +- struct xpnet_pending_msg *queued_msg = +- (struct xpnet_pending_msg *) __qm; - + struct xpnet_pending_msg *queued_msg = (struct xpnet_pending_msg *)__qm; - DBUG_ON(queued_msg = NULL); + DBUG_ON(queued_msg == NULL); @@ -439,14 +418,13 @@ xpnet_send_completed(enum xpc_retval rea - if (atomic_dec_return(&queued_msg->use_count) = 0) { + if (atomic_dec_return(&queued_msg->use_count) == 0) { dev_dbg(xpnet, "all acks for skb->head=-x%p\n", - (void *) queued_msg->skb->head); + (void *)queued_msg->skb->head); @@ -2825,7 +2851,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c * xpc_send_notifies are relying on this skb. When none @@ -487,16 +462,15 @@ xpnet_dev_hard_start_xmit(struct sk_buff queued_msg = kmalloc(sizeof(struct xpnet_pending_msg), GFP_ATOMIC); - if (queued_msg = NULL) { + if (queued_msg == NULL) { dev_warn(xpnet, "failed to kmalloc %ld bytes; dropping " - "packet\n", sizeof(struct xpnet_pending_msg)); + "packet\n", sizeof(struct xpnet_pending_msg)); @@ -2856,7 +2882,7 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c - second_mac_octet = skb->data[XPNET_PARTID_OCTET]; - if (second_mac_octet = 0xff) { + if (second_mac_octet == 0xff) { /* we are being asked to broadcast to all partitions */ dp = xpnet_broadcast_partitions; } else if (second_mac_octet != 0) { @@ -2953,7 +2979,8 @@ Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c @@ -672,7 +636,7 @@ xpnet_init(void) license_num = sn_partition_serial_number_val(); for (i = 3; i >= 0; i--) { - xpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] - license_num & 0xff; + xpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] = +- license_num & 0xff; + license_num & 0xff; license_num = license_num >> 8; } diff --git a/a/content_digest b/N1/content_digest index ef12856..9efff79 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020080422194459.GB13086@sgi.com\0" "From\0Dean Nelson <dcn@sgi.com>\0" "Subject\0[Patch 3/4] run drivers/misc/sgi-xp through scripts/Lindent part2 -v4\0" - "Date\0Tue, 22 Apr 2008 19:48:55 +0000\0" + "Date\0Tue, 22 Apr 2008 14:48:55 -0500\0" "To\0tony.luck@intel.com\0" "Cc\0jes@sgi.com" gregkh@suse.de @@ -21,7 +21,8 @@ " 3 files changed, 322 insertions(+), 506 deletions(-)\n" "\n" "Index: linux-2.6/drivers/misc/sgi-xp/xpc_channel.c\n" - "=================================--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_channel.c\t2008-04-22 11:20:44.000000000 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_channel.c\t2008-04-22 11:20:44.000000000 -0500\n" "+++ linux-2.6/drivers/misc/sgi-xp/xpc_channel.c\t2008-04-22 11:32:20.848407833 -0500\n" "@@ -6,7 +6,6 @@\n" " * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved.\n" @@ -48,16 +49,16 @@ " * Guarantee that the kzalloc'd memory is cacheline aligned.\n" " */\n" "@@ -39,7 +36,7 @@ xpc_kzalloc_cacheline_aligned(size_t siz\n" - " \tif (*base = NULL) {\n" + " \tif (*base == NULL) {\n" " \t\treturn NULL;\n" " \t}\n" - "-\tif ((u64) *base = L1_CACHE_ALIGN((u64) *base)) {\n" - "+\tif ((u64)*base = L1_CACHE_ALIGN((u64)*base)) {\n" + "-\tif ((u64) *base == L1_CACHE_ALIGN((u64) *base)) {\n" + "+\tif ((u64)*base == L1_CACHE_ALIGN((u64)*base)) {\n" " \t\treturn *base;\n" " \t}\n" " \tkfree(*base);\n" "@@ -49,10 +46,9 @@ xpc_kzalloc_cacheline_aligned(size_t siz\n" - " \tif (*base = NULL) {\n" + " \tif (*base == NULL) {\n" " \t\treturn NULL;\n" " \t}\n" "-\treturn (void *) L1_CACHE_ALIGN((u64) *base);\n" @@ -79,7 +80,8 @@ "@@ -72,7 +67,7 @@ xpc_initialize_channels(struct xpc_parti\n" " \n" " \t\tch->local_GP = &part->local_GPs[ch_number];\n" - " \t\tch->local_openclose_args -\t\t\t\t\t&part->local_openclose_args[ch_number];\n" + " \t\tch->local_openclose_args =\n" + "-\t\t\t\t\t&part->local_openclose_args[ch_number];\n" "+\t\t &part->local_openclose_args[ch_number];\n" " \n" " \t\tatomic_set(&ch->kthreads_assigned, 0);\n" @@ -114,7 +116,7 @@ " \tpart->channels = kzalloc(sizeof(struct xpc_channel) * XPC_NCHANNELS,\n" "-\t\t\t\t\t\t\t\tGFP_KERNEL);\n" "+\t\t\t\t GFP_KERNEL);\n" - " \tif (part->channels = NULL) {\n" + " \tif (part->channels == NULL) {\n" " \t\tdev_err(xpc_chan, \"can't get memory for channels\\n\");\n" " \t\treturn xpcNoMemory;\n" "@@ -126,11 +119,11 @@ xpc_setup_infrastructure(struct xpc_part\n" @@ -128,7 +130,7 @@ "-\t\t\t\t\tGFP_KERNEL, &part->local_GPs_base);\n" "+\t\t\t\t\t\t\tGFP_KERNEL,\n" "+\t\t\t\t\t\t\t&part->local_GPs_base);\n" - " \tif (part->local_GPs = NULL) {\n" + " \tif (part->local_GPs == NULL) {\n" " \t\tkfree(part->channels);\n" " \t\tpart->channels = NULL;\n" "@@ -140,7 +133,9 @@ xpc_setup_infrastructure(struct xpc_part\n" @@ -139,7 +141,7 @@ "+\t\t\t\t\t\t\t GFP_KERNEL,\n" "+\t\t\t\t\t\t\t &part->\n" "+\t\t\t\t\t\t\t remote_GPs_base);\n" - " \tif (part->remote_GPs = NULL) {\n" + " \tif (part->remote_GPs == NULL) {\n" " \t\tdev_err(xpc_chan, \"can't get memory for remote get/put \"\n" " \t\t\t\"values\\n\");\n" "@@ -151,12 +146,11 @@ xpc_setup_infrastructure(struct xpc_part\n" @@ -152,9 +154,10 @@ "-\tpart->local_openclose_args = xpc_kzalloc_cacheline_aligned(\n" "-\t\t\t\t\tXPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,\n" "-\t\t\t\t\t&part->local_openclose_args_base);\n" - "+\tpart->local_openclose_args +\t xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,\n" + "+\tpart->local_openclose_args =\n" + "+\t xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,\n" "+\t\t\t\t\t &part->local_openclose_args_base);\n" - " \tif (part->local_openclose_args = NULL) {\n" + " \tif (part->local_openclose_args == NULL) {\n" " \t\tdev_err(xpc_chan, \"can't get memory for local connect args\\n\");\n" " \t\tkfree(part->remote_GPs_base);\n" "@@ -168,9 +162,9 @@ xpc_setup_infrastructure(struct xpc_part\n" @@ -164,9 +167,10 @@ "-\tpart->remote_openclose_args = xpc_kzalloc_cacheline_aligned(\n" "-\t\t\t\t\tXPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,\n" "-\t\t\t\t\t&part->remote_openclose_args_base);\n" - "+\tpart->remote_openclose_args +\t xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,\n" + "+\tpart->remote_openclose_args =\n" + "+\t xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,\n" "+\t\t\t\t\t &part->remote_openclose_args_base);\n" - " \tif (part->remote_openclose_args = NULL) {\n" + " \tif (part->remote_openclose_args == NULL) {\n" " \t\tdev_err(xpc_chan, \"can't get memory for remote connect args\\n\");\n" " \t\tkfree(part->local_openclose_args_base);\n" "@@ -184,13 +178,11 @@ xpc_setup_infrastructure(struct xpc_part\n" @@ -214,7 +218,8 @@ "@@ -244,7 +235,7 @@ xpc_setup_infrastructure(struct xpc_part\n" " \t */\n" " \txpc_vars_part[partid].GPs_pa = __pa(part->local_GPs);\n" - " \txpc_vars_part[partid].openclose_args_pa -\t\t\t\t\t__pa(part->local_openclose_args);\n" + " \txpc_vars_part[partid].openclose_args_pa =\n" + "-\t\t\t\t\t__pa(part->local_openclose_args);\n" "+\t __pa(part->local_openclose_args);\n" " \txpc_vars_part[partid].IPI_amo_pa = __pa(part->local_IPI_amo_va);\n" " \tcpuid = raw_smp_processor_id();\t/* any CPU in this partition will do */\n" @@ -243,7 +248,7 @@ "+\tDBUG_ON((u64)dst != L1_CACHE_ALIGN((u64)dst));\n" " \tDBUG_ON(cnt != L1_CACHE_ALIGN(cnt));\n" " \n" - " \tif (part->act_state = XPC_P_DEACTIVATING) {\n" + " \tif (part->act_state == XPC_P_DEACTIVATING) {\n" " \t\treturn part->reason;\n" " \t}\n" " \n" @@ -251,7 +256,7 @@ "-\t\t\t\t\t(BTE_NORMAL | BTE_WACQUIRE), NULL);\n" "+\tbte_ret = xp_bte_copy((u64)src, (u64)dst, (u64)cnt,\n" "+\t\t\t (BTE_NORMAL | BTE_WACQUIRE), NULL);\n" - " \tif (bte_ret = BTE_SUCCESS) {\n" + " \tif (bte_ret == BTE_SUCCESS) {\n" " \t\treturn xpcSuccess;\n" " \t}\n" "@@ -291,7 +280,6 @@ xpc_pull_remote_cachelines(struct xpc_pa\n" @@ -265,7 +270,8 @@ "@@ -301,41 +289,40 @@ xpc_pull_remote_vars_part(struct xpc_par\n" " {\n" " \tu8 buffer[L1_CACHE_BYTES * 2];\n" - " \tstruct xpc_vars_part *pulled_entry_cacheline -\t\t\t(struct xpc_vars_part *) L1_CACHE_ALIGN((u64) buffer);\n" + " \tstruct xpc_vars_part *pulled_entry_cacheline =\n" + "-\t\t\t(struct xpc_vars_part *) L1_CACHE_ALIGN((u64) buffer);\n" "+\t (struct xpc_vars_part *)L1_CACHE_ALIGN((u64)buffer);\n" " \tstruct xpc_vars_part *pulled_entry;\n" " \tu64 remote_entry_cacheline_pa, remote_entry_pa;\n" @@ -275,7 +281,8 @@ "-\n" " \t/* pull the cacheline that contains the variables we're interested in */\n" " \n" - " \tDBUG_ON(part->remote_vars_part_pa !-\t\t\t\tL1_CACHE_ALIGN(part->remote_vars_part_pa));\n" + " \tDBUG_ON(part->remote_vars_part_pa !=\n" + "-\t\t\t\tL1_CACHE_ALIGN(part->remote_vars_part_pa));\n" "+\t\tL1_CACHE_ALIGN(part->remote_vars_part_pa));\n" " \tDBUG_ON(sizeof(struct xpc_vars_part) != L1_CACHE_BYTES / 2);\n" " \n" @@ -314,20 +321,22 @@ "@@ -353,8 +340,8 @@ xpc_pull_remote_vars_part(struct xpc_par\n" " \t\t/* validate the variables */\n" " \n" - " \t\tif (pulled_entry->GPs_pa = 0 ||\n" - "-\t\t\t\tpulled_entry->openclose_args_pa = 0 ||\n" - "-\t\t\t\t\tpulled_entry->IPI_amo_pa = 0) {\n" - "+\t\t pulled_entry->openclose_args_pa = 0 ||\n" - "+\t\t pulled_entry->IPI_amo_pa = 0) {\n" + " \t\tif (pulled_entry->GPs_pa == 0 ||\n" + "-\t\t\t\tpulled_entry->openclose_args_pa == 0 ||\n" + "-\t\t\t\t\tpulled_entry->IPI_amo_pa == 0) {\n" + "+\t\t pulled_entry->openclose_args_pa == 0 ||\n" + "+\t\t pulled_entry->IPI_amo_pa == 0) {\n" " \n" " \t\t\tdev_err(xpc_chan, \"partition %d's XPC vars_part for \"\n" " \t\t\t\t\"partition %d are not valid\\n\", partid,\n" "@@ -366,9 +353,9 @@ xpc_pull_remote_vars_part(struct xpc_par\n" " \n" " \t\tpart->remote_GPs_pa = pulled_entry->GPs_pa;\n" - " \t\tpart->remote_openclose_args_pa -\t\t\t\t\tpulled_entry->openclose_args_pa;\n" + " \t\tpart->remote_openclose_args_pa =\n" + "-\t\t\t\t\tpulled_entry->openclose_args_pa;\n" "+\t\t pulled_entry->openclose_args_pa;\n" - " \t\tpart->remote_IPI_amo_va -\t\t\t\t (AMO_t *) __va(pulled_entry->IPI_amo_pa);\n" + " \t\tpart->remote_IPI_amo_va =\n" + "-\t\t\t\t (AMO_t *) __va(pulled_entry->IPI_amo_pa);\n" "+\t\t (AMO_t *)__va(pulled_entry->IPI_amo_pa);\n" " \t\tpart->remote_IPI_nasid = pulled_entry->IPI_nasid;\n" " \t\tpart->remote_IPI_phys_cpuid = pulled_entry->IPI_phys_cpuid;\n" @@ -401,7 +410,7 @@ "+\t\t\t\t\t\t\t\t GFP_KERNEL,\n" "+\t\t\t\t\t\t\t\t &ch->\n" "+\t\t\t\t\t\t\t\t local_msgqueue_base);\n" - " \t\tif (ch->local_msgqueue = NULL) {\n" + " \t\tif (ch->local_msgqueue == NULL) {\n" " \t\t\tcontinue;\n" " \t\t}\n" "@@ -497,7 +481,6 @@ xpc_allocate_local_msgqueue(struct xpc_c\n" @@ -429,7 +438,7 @@ "+\t\t\t\t\t\t\t\t GFP_KERNEL,\n" "+\t\t\t\t\t\t\t\t &ch->\n" "+\t\t\t\t\t\t\t\t remote_msgqueue_base);\n" - " \t\tif (ch->remote_msgqueue = NULL) {\n" + " \t\tif (ch->remote_msgqueue == NULL) {\n" " \t\t\tcontinue;\n" " \t\t}\n" "@@ -542,7 +525,6 @@ xpc_allocate_remote_msgqueue(struct xpc_\n" @@ -496,8 +505,9 @@ "@@ -660,8 +637,7 @@ xpc_notify_senders(struct xpc_channel *c\n" " \t\t */\n" " \t\tnotify_type = notify->type;\n" - " \t\tif (notify_type = 0 ||\n" - "-\t\t\t\tcmpxchg(¬ify->type, notify_type, 0) !-\t\t\t\t\t\t\t\tnotify_type) {\n" + " \t\tif (notify_type == 0 ||\n" + "-\t\t\t\tcmpxchg(¬ify->type, notify_type, 0) !=\n" + "-\t\t\t\t\t\t\t\tnotify_type) {\n" "+\t\t cmpxchg(¬ify->type, notify_type, 0) != notify_type) {\n" " \t\t\tcontinue;\n" " \t\t}\n" @@ -554,7 +564,7 @@ "-\t\t\t!(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE));\n" "+\t\t!(ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE));\n" " \n" - " \tif (part->act_state = XPC_P_DEACTIVATING) {\n" + " \tif (part->act_state == XPC_P_DEACTIVATING) {\n" " \t\t/* can't proceed until the other side disengages from us */\n" "@@ -809,7 +782,7 @@ xpc_process_disconnect(struct xpc_channe\n" " \n" @@ -587,7 +597,8 @@ "+\t\t\t u8 IPI_flags)\n" " {\n" " \tunsigned long irq_flags;\n" - " \tstruct xpc_openclose_args *args -\t\t\t\t&part->remote_openclose_args[ch_number];\n" + " \tstruct xpc_openclose_args *args =\n" + "-\t\t\t\t&part->remote_openclose_args[ch_number];\n" "+\t &part->remote_openclose_args[ch_number];\n" " \tstruct xpc_channel *ch = &part->channels[ch_number];\n" " \tenum xpc_retval reason;\n" @@ -666,7 +677,7 @@ "@@ -982,7 +950,7 @@ again:\n" " \t\t\tch->partid, ch->number);\n" " \n" - " \t\tif (part->act_state = XPC_P_DEACTIVATING ||\n" + " \t\tif (part->act_state == XPC_P_DEACTIVATING ||\n" "-\t\t\t\t\t(ch->flags & XPC_C_ROPENREQUEST)) {\n" "+\t\t (ch->flags & XPC_C_ROPENREQUEST)) {\n" " \t\t\tspin_unlock_irqrestore(&ch->lock, irq_flags);\n" @@ -736,7 +747,7 @@ " \tstruct xpc_registration *registration = &xpc_registrations[ch->number];\n" " \n" "-\n" - " \tif (mutex_trylock(®istration->mutex) = 0) {\n" + " \tif (mutex_trylock(®istration->mutex) == 0) {\n" " \t\treturn xpcRetry;\n" " \t}\n" "@@ -1124,7 +1088,6 @@ xpc_connect_channel(struct xpc_channel *\n" @@ -825,9 +836,9 @@ " \n" " \txpc_msgqueue_ref(ch);\n" " \n" - " \tif (ch->w_remote_GP.get = ch->remote_GP.get &&\n" - "-\t\t\t\tch->w_remote_GP.put = ch->remote_GP.put) {\n" - "+\t ch->w_remote_GP.put = ch->remote_GP.put) {\n" + " \tif (ch->w_remote_GP.get == ch->remote_GP.get &&\n" + "-\t\t\t\tch->w_remote_GP.put == ch->remote_GP.put) {\n" + "+\t ch->w_remote_GP.put == ch->remote_GP.put) {\n" " \t\t/* nothing changed since GPs were last pulled */\n" " \t\txpc_msgqueue_deref(ch);\n" " \t\treturn;\n" @@ -954,7 +965,7 @@ " \t * Before proceeding with the teardown we have to wait until all\n" "@@ -1483,7 +1427,6 @@ xpc_teardown_infrastructure(struct xpc_p\n" " \t */\n" - " \twait_event(part->teardown_wq, (atomic_read(&part->references) = 0));\n" + " \twait_event(part->teardown_wq, (atomic_read(&part->references) == 0));\n" " \n" "-\n" " \t/* now we can begin tearing down the infrastructure */\n" @@ -1080,8 +1091,8 @@ " \n" "-\n" " \tif (ch->flags & XPC_C_DISCONNECTING) {\n" - "-\t\tDBUG_ON(ch->reason = xpcInterrupted); // >>> Is this true?\n" - "+\t\tDBUG_ON(ch->reason = xpcInterrupted);\t// >>> Is this true?\n" + "-\t\tDBUG_ON(ch->reason == xpcInterrupted); // >>> Is this true?\n" + "+\t\tDBUG_ON(ch->reason == xpcInterrupted);\t// >>> Is this true?\n" " \t\treturn ch->reason;\n" " \t}\n" " \n" @@ -1089,9 +1100,9 @@ " \n" " \tif (ch->flags & XPC_C_DISCONNECTING) {\n" " \t\tret = ch->reason;\n" - "-\t\tDBUG_ON(ch->reason = xpcInterrupted); // >>> Is this true?\n" - "+\t\tDBUG_ON(ch->reason = xpcInterrupted);\t// >>> Is this true?\n" - " \t} else if (ret = 0) {\n" + "-\t\tDBUG_ON(ch->reason == xpcInterrupted); // >>> Is this true?\n" + "+\t\tDBUG_ON(ch->reason == xpcInterrupted);\t// >>> Is this true?\n" + " \t} else if (ret == 0) {\n" " \t\tret = xpcTimeout;\n" " \t} else {\n" "@@ -1719,20 +1652,18 @@ xpc_allocate_msg_wait(struct xpc_channel\n" @@ -1141,10 +1152,10 @@ " \t\t\t * doesn't beat us to it. If they do, we'll have to\n" " \t\t\t * try again.\n" "-\t\t \t */\n" - "-\t\t\tif (cmpxchg(&ch->w_local_GP.put, put, put + 1) =\n" + "-\t\t\tif (cmpxchg(&ch->w_local_GP.put, put, put + 1) ==\n" "-\t\t\t\t\t\t\t\t\tput) {\n" "+\t\t\t */\n" - "+\t\t\tif (cmpxchg(&ch->w_local_GP.put, put, put + 1) = put) {\n" + "+\t\t\tif (cmpxchg(&ch->w_local_GP.put, put, put + 1) == put) {\n" " \t\t\t\t/* we got the entry referenced by put */\n" " \t\t\t\tbreak;\n" " \t\t\t}\n" @@ -1208,8 +1219,8 @@ " \twhile (1) {\n" " \n" " \t\twhile (1) {\n" - "-\t\t\tif (put = (volatile s64) ch->w_local_GP.put) {\n" - "+\t\t\tif (put = (volatile s64)ch->w_local_GP.put) {\n" + "-\t\t\tif (put == (volatile s64) ch->w_local_GP.put) {\n" + "+\t\t\tif (put == (volatile s64)ch->w_local_GP.put) {\n" " \t\t\t\tbreak;\n" " \t\t\t}\n" " \n" @@ -1224,7 +1235,8 @@ "@@ -1893,9 +1816,9 @@ xpc_send_msgs(struct xpc_channel *ch, s6\n" " \t\t}\n" " \n" - " \t\tif (cmpxchg_rel(&ch->local_GP->put, initial_put, put) !-\t\t\t\t\t\t\t\tinitial_put) {\n" + " \t\tif (cmpxchg_rel(&ch->local_GP->put, initial_put, put) !=\n" + "-\t\t\t\t\t\t\t\tinitial_put) {\n" "+\t\t initial_put) {\n" " \t\t\t/* someone else beat us to it */\n" "-\t\t\tDBUG_ON((volatile s64) ch->local_GP->put < initial_put);\n" @@ -1252,16 +1264,18 @@ " \ts64 put, msg_number = msg->number;\n" " \n" "-\n" - " \tDBUG_ON(notify_type = XPC_N_CALL && func = NULL);\n" - "-\tDBUG_ON((((u64) msg - (u64) ch->local_msgqueue) / ch->msg_size) !-\t\t\t\t\tmsg_number % ch->local_nentries);\n" - "+\tDBUG_ON((((u64)msg - (u64)ch->local_msgqueue) / ch->msg_size) !+\t\tmsg_number % ch->local_nentries);\n" + " \tDBUG_ON(notify_type == XPC_N_CALL && func == NULL);\n" + "-\tDBUG_ON((((u64) msg - (u64) ch->local_msgqueue) / ch->msg_size) !=\n" + "-\t\t\t\t\tmsg_number % ch->local_nentries);\n" + "+\tDBUG_ON((((u64)msg - (u64)ch->local_msgqueue) / ch->msg_size) !=\n" + "+\t\tmsg_number % ch->local_nentries);\n" " \tDBUG_ON(msg->flags & XPC_M_READY);\n" " \n" " \tif (ch->flags & XPC_C_DISCONNECTING) {\n" "@@ -1970,7 +1891,7 @@ xpc_send_msg(struct xpc_channel *ch, str\n" " \t\t\t * the notify entry.\n" " \t\t\t */\n" - " \t\t\tif (cmpxchg(¬ify->type, notify_type, 0) =\n" + " \t\t\tif (cmpxchg(¬ify->type, notify_type, 0) ==\n" "-\t\t\t\t\t\t\t\tnotify_type) {\n" "+\t\t\t notify_type) {\n" " \t\t\t\tatomic_dec(&ch->n_to_notify);\n" @@ -1311,7 +1325,7 @@ " \n" " \tDBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);\n" "@@ -2091,11 +2008,10 @@ xpc_initiate_send_notify(partid_t partid\n" - " \tDBUG_ON(func = NULL);\n" + " \tDBUG_ON(func == NULL);\n" " \n" " \tret = xpc_send_msg(&part->channels[ch_number], msg, XPC_N_CALL,\n" "-\t\t\t\t\t\t\t\tfunc, key);\n" @@ -1334,7 +1348,8 @@ "@@ -2118,22 +2033,22 @@ xpc_pull_remote_msg(struct xpc_channel *\n" " \t\tmsg_index = ch->next_msg_to_pull % ch->remote_nentries;\n" " \n" - " \t\tDBUG_ON(ch->next_msg_to_pull >-\t\t\t\t\t(volatile s64) ch->w_remote_GP.put);\n" + " \t\tDBUG_ON(ch->next_msg_to_pull >=\n" + "-\t\t\t\t\t(volatile s64) ch->w_remote_GP.put);\n" "-\t\tnmsgs = (volatile s64) ch->w_remote_GP.put -\n" "-\t\t\t\t\t\tch->next_msg_to_pull;\n" "+\t\t\t(volatile s64)ch->w_remote_GP.put);\n" @@ -1356,7 +1371,8 @@ " \n" " \t\tif ((ret = xpc_pull_remote_cachelines(part, msg, remote_msg,\n" "-\t\t\t\tnmsgs * ch->msg_size)) != xpcSuccess) {\n" - "+\t\t\t\t\t\t nmsgs * ch->msg_size)) !+\t\t xpcSuccess) {\n" + "+\t\t\t\t\t\t nmsgs * ch->msg_size)) !=\n" + "+\t\t xpcSuccess) {\n" " \n" " \t\t\tdev_dbg(xpc_chan, \"failed to pull %d msgs starting with\"\n" " \t\t\t\t\" msg %ld from partition %d, channel=%d, \"\n" @@ -1395,9 +1411,9 @@ " \t\t}\n" " \n" "-\t\tget = (volatile s64) ch->w_local_GP.get;\n" - "-\t\tif (get = (volatile s64) ch->w_remote_GP.put) {\n" + "-\t\tif (get == (volatile s64) ch->w_remote_GP.put) {\n" "+\t\tget = (volatile s64)ch->w_local_GP.get;\n" - "+\t\tif (get = (volatile s64)ch->w_remote_GP.put) {\n" + "+\t\tif (get == (volatile s64)ch->w_remote_GP.put) {\n" " \t\t\tbreak;\n" " \t\t}\n" " \n" @@ -1408,7 +1424,7 @@ "-\t \t */\n" "+\t\t */\n" " \n" - " \t\tif (cmpxchg(&ch->w_local_GP.get, get, get + 1) = get) {\n" + " \t\tif (cmpxchg(&ch->w_local_GP.get, get, get + 1) == get) {\n" " \t\t\t/* we got the entry referenced by get */\n" "@@ -2211,7 +2124,6 @@ xpc_get_deliverable_msg(struct xpc_chann\n" " \treturn msg;\n" @@ -1462,8 +1478,8 @@ " \twhile (1) {\n" " \n" " \t\twhile (1) {\n" - "-\t\t\tif (get = (volatile s64) ch->w_local_GP.get) {\n" - "+\t\t\tif (get = (volatile s64)ch->w_local_GP.get) {\n" + "-\t\t\tif (get == (volatile s64) ch->w_local_GP.get) {\n" + "+\t\t\tif (get == (volatile s64)ch->w_local_GP.get) {\n" " \t\t\t\tbreak;\n" " \t\t\t}\n" " \n" @@ -1478,10 +1494,12 @@ "@@ -2290,10 +2200,9 @@ xpc_acknowledge_msgs(struct xpc_channel \n" " \t\t}\n" " \n" - " \t\tif (cmpxchg_rel(&ch->local_GP->get, initial_get, get) !-\t\t\t\t\t\t\t\tinitial_get) {\n" + " \t\tif (cmpxchg_rel(&ch->local_GP->get, initial_get, get) !=\n" + "-\t\t\t\t\t\t\t\tinitial_get) {\n" "+\t\t initial_get) {\n" " \t\t\t/* someone else beat us to it */\n" - "-\t\t\tDBUG_ON((volatile s64) ch->local_GP->get <-\t\t\t\t\t\t\t\tinitial_get);\n" + "-\t\t\tDBUG_ON((volatile s64) ch->local_GP->get <=\n" + "-\t\t\t\t\t\t\t\tinitial_get);\n" "+\t\t\tDBUG_ON((volatile s64)ch->local_GP->get <= initial_get);\n" " \t\t\tbreak;\n" " \t\t}\n" @@ -1508,8 +1526,10 @@ "-\t\t(void *) msg, msg_number, ch->partid, ch->number);\n" "+\t\t(void *)msg, msg_number, ch->partid, ch->number);\n" " \n" - "-\tDBUG_ON((((u64) msg - (u64) ch->remote_msgqueue) / ch->msg_size) !-\t\t\t\t\tmsg_number % ch->remote_nentries);\n" - "+\tDBUG_ON((((u64)msg - (u64)ch->remote_msgqueue) / ch->msg_size) !+\t\tmsg_number % ch->remote_nentries);\n" + "-\tDBUG_ON((((u64) msg - (u64) ch->remote_msgqueue) / ch->msg_size) !=\n" + "-\t\t\t\t\tmsg_number % ch->remote_nentries);\n" + "+\tDBUG_ON((((u64)msg - (u64)ch->remote_msgqueue) / ch->msg_size) !=\n" + "+\t\tmsg_number % ch->remote_nentries);\n" " \tDBUG_ON(msg->flags & XPC_M_DONE);\n" " \n" " \tmsg->flags |= XPC_M_DONE;\n" @@ -1519,7 +1539,8 @@ " }\n" "-\n" "Index: linux-2.6/drivers/misc/sgi-xp/xpc_main.c\n" - "=================================--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_main.c\t2008-04-22 10:54:11.000000000 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/misc/sgi-xp/xpc_main.c\t2008-04-22 10:54:11.000000000 -0500\n" "+++ linux-2.6/drivers/misc/sgi-xp/xpc_main.c\t2008-04-22 11:32:20.872410785 -0500\n" "@@ -6,7 +6,6 @@\n" " * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved.\n" @@ -1803,7 +1824,7 @@ "-\t\t(void) msleep_interruptible(250);\n" "+\t\t(void)msleep_interruptible(250);\n" " \n" - " \t\tif (part->act_state = XPC_P_DEACTIVATING) {\n" + " \t\tif (part->act_state == XPC_P_DEACTIVATING) {\n" " \t\t\treturn part->reason;\n" "@@ -369,7 +346,6 @@ xpc_make_first_contact(struct xpc_partit\n" " \treturn xpc_mark_partition_active(part);\n" @@ -1835,9 +1856,9 @@ "-\t\t(void) wait_event_interruptible(part->channel_mgr_wq,\n" "-\t\t\t\t(atomic_read(&part->channel_mgr_requests) > 0 ||\n" "-\t\t\t\t(volatile u64) part->local_IPI_amo != 0 ||\n" - "-\t\t\t\t((volatile u8) part->act_state =\n" + "-\t\t\t\t((volatile u8) part->act_state ==\n" "-\t\t\t\t\t\t\tXPC_P_DEACTIVATING &&\n" - "-\t\t\t\tatomic_read(&part->nchannels_active) = 0 &&\n" + "-\t\t\t\tatomic_read(&part->nchannels_active) == 0 &&\n" "-\t\t\t\txpc_partition_disengaged(part))));\n" "+\t\t(void)wait_event_interruptible(part->channel_mgr_wq,\n" "+\t\t\t\t\t (atomic_read\n" @@ -1845,11 +1866,11 @@ "+\t\t\t\t\t\t0 ||\n" "+\t\t\t\t\t\t(volatile u64)part->\n" "+\t\t\t\t\t\tlocal_IPI_amo != 0 ||\n" - "+\t\t\t\t\t\t((volatile u8)part->act_state =\n" + "+\t\t\t\t\t\t((volatile u8)part->act_state ==\n" "+\t\t\t\t\t\t XPC_P_DEACTIVATING &&\n" "+\t\t\t\t\t\t atomic_read(&part->\n" "+\t\t\t\t\t\t\t nchannels_active)\n" - "+\t\t\t\t\t\t = 0 &&\n" + "+\t\t\t\t\t\t == 0 &&\n" "+\t\t\t\t\t\t xpc_partition_disengaged\n" "+\t\t\t\t\t\t (part))));\n" " \t\tatomic_set(&part->channel_mgr_requests, 1);\n" @@ -1870,7 +1891,7 @@ "-\t(void) xpc_part_ref(part);\t/* this will always succeed */\n" "+\t(void)xpc_part_ref(part);\t/* this will always succeed */\n" " \n" - " \tif (xpc_make_first_contact(part) = xpcSuccess) {\n" + " \tif (xpc_make_first_contact(part) == xpcSuccess) {\n" " \t\txpc_channel_mgr(part);\n" "@@ -465,17 +445,15 @@ xpc_partition_up(struct xpc_partition *p\n" " \txpc_teardown_infrastructure(part);\n" @@ -2120,7 +2141,7 @@ " \t\t\t}\n" " \n" "@@ -843,10 +809,10 @@ xpc_create_kthreads(struct xpc_channel *\n" - " \t\t\tif (atomic_inc_return(&part->nchannels_engaged) = 1)\n" + " \t\t\tif (atomic_inc_return(&part->nchannels_engaged) == 1)\n" " \t\t\t\txpc_mark_partition_engaged(part);\n" " \t\t}\n" "-\t\t(void) xpc_part_ref(part);\n" @@ -2190,7 +2211,7 @@ " \n" "-\n" " \t/* a 'rmmod XPC' and a 'reboot' cannot both end up here together */\n" - " \tDBUG_ON(xpc_exiting = 1);\n" + " \tDBUG_ON(xpc_exiting == 1);\n" " \n" "@@ -971,10 +934,8 @@ xpc_do_exit(enum xpc_retval reason)\n" " \t/* wait for the heartbeat checker thread to exit */\n" @@ -2208,8 +2229,8 @@ " \t\t\tpart = &xpc_partitions[partid];\n" " \n" " \t\t\tif (xpc_partition_disengaged(part) &&\n" - "-\t\t\t\t\tpart->act_state = XPC_P_INACTIVE) {\n" - "+\t\t\t part->act_state = XPC_P_INACTIVE) {\n" + "-\t\t\t\t\tpart->act_state == XPC_P_INACTIVE) {\n" + "+\t\t\t part->act_state == XPC_P_INACTIVE) {\n" " \t\t\t\tcontinue;\n" " \t\t\t}\n" " \n" @@ -2219,7 +2240,8 @@ " \t\t\tif (part->disengage_request_timeout >\n" "-\t\t\t\t\t\tdisengage_request_timeout) {\n" "+\t\t\t disengage_request_timeout) {\n" - " \t\t\t\tdisengage_request_timeout -\t\t\t\t\t\tpart->disengage_request_timeout;\n" + " \t\t\t\tdisengage_request_timeout =\n" + "-\t\t\t\t\t\tpart->disengage_request_timeout;\n" "+\t\t\t\t part->disengage_request_timeout;\n" " \t\t\t}\n" " \t\t}\n" @@ -2272,7 +2294,7 @@ " \n" "@@ -1047,16 +1007,15 @@ xpc_do_exit(enum xpc_retval reason)\n" " \n" - " \tif (reason = xpcUnloading) {\n" + " \tif (reason == xpcUnloading) {\n" " \t\t/* take ourselves off of the reboot_notifier_list */\n" "-\t\t(void) unregister_reboot_notifier(&xpc_reboot_notifier);\n" "+\t\t(void)unregister_reboot_notifier(&xpc_reboot_notifier);\n" @@ -2413,7 +2435,7 @@ "-\t\t\t\t GFP_KERNEL, &xpc_remote_copy_buffer_base);\n" "+\t\t\t\t\t\t\t GFP_KERNEL,\n" "+\t\t\t\t\t\t\t &xpc_remote_copy_buffer_base);\n" - " \tif (xpc_remote_copy_buffer = NULL)\n" + " \tif (xpc_remote_copy_buffer == NULL)\n" " \t\treturn -ENOMEM;\n" " \n" "@@ -1256,7 +1207,7 @@ xpc_init(void)\n" @@ -2428,7 +2450,8 @@ "@@ -1265,8 +1216,8 @@ xpc_init(void)\n" " \n" " \t\tinit_timer(&part->disengage_request_timer);\n" - " \t\tpart->disengage_request_timer.function -\t\t\t\txpc_timeout_partition_disengage_request;\n" + " \t\tpart->disengage_request_timer.function =\n" + "-\t\t\t\txpc_timeout_partition_disengage_request;\n" "-\t\tpart->disengage_request_timer.data = (unsigned long) part;\n" "+\t\t xpc_timeout_partition_disengage_request;\n" "+\t\tpart->disengage_request_timer.data = (unsigned long)part;\n" @@ -2523,7 +2546,8 @@ "-\n" "+\t\t \"other partitions when dropping into kdebug.\");\n" "Index: linux-2.6/drivers/misc/sgi-xp/xpnet.c\n" - "=================================--- linux-2.6.orig/drivers/misc/sgi-xp/xpnet.c\t2008-04-22 11:21:17.000000000 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/misc/sgi-xp/xpnet.c\t2008-04-22 11:21:17.000000000 -0500\n" "+++ linux-2.6/drivers/misc/sgi-xp/xpnet.c\t2008-04-22 11:32:20.908415213 -0500\n" "@@ -6,7 +6,6 @@\n" " * Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved.\n" @@ -2569,7 +2593,7 @@ "+#define XPNET_MAGIC\t0x88786984\t/* \"XNET\" */\n" " \n" " #define XPNET_VALID_MSG(_m)\t\t\t\t\t\t \\\n" - " ((XPNET_VERSION_MAJOR(_m->version) = XPNET_VERSION_MAJOR(XPNET_VERSION)) \\\n" + " ((XPNET_VERSION_MAJOR(_m->version) == XPNET_VERSION_MAJOR(XPNET_VERSION)) \\\n" "@@ -101,7 +97,6 @@ struct xpnet_message {\n" " \n" " #define XPNET_DEVICE_NAME\t\t\"xp0\"\n" @@ -2606,7 +2630,8 @@ "@@ -178,14 +171,13 @@ xpnet_receive(partid_t partid, int chann\n" " \tstruct sk_buff *skb;\n" " \tbte_result_t bret;\n" - " \tstruct xpnet_dev_private *priv -\t\t(struct xpnet_dev_private *) xpnet_device->priv;\n" + " \tstruct xpnet_dev_private *priv =\n" + "-\t\t(struct xpnet_dev_private *) xpnet_device->priv;\n" "-\n" "+\t (struct xpnet_dev_private *)xpnet_device->priv;\n" " \n" @@ -2638,7 +2663,7 @@ "@@ -227,12 +218,13 @@ xpnet_receive(partid_t partid, int chann\n" " \t * Move the data over from the other side.\n" " \t */\n" - " \tif ((XPNET_VERSION_MINOR(msg->version) = 1) &&\n" + " \tif ((XPNET_VERSION_MINOR(msg->version) == 1) &&\n" "-\t\t\t\t\t\t(msg->embedded_bytes != 0)) {\n" "+\t (msg->embedded_bytes != 0)) {\n" " \t\tdev_dbg(xpnet, \"copying embedded message. memcpy(0x%p, 0x%p, \"\n" @@ -2703,7 +2728,7 @@ "-\tswitch(reason) {\n" "+\tswitch (reason) {\n" " \tcase xpcMsgReceived:\t/* message received */\n" - " \t\tDBUG_ON(data = NULL);\n" + " \t\tDBUG_ON(data == NULL);\n" " \n" "-\t\txpnet_receive(partid, channel, (struct xpnet_message *) data);\n" "+\t\txpnet_receive(partid, channel, (struct xpnet_message *)data);\n" @@ -2793,15 +2818,16 @@ "-\t\t\tvoid *__qm)\n" "+\t\t void *__qm)\n" " {\n" - "-\tstruct xpnet_pending_msg *queued_msg -\t\t(struct xpnet_pending_msg *) __qm;\n" + "-\tstruct xpnet_pending_msg *queued_msg =\n" + "-\t\t(struct xpnet_pending_msg *) __qm;\n" "-\n" "+\tstruct xpnet_pending_msg *queued_msg = (struct xpnet_pending_msg *)__qm;\n" " \n" - " \tDBUG_ON(queued_msg = NULL);\n" + " \tDBUG_ON(queued_msg == NULL);\n" " \n" "@@ -439,14 +418,13 @@ xpnet_send_completed(enum xpc_retval rea\n" " \n" - " \tif (atomic_dec_return(&queued_msg->use_count) = 0) {\n" + " \tif (atomic_dec_return(&queued_msg->use_count) == 0) {\n" " \t\tdev_dbg(xpnet, \"all acks for skb->head=-x%p\\n\",\n" "-\t\t\t(void *) queued_msg->skb->head);\n" "+\t\t\t(void *)queued_msg->skb->head);\n" @@ -2836,7 +2862,7 @@ " \t * xpc_send_notifies are relying on this skb. When none\n" "@@ -487,16 +462,15 @@ xpnet_dev_hard_start_xmit(struct sk_buff\n" " \tqueued_msg = kmalloc(sizeof(struct xpnet_pending_msg), GFP_ATOMIC);\n" - " \tif (queued_msg = NULL) {\n" + " \tif (queued_msg == NULL) {\n" " \t\tdev_warn(xpnet, \"failed to kmalloc %ld bytes; dropping \"\n" "-\t\t\t\"packet\\n\", sizeof(struct xpnet_pending_msg));\n" "+\t\t\t \"packet\\n\", sizeof(struct xpnet_pending_msg));\n" @@ -2867,7 +2893,7 @@ " \n" "-\n" " \tsecond_mac_octet = skb->data[XPNET_PARTID_OCTET];\n" - " \tif (second_mac_octet = 0xff) {\n" + " \tif (second_mac_octet == 0xff) {\n" " \t\t/* we are being asked to broadcast to all partitions */\n" " \t\tdp = xpnet_broadcast_partitions;\n" " \t} else if (second_mac_octet != 0) {\n" @@ -2964,7 +2990,8 @@ "@@ -672,7 +636,7 @@ xpnet_init(void)\n" " \tlicense_num = sn_partition_serial_number_val();\n" " \tfor (i = 3; i >= 0; i--) {\n" - " \t\txpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] -\t\t\t\t\t\t\tlicense_num & 0xff;\n" + " \t\txpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] =\n" + "-\t\t\t\t\t\t\tlicense_num & 0xff;\n" "+\t\t license_num & 0xff;\n" " \t\tlicense_num = license_num >> 8;\n" " \t}\n" @@ -2997,4 +3024,4 @@ " MODULE_LICENSE(\"GPL\");\n" - -d0c075030aef31ba4c33e0e57f4107b4d45a6ca91ecb3d183857bbeffe6b70ad +e381887dabd98123b5aec8e16d2962f5fb355fae0f4c8a7f940841a37345ac4b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.