* linux-next: manual merge of the cpus4096 tree
@ 2009-01-19 1:08 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2009-01-19 1:08 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 609 bytes --]
Hi all,
Today's linux-next merge of the cpus4096 tree got a conflict in
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c between commit
4a922a969cb0190ce4580d4b064e2ac35f3ac9bf ("x86, cpufreq: remove leftover
copymask_copy()") from the x86 tree and commit
5cd7376200be7b8bab085557ff5876b04bd84191 ("fix: crash: IP:
__bitmap_intersects+0x48/0x73") from the cpus4096 tree.
They both remove the same line in get_cur_val, but the latter adds
another line. I have used the new line from the latter.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* linux-next: manual merge of the cpus4096 tree
@ 2008-09-12 5:18 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2008-09-12 5:18 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: linux-next, Mike Travis, Alex Nixon
Hi all,
Today's linux-next merge of the cpus4096 tree got a conflict in
include/asm-x86/smp.h between commit
93be71b672f167b1e8c23725114f86305354f0ac ("x86: add cpu hotplug hooks
into smp_ops") from the x86 tree and commit
ae74da38ccdad1c0d724fc9343b917bc63ed6fc3 ("x86: reduce stack requirements
for send_call_func_ipi") from the cpus4096 tree.
Just overlapping context. I fixed it up (see below) and can carry the
fix.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc include/asm-x86/smp.h
index 6df2615,8eee4ef..0000000
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@@ -55,12 -53,7 +55,12 @@@ struct smp_ops
void (*smp_send_stop)(void);
void (*smp_send_reschedule)(int cpu);
+ int (*cpu_up)(unsigned cpu);
+ int (*cpu_disable)(void);
+ void (*cpu_die)(unsigned int cpu);
+ void (*play_dead)(void);
+
- void (*send_call_func_ipi)(cpumask_t mask);
+ void (*send_call_func_ipi)(const cpumask_t *mask);
void (*send_call_func_single_ipi)(int cpu);
};
@@@ -125,22 -103,19 +125,22 @@@ static inline void arch_send_call_funct
static inline void arch_send_call_function_ipi(cpumask_t mask)
{
- smp_ops.send_call_func_ipi(mask);
+ smp_ops.send_call_func_ipi(&mask);
}
+void cpu_disable_common(void);
void native_smp_prepare_boot_cpu(void);
void native_smp_prepare_cpus(unsigned int max_cpus);
void native_smp_cpus_done(unsigned int max_cpus);
int native_cpu_up(unsigned int cpunum);
+int native_cpu_disable(void);
+void native_cpu_die(unsigned int cpu);
+void native_play_dead(void);
+void play_dead_common(void);
+
- void native_send_call_func_ipi(cpumask_t mask);
+ void native_send_call_func_ipi(const cpumask_t *mask);
void native_send_call_func_single_ipi(int cpu);
-extern int __cpu_disable(void);
-extern void __cpu_die(unsigned int cpu);
-
void smp_store_cpu_info(int id);
#define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu)
^ permalink raw reply [flat|nested] 4+ messages in thread* linux-next: manual merge of the cpus4096 tree
@ 2008-07-16 2:47 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2008-07-16 2:47 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: linux-next, Jens Axboe, Mike Travis
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
Hi all,
Today's linux-next merge of the cpus4096 tree got a conflict in
net/iucv/iucv.c between commit 8691e5a8f691cc2a4fda0651e8d307aaba0e7d68
("smp_call_function: get rid of the unused nonatomic/retry argument")
from Linus' tree and commit 0e12f848b337fc034ceb3c0d03d75f8de1b8cc96
("net: use performance variant for_each_cpu_mask_nr") from the cpus4096
tree.
This conflict (see below) used to be against generic-ipi tree, but that
has now been merged into Linus' tree. Simple fixup.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc net/iucv/iucv.c
index cc34ac7,8de5110..0000000
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@@ -497,8 -497,8 +497,13 @@@ static void iucv_setmask_up(void
/* Disable all cpu but the first in cpu_irq_cpumask. */
cpumask = iucv_irq_cpumask;
cpu_clear(first_cpu(iucv_irq_cpumask), cpumask);
++<<<<<<< HEAD:net/iucv/iucv.c
+ for_each_cpu_mask(cpu, cpumask)
+ smp_call_function_single(cpu, iucv_block_cpu, NULL, 1);
++=======
+ for_each_cpu_mask_nr(cpu, cpumask)
+ smp_call_function_single(cpu, iucv_block_cpu, NULL, 0, 1);
++>>>>>>> cpus4096/auto-cpus4096-next:net/iucv/iucv.c
}
/**
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* linux-next: manual merge of the cpus4096 tree
@ 2008-07-07 6:20 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2008-07-07 6:20 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next, Mike Travis
Hi all,
Today's linux-next merge of the cpus4096 tree needed the fixup below. As
you know, Linus' tree now has trivial definitions of next_cpu_nr,
cpus_weight_nr and for_each_cpu_mask_nr. The merge mechanics did not
notice this automatically so I had to remove the old definitions from
cpumask.h.
It would be nice if you could do the merge with Linus' tree
yourself and fix this within the cpus4096 tree tree.
Also, it would be nice if some of the other subsystems that need changing
could be sent the patches to do that. It would reduce the conflicts in
linux-next and during the merge window for Linus.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
>From 0b848f997ba0ef132356c829114d898e0a51c045 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 7 Jul 2008 15:59:04 +1000
Subject: [PATCH] cpumask: fixup API change merge
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
include/linux/cpumask.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 47418b1..80226e7 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -394,10 +394,6 @@ int __next_cpu_nr(int n, const cpumask_t *srcp);
#endif /* NR_CPUS > 64 */
-#define next_cpu_nr(n, src) next_cpu(n, src)
-#define cpus_weight_nr(cpumask) cpus_weight(cpumask)
-#define for_each_cpu_mask_nr(cpu, mask) for_each_cpu_mask(cpu, mask)
-
/*
* The following particular system cpumasks and operations manage
* possible, present and online cpus. Each of them is a fixed size
--
1.5.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-01-19 1:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-19 1:08 linux-next: manual merge of the cpus4096 tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-09-12 5:18 Stephen Rothwell
2008-07-16 2:47 Stephen Rothwell
2008-07-07 6:20 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox