* linux-next: Tree for December 15
From: Stephen Rothwell @ 2008-12-15 15:06 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10690 bytes --]
Hi all,
Changes since 20081212:
New tree:
boot-params
Undropped tree:
mtd
staging
Dropped trees (temporarily):
v4l-dvb (build problem)
rr (difficult conflicts)
semaphore-removal (due to unfixed conflicts against Linus' tree)
cpu_alloc (build problem)
perfmon3 (concerns from the x86 team)
audit (difficult conflicts)
nommu (build problem)
boot-params (build problem)
The ftrace tree lost a conflict.
The device-mapper tree gained a conflict against the ftrace tree.
The net tree gained a conflict against the net-current tree.
The sound tree gained a conflict against the times tree and needed a
fixup patch for an interaction withe the timers tree.
The rr_cpumask tree gained a conflict against the sparseirq tree and 2
conflicts against the cpus4096 tree.
Th rr tree gained several difficult conflicts and was dropped.
The block tree gained a conflict against the ftrace tree.
The boot-params tree gained a conflict against each of the sparseirq,
parisc, arm and sh trees and gained a build problem, so was dropped.
I also applied "Define smp_call_function_many for UP" from Rusty Russell
and reverted 2 commits from the scsi tree due to build problems.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and
i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 133 trees (counting Linus' and 15 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
HEAD is now at 6c34bc2 Revert "radeonfb: accelerate imageblit and other improvements"
Merging origin/master
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging audit-current/for-linus
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
CONFLICT (content): Merge conflict in drivers/char/Makefile
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in scripts/recordmcount.pl
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pci-driver.c
Merging quilt/device-mapper
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/xfs_rename.c
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in arch/x86/kernel/reboot.c
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (delete/modify): arch/sparc64/kernel/idprom.c deleted in HEAD and modified in net/master. Version net/master of arch/sparc64/kernel/idprom.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/e1000e/ich8lan.c
CONFLICT (content): Merge conflict in fs/lockd/host.c
CONFLICT (content): Merge conflict in fs/lockd/mon.c
$ git rm -f arch/sparc64/kernel/idprom.c
Applying: net: async_tx merge fix
Merging mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/corgi.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/spitz.c
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/drivers/pcsp/pcsp.c
Applying: sound: fixup for timers tree interaction
Merging cpufreq/next
Merging v9fs/for-next
Merging rr_cpumask/master
CONFLICT (content): Merge conflict in arch/x86/kernel/io_apic.c
CONFLICT (content): Merge conflict in kernel/sched.c
CONFLICT (content): Merge conflict in kernel/sched_stats.h
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/kernel/io_apic.c
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in include/linux/cpumask.h
CONFLICT (content): Merge conflict in kernel/cpu.c
CONFLICT (content): Merge conflict in kernel/sched.c
CONFLICT (content): Merge conflict in kernel/sched_stats.h
$ git reset --hard
Merging cifs/master
CONFLICT (content): Merge conflict in fs/cifs/connect.c
Applying: cifs: update for new IP4/6 address printing
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
CONFLICT (content): Merge conflict in fs/ioctl.c
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/bio.c
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/net/tg3.c
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in drivers/char/tty_audit.c
CONFLICT (content): Merge conflict in fs/cifs/cifs_fs_sb.h
CONFLICT (content): Merge conflict in fs/ocfs2/namei.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
Merging lblnet/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/ttydev
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Merging proc/proc
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
CONFLICT (content): Merge conflict in kernel/sched.c
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging trivial/for-next
Merging audit/for-next
CONFLICT (content): Merge conflict in include/linux/audit.h
CONFLICT (content): Merge conflict in kernel/auditsc.c
CONFLICT (content): Merge conflict in kernel/capability.c
CONFLICT (content): Merge conflict in security/commoncap.c
$ git reset --hard
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/winbond/linux/wbusb.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/winbond/linux/wbusb.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211wext.c
$ git rm -f drivers/staging/winbond/linux/wbusb.c
Merging scsi-post-merge/master
Merging boot-params/master
CONFLICT (content): Merge conflict in arch/arm/kernel/setup.c
CONFLICT (content): Merge conflict in arch/parisc/kernel/setup.c
CONFLICT (content): Merge conflict in arch/sh/boards/mach-migor/setup.c
CONFLICT (content): Merge conflict in init/main.c
$ git reset --hard HEAD^
Applying: Define smp_call_function_many for UP
Created commit 65f3ebc: Revert "[SCSI] fcoe: Fibre Channel over Ethernet"
Created commit 15c07d6: Revert "[SCSI] libfc: A modular Fibre Channel library"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: spaseirq tree build warning
From: Stephen Rothwell @ 2008-12-15 14:52 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Yinghai Lu
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
Hi Ingo,
Today's linux-next build (sparc64 defconfig) produced this warning:
kernel/irq/handle.c:26: warning: 'irq_desc_lock_class' defined but not used
Introduced by commit 0b8f1efad30bd58f89961b82dfe68b9edf8fd2ac ("sparse
irq_desc[] array: core kernel and x86 changes") from the sparseirq tree.
irq_desc_lock_class is only used if CONFIG_SPARSE_IRQ is set (I think).
--
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
* Re: linux-next: scsi tree build failure
From: James Bottomley @ 2008-12-15 14:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Robert Love
In-Reply-To: <20081216013704.2496da40.sfr@canb.auug.org.au>
On Tue, 2008-12-16 at 01:37 +1100, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next build (powerpc allyesconfig) failed like this:
Heh, I really need to get this terrasoft system integrated into my
builds
> drivers/scsi/libfc/fc_fcp.c: In function 'fc_eh_host_reset':
> drivers/scsi/libfc/fc_fcp.c:1987: error: implicit declaration of function 'msleep'
>
> That file needs to include <linux/delay.h>.
Thanks, that's exactly the problem.
Robert, please reroll the patches with this fix in ... I'll just
exchange the new patches for the ones in my tree.
> Introduced by commit 389571f347629d879f9044582bbbafb43e4fe00b ("[SCSI]
> libfc: A modular Fibre Channel library") from the scsi tree. I reverted
> that commit and commit 7aba33c5cfc7a9c104cc7469558c7849f373c3da ("[SCSI]
> fcoe: Fibre Channel over Ethernet") which depended on it.
James
^ permalink raw reply
* linux-next: scsi tree build failure
From: Stephen Rothwell @ 2008-12-15 14:37 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, Robert Love
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
Hi James,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/scsi/libfc/fc_fcp.c: In function 'fc_eh_host_reset':
drivers/scsi/libfc/fc_fcp.c:1987: error: implicit declaration of function 'msleep'
That file needs to include <linux/delay.h>.
Introduced by commit 389571f347629d879f9044582bbbafb43e4fe00b ("[SCSI]
libfc: A modular Fibre Channel library") from the scsi tree. I reverted
that commit and commit 7aba33c5cfc7a9c104cc7469558c7849f373c3da ("[SCSI]
fcoe: Fibre Channel over Ethernet") which depended on it.
--
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
* Re: linux-next: tree build warning
From: Thomas Gleixner @ 2008-12-15 13:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Ingo Molnar, H. Peter Anvin, linux-next, Peter Zijlstra
In-Reply-To: <20081216003539.75ecce70.sfr@canb.auug.org.au>
On Tue, 16 Dec 2008, Stephen Rothwell wrote:
> Hi ,
>
> Today's linux-next build (powerpc allnoconfig) produced this warning:
>
> kernel/hrtimer.c: In function 'hrtimer_cpu_notify':
> kernel/hrtimer.c:1574: warning: unused variable 'dcpu'
>
> Introduced by commit 37810659ea7d9572c5ac284ade272f806ef8f788 ("hrtimer:
> removing all ur callback modes, fix hotplug") from the timers. dcpu is only used if
> CONFIG_HOTPLUG_CPU is set.
Thanks, will fix.
tglx
^ permalink raw reply
* linux-next: tree build warning
From: Stephen Rothwell @ 2008-12-15 13:35 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
Hi ,
Today's linux-next build (powerpc allnoconfig) produced this warning:
kernel/hrtimer.c: In function 'hrtimer_cpu_notify':
kernel/hrtimer.c:1574: warning: unused variable 'dcpu'
Introduced by commit 37810659ea7d9572c5ac284ade272f806ef8f788 ("hrtimer:
removing all ur callback modes, fix hotplug") from the timers. dcpu is only used if
CONFIG_HOTPLUG_CPU is set.
--
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
* linux-next: manual merge of the boot-params tree
From: Stephen Rothwell @ 2008-12-15 13:21 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, Paul Mundt
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
Hi Rusty,
Today's linux-next merge of the boot-params tree got a conflict in
arch/sh/boards/mach-migor/setup.c between commit
2f75cd4d60aa955f983134f7ceb656b1b8cb8c30 ("sh: mach-migor: Kill off
unused Migo-R machvec") from the sh tree and commit
0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.
The former removes the code that the latter modified.
--
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
* linux-next: manual merge of the boot-params tree
From: Stephen Rothwell @ 2008-12-15 13:21 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, Nicolas Pitre, Russell King
Hi Rusty,
Today's linux-next merge of the boot-params tree got a conflict in
arch/arm/kernel/setup.c between commit
4b5f32cee0cce7b9783ced5cbeabd17aa53c51fb ("[ARM] rationalize memory
configuration code some more") from the arm tree and commit
0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.
I fixed it up as best I could (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/arm/kernel/setup.c
index 7049815,72b7aa5..0000000
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -112,9 -112,9 +112,8 @@@ static struct stack stacks[NR_CPUS]
char elf_platform[ELF_PLATFORM_SIZE];
EXPORT_SYMBOL(elf_platform);
-static struct meminfo meminfo __initdata = { 0, };
static const char *cpu_name;
static const char *machine_name;
- static char __initdata command_line[COMMAND_LINE_SIZE];
static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };
@@@ -708,22 -700,30 +705,30 @@@ void __init arch_get_boot_command_line(
if (mdesc->fixup)
mdesc->fixup(mdesc, tags, &from, &meminfo);
- if (tags->hdr.tag == ATAG_CORE) {
- if (meminfo.nr_banks != 0)
- squash_mem_tags(tags);
- save_atags(tags);
- parse_tags(tags);
- }
+ if (meminfo.nr_banks != 0)
+ squash_mem_tags(tags);
+ save_atags(tags);
+ parse_tags(tags);
+
+ /* This copies into boot_command_line */
+ parse_cmdline(from);
+ }
+
+ void __init setup_arch(void)
+ {
+ struct machine_desc *mdesc = setup_machine(machine_arch_type);
+
+ machine_name = mdesc->name;
+
+ if (mdesc->soft_reboot)
+ reboot_setup("s");
- init_mm.start_code = (unsigned long) &_text;
- init_mm.end_code = (unsigned long) &_etext;
- init_mm.end_data = (unsigned long) &_edata;
- init_mm.brk = (unsigned long) &_end;
+ init_mm.start_code = (unsigned long) _text;
+ init_mm.end_code = (unsigned long) _etext;
+ init_mm.end_data = (unsigned long) _edata;
+ init_mm.brk = (unsigned long) _end;
- memcpy(boot_command_line, from, COMMAND_LINE_SIZE);
- boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
- parse_cmdline(cmdline_p, from);
- paging_init(&meminfo, mdesc);
+ paging_init(mdesc);
request_standard_resources(&meminfo, mdesc);
#ifdef CONFIG_SMP
^ permalink raw reply
* linux-next: manual merge of the boot-params tree
From: Stephen Rothwell @ 2008-12-15 13:20 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, FUJITA Tomonori, Kyle McMartin, linux-parisc
Hi Rusty,
Today's linux-next merge of the boot-params tree got a conflict in
arch/parisc/kernel/setup.c between commit
14e01f8241387e4c236148bfaca77e3e546ad94d ("parisc: remove dead
BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions") from the parisc
tree and commit 0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/parisc/kernel/setup.c
index 8d8b024,3bdf1e2..0000000
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@@ -58,7 -58,12 +58,7 @@@ int parisc_bus_is_phys __read_mostly =
EXPORT_SYMBOL(parisc_bus_is_phys);
#endif
- void __init setup_cmdline(char **cmdline_p)
-/* This sets the vmerge boundary and size, it's here because it has to
- * be available on all platforms (zero means no-virtual merging) */
-unsigned long parisc_vmerge_boundary = 0;
-unsigned long parisc_vmerge_max_size = 0;
-
+ void __init arch_get_boot_command_line(void)
{
extern unsigned int boot_args[];
^ permalink raw reply
* linux-next: manual merge of the boot-params tree
From: Stephen Rothwell @ 2008-12-15 13:20 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, Yinghai Lu, Ingo Molnar
Hi Rusty,
Today's linux-next merge of the boot-params tree got a conflict in
init/main.c between commit 0b8f1efad30bd58f89961b82dfe68b9edf8fd2ac
("sparse irq_desc[] array: core kernel and x86 changes") from the
sparseirq tree and commit 0de5c2d9f02d2018fd671ca1015432dffa5eb338
("param: arch_get_boot_command_line()") from the boot-params tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc init/main.c
index 1d3ccf8,e0d6592..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -543,19 -522,19 +526,28 @@@ void __init __weak thread_info_cache_in
{
}
+void __init __weak arch_early_irq_init(void)
+{
+}
+
+void __init __weak early_irq_init(void)
+{
+ arch_early_irq_init();
+}
+
+ /* Ideally, this would take a 'const char *cmdline' param. */
asmlinkage void __init start_kernel(void)
{
- char * command_line;
- extern struct kernel_param __start___param[], __stop___param[];
+ char *static_command_line;
+
+ printk(KERN_NOTICE);
+ printk(linux_banner);
+
+ arch_get_boot_command_line();
+ parse_args("Core and early params", boot_command_line,
+ __start___core_param,
+ __stop___core_param - __start___core_param,
+ do_early_param, true);
smp_setup_processor_id();
^ permalink raw reply
* linux-next: boot-params tree build failure
From: Stephen Rothwell @ 2008-12-15 13:20 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 396 bytes --]
Hi Rusty,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
arch/powerpc/kernel/setup_64.c:516: error: conflicting types for 'setup_arch'
include/linux/init.h:153: error: previous declaration of 'setup_arch' was here
I dropped the boot-params tree for today.
--
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
* Re: linux-next: sound tree build failure
From: Takashi Iwai @ 2008-12-15 7:36 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Peter Zijlstra, Ingo Molnar
In-Reply-To: <20081215154301.e2c1f642.sfr@canb.auug.org.au>
At Mon, 15 Dec 2008 15:43:01 +1100,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> sound/core/hrtimer.c: In function 'snd_hrtimer_open':
> sound/core/hrtimer.c:60: error: 'struct hrtimer' has no member named 'cb_mode'
> sound/core/hrtimer.c:60: error: 'HRTIMER_CB_IRQSAFE_UNLOCKED' undeclared (first use in this function)
>
> An interaction between commit bbaf5e97337287479eb78dbc3822d9560bbfd2e2
> ("ALSA: Add hrtimer backend for ALSA timer interface") from the sound
> tree and commit ca109491f612aab5c8152207631c0444f63da97f ("hrtimer:
> removing all ur callback modes") from the timers tree.
>
> I have added the below fixup for the merge and can carry it as necessary.
Thanks, the fix must be correct.
I'm not sure what I should do. Putting this fix only for linux-next
might be a fix, but this wouldn't work if the affecting patch is
changed or dropped.
If you can keep this one-liner in your tree, it'd be helpful.
Takashi
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 15 Dec 2008 15:38:14 +1100
> Subject: [PATCH] sound: fixup for timers tree interaction
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> sound/core/hrtimer.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c
> index c1d2859..34c7d48 100644
> --- a/sound/core/hrtimer.c
> +++ b/sound/core/hrtimer.c
> @@ -57,7 +57,6 @@ static int snd_hrtimer_open(struct snd_timer *t)
> return -ENOMEM;
> hrtimer_init(&stime->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> stime->timer = t;
> - stime->hrt.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED;
> stime->hrt.function = snd_hrtimer_callback;
> t->private_data = stime;
> return 0;
> --
> 1.6.0.5
>
^ permalink raw reply
* linux-next: manual merge of the block tree
From: Stephen Rothwell @ 2008-12-15 7:08 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, Ingo Molnar
Hi Jens,
Today's linux-next merge of the block tree got a conflict in fs/bio.c
between commit 0bfc24559d7945506184d86739fe365a181f06b7 ("blktrace: port
to tracepoints, update") from the ftrace tree and commit
18e08407d87bed3a9c4205e53bb16fe36088a521 ("bio: allow individual slabs in
the bio_set") from the block tree.
Just an overlapping addition/removal. I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc fs/bio.c
index df99c88,3bd633d..0000000
--- a/fs/bio.c
+++ b/fs/bio.c
@@@ -26,12 -26,13 +26,16 @@@
#include <linux/mempool.h>
#include <linux/workqueue.h>
#include <linux/blktrace_api.h>
+#include <trace/block.h>
#include <scsi/sg.h> /* for struct sg_iovec */
+DEFINE_TRACE(block_split);
+
- static struct kmem_cache *bio_slab __read_mostly;
+ /*
+ * Test patch to inline a certain number of bi_io_vec's inside the bio
+ * itself, to shrink a bio data allocation from two mempool calls to one
+ */
+ #define BIO_INLINE_VECS 4
static mempool_t *bio_split_pool __read_mostly;
^ permalink raw reply
* Re: linux-next: manual merge of the net tree
From: David Miller @ 2008-12-15 6:59 UTC (permalink / raw)
To: sfr; +Cc: linux-next, jeffrey.t.kirsher, bruce.w.allan
In-Reply-To: <20081215144405.d284833d.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 15 Dec 2008 14:44:05 +1100
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/e1000e/ich8lan.c between commit
> 30bb0e0dce78427f3e5cb728d6b5ea73acbefffa ("e1000e: fix double release of
> mutex") from the net-current tree and commit
> 0285c8dcaeaa73ddadc4f38383e5bbc03c394a29 ("e1000e: cosmetic newline in
> debug message") from the net tree.
>
> Trivial context overlap. I fixed it up (see below) and will carry as
> necessary.
Thanks Stephen.
This will be cleared up next time I merge.
^ permalink raw reply
* Re: linux-next: manual merge of the rr_cpumask tree
From: Rusty Russell @ 2008-12-15 6:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Mike Travis, Yinghai Lu, Ingo Molnar
In-Reply-To: <20081215170945.b91f3b9c.sfr@canb.auug.org.au>
On Monday 15 December 2008 16:39:45 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next merge of the rr_cpumask tree got a conflict in
> arch/x86/kernel/io_apic.c between commit
> 3145e941fcfe2548fa2270afb1a05bab3a6bc418 ("x86, MSI: pass irq_cfg and
> irq_desc") from the sparseirq tree and commit
> 0de26520c7cabf36e1de090ea8092f011a6106ce ("cpumask: make irq_set_affinity
> () take a const struct cpumask") from the rr_cpumask tree.
>
> There are lots of overlapping changes. I fixed it up (see below) and can carry the
> fix as necessary.
I have performed this merge before. The results are in
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-ingo.git
Ingo, can you pull these into cpus4096? It's just the cpumask/cpus4096 merge.
Thanks,
Rusty.
^ permalink raw reply
* linux-next: sparseirq tree build warning
From: Stephen Rothwell @ 2008-12-15 6:29 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Yinghai Lu
[-- Attachment #1: Type: text/plain, Size: 453 bytes --]
Hi Ingo,
Today's linux-next build (powerpc ppc64_defconfig) produced this warning:
fs/proc/stat.c: In function 'show_stat':
fs/proc/stat.c:30: warning: unused variable 'desc'
Introduced by commit 240d367b4e6c6e3c5075e034db14dba60a6f5fa7
("sparseirq: fix Alpha build failure"). desc is now only used when
CONFIG_SPARSE_IRQ is set.
--
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
* linux-next: manual merge of the rr tree
From: Stephen Rothwell @ 2008-12-15 6:15 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 457 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got conflicts in the same files
as the rr_cpumask tree plus a few more. Coming on top of the rr_cpumask
conflicts, it was a bit much for today, so I have dropped the rr tree.
Please see if you can sort it out a bit for tomorrow. Or at least give
me a hint as to how to fix the conflicts.
--
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
* linux-next: manual merge of the rr_cpumask tree
From: Stephen Rothwell @ 2008-12-15 6:09 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, Mike Travis, Ingo Molnar
Hi Rusty,
Today's linux-next merge of the rr_cpumask tree got conflicts in
kernel/sched.c and kernel/sched_stats.h between commits
sched_domain_debug_one ("sched: wrap sched_group and sched_domain cpumask
accesses") and dcc30a35f71bcf51f1e9b336dc5e41923071509a ("sched: convert
cpu_isolated_map to cpumask_var_t") from the cpus4096 tree and commit
29c0177e6a4ac094302bed54a1d4bbb6b740a9ef ("cpumask: change
cpumask_scnprintf, cpumask_parse_user, cpulist_parse, and
cpulist_scnprintf to take pointers") from the rr_cpumask tree.
Overlapping changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/sched.c
index b6b60dd,d2d16d1..0000000
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@ -6637,8 -6666,8 +6637,8 @@@ static int sched_domain_debug_one(struc
struct sched_group *group = sd->groups;
char str[256];
- cpulist_scnprintf(str, sizeof(str), *sched_domain_span(sd));
- cpulist_scnprintf(str, sizeof(str), &sd->span);
- cpus_clear(*groupmask);
++ cpulist_scnprintf(str, sizeof(str), sched_domain_span(sd));
+ cpumask_clear(groupmask);
printk(KERN_DEBUG "%*s domain %d: ", level, "", level);
@@@ -6688,9 -6718,9 +6688,9 @@@
break;
}
- cpus_or(*groupmask, *groupmask, group->cpumask);
+ cpumask_or(groupmask, groupmask, sched_group_cpus(group));
- cpulist_scnprintf(str, sizeof(str), *sched_group_cpus(group));
- cpulist_scnprintf(str, sizeof(str), &group->cpumask);
++ cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group));
printk(KERN_CONT " %s", str);
group = group->next;
@@@ -6932,7 -6922,14 +6932,7 @@@ static cpumask_var_t cpu_isolated_map
/* Setup the mask of cpus configured for isolated domains */
static int __init isolated_cpu_setup(char *str)
{
- cpulist_parse(str, *cpu_isolated_map);
- static int __initdata ints[NR_CPUS];
- int i;
-
- str = get_options(str, ARRAY_SIZE(ints), ints);
- cpus_clear(cpu_isolated_map);
- for (i = 1; i <= ints[0]; i++)
- if (ints[i] < NR_CPUS)
- cpu_set(ints[i], cpu_isolated_map);
++ cpulist_parse(str, cpu_isolated_map);
return 1;
}
diff --cc kernel/sched_stats.h
index ce34083,6beff1e..0000000
--- a/kernel/sched_stats.h
+++ b/kernel/sched_stats.h
@@@ -42,8 -42,7 +42,8 @@@ static int show_schedstat(struct seq_fi
for_each_domain(cpu, sd) {
enum cpu_idle_type itype;
- cpumask_scnprintf(mask_str, mask_len, &sd->span);
+ cpumask_scnprintf(mask_str, mask_len,
- *sched_domain_span(sd));
++ sched_domain_span(sd));
seq_printf(seq, "domain%d %s", dcount++, mask_str);
for (itype = CPU_IDLE; itype < CPU_MAX_IDLE_TYPES;
itype++) {
^ permalink raw reply
* linux-next: manual merge of the rr_cpumask tree
From: Stephen Rothwell @ 2008-12-15 6:09 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, Mike Travis, Yinghai Lu, Ingo Molnar
Hi Rusty,
Today's linux-next merge of the rr_cpumask tree got a conflict in
arch/x86/kernel/io_apic.c between commit
3145e941fcfe2548fa2270afb1a05bab3a6bc418 ("x86, MSI: pass irq_cfg and
irq_desc") from the sparseirq tree and commit
0de26520c7cabf36e1de090ea8092f011a6106ce ("cpumask: make irq_set_affinity
() take a const struct cpumask") from the rr_cpumask tree.
There are lots of overlapping changes. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/kernel/io_apic.c
index 23f3141,1184210..0000000
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@@ -396,48 -359,37 +396,49 @@@ static void __target_IO_APIC_irq(unsign
}
}
-static int assign_irq_vector(int irq, cpumask_t mask);
+static int assign_irq_vector(int irq, struct irq_cfg *cfg, cpumask_t mask);
- static void set_ioapic_affinity_irq_desc(struct irq_desc *desc, cpumask_t mask)
-static void set_ioapic_affinity_irq(unsigned int irq,
++static void set_ioapic_affinity_irq_desc(struct irq_desc *desc,
+ const struct cpumask *mask)
{
struct irq_cfg *cfg;
unsigned long flags;
unsigned int dest;
cpumask_t tmp;
- struct irq_desc *desc;
+ unsigned int irq;
- cpus_and(tmp, mask, cpu_online_map);
- if (cpus_empty(tmp))
+ if (!cpumask_intersects(mask, cpu_online_mask))
return;
- cfg = irq_cfg(irq);
- if (assign_irq_vector(irq, *mask))
+ irq = desc->irq;
+ cfg = desc->chip_data;
- if (assign_irq_vector(irq, cfg, mask))
++ if (assign_irq_vector(irq, cfg, *mask))
return;
- set_extra_move_desc(desc, mask);
++ set_extra_move_desc(desc, *mask);
+
- cpus_and(tmp, cfg->domain, mask);
+ cpumask_and(&tmp, &cfg->domain, mask);
dest = cpu_mask_to_apicid(tmp);
/*
* Only the high 8 bits are valid.
*/
dest = SET_APIC_LOGICAL_ID(dest);
- desc = irq_to_desc(irq);
spin_lock_irqsave(&ioapic_lock, flags);
- __target_IO_APIC_irq(irq, dest, cfg->vector);
+ __target_IO_APIC_irq(irq, dest, cfg);
- desc->affinity = mask;
+ cpumask_copy(&desc->affinity, mask);
spin_unlock_irqrestore(&ioapic_lock, flags);
}
+
- static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
++static void set_ioapic_affinity_irq(unsigned int irq,
++ const struct cpumask *mask)
+{
+ struct irq_desc *desc;
+
+ desc = irq_to_desc(irq);
+
+ set_ioapic_affinity_irq_desc(desc, mask);
+}
#endif /* CONFIG_SMP */
/*
@@@ -2281,22 -2198,19 +2282,24 @@@ static void ir_irq_migration(struct wor
/*
* Migrates the IRQ destination in the process context.
*/
- static void set_ir_ioapic_affinity_irq_desc(struct irq_desc *desc, cpumask_t mask)
-static void set_ir_ioapic_affinity_irq(unsigned int irq,
++static void set_ir_ioapic_affinity_irq_desc(struct irq_desc *desc,
+ const struct cpumask *mask)
{
- struct irq_desc *desc = irq_to_desc(irq);
-
if (desc->status & IRQ_LEVEL) {
desc->status |= IRQ_MOVE_PENDING;
- desc->pending_mask = mask;
+ cpumask_copy(&desc->pending_mask, mask);
- migrate_irq_remapped_level(irq);
+ migrate_irq_remapped_level_desc(desc);
return;
}
- migrate_ioapic_irq_desc(desc, mask);
- migrate_ioapic_irq(irq, *mask);
++ migrate_ioapic_irq_desc(desc, *mask);
+}
- static void set_ir_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
++static void set_ir_ioapic_affinity_irq(unsigned int irq,
++ const struct cpumask *mask)
+{
+ struct irq_desc *desc = irq_to_desc(irq);
+
+ set_ir_ioapic_affinity_irq_desc(desc, mask);
}
#endif
@@@ -3145,64 -3028,61 +3148,63 @@@ static int msi_compose_msg(struct pci_d
}
#ifdef CONFIG_SMP
- static void set_msi_irq_affinity(unsigned int irq, cpumask_t mask)
+ static void set_msi_irq_affinity(unsigned int irq, const struct cpumask *mask)
{
+ struct irq_desc *desc = irq_to_desc(irq);
struct irq_cfg *cfg;
struct msi_msg msg;
unsigned int dest;
cpumask_t tmp;
- struct irq_desc *desc;
- cpus_and(tmp, mask, cpu_online_map);
- if (cpus_empty(tmp))
+ if (!cpumask_intersects(mask, cpu_online_mask))
return;
- if (assign_irq_vector(irq, *mask))
+ cfg = desc->chip_data;
- if (assign_irq_vector(irq, cfg, mask))
++ if (assign_irq_vector(irq, cfg, *mask))
return;
- set_extra_move_desc(desc, mask);
- cfg = irq_cfg(irq);
++ set_extra_move_desc(desc, *mask);
+
- cpus_and(tmp, cfg->domain, mask);
+ cpumask_and(&tmp, &cfg->domain, mask);
dest = cpu_mask_to_apicid(tmp);
- read_msi_msg(irq, &msg);
+ read_msi_msg_desc(desc, &msg);
msg.data &= ~MSI_DATA_VECTOR_MASK;
msg.data |= MSI_DATA_VECTOR(cfg->vector);
msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
msg.address_lo |= MSI_ADDR_DEST_ID(dest);
- write_msi_msg(irq, &msg);
- desc = irq_to_desc(irq);
+ write_msi_msg_desc(desc, &msg);
- desc->affinity = mask;
+ cpumask_copy(&desc->affinity, mask);
}
-
#ifdef CONFIG_INTR_REMAP
/*
* Migrate the MSI irq to another cpumask. This migration is
* done in the process context using interrupt-remapping hardware.
*/
- static void ir_set_msi_irq_affinity(unsigned int irq, cpumask_t mask)
+ static void ir_set_msi_irq_affinity(unsigned int irq,
+ const struct cpumask *mask)
{
+ struct irq_desc *desc = irq_to_desc(irq);
struct irq_cfg *cfg;
unsigned int dest;
cpumask_t tmp, cleanup_mask;
struct irte irte;
- struct irq_desc *desc;
- cpus_and(tmp, mask, cpu_online_map);
- if (cpus_empty(tmp))
+ if (!cpumask_intersects(mask, cpu_online_mask))
return;
if (get_irte(irq, &irte))
return;
- if (assign_irq_vector(irq, *mask))
+ cfg = desc->chip_data;
- if (assign_irq_vector(irq, cfg, mask))
++ if (assign_irq_vector(irq, cfg, *mask))
return;
- set_extra_move_desc(desc, mask);
- cfg = irq_cfg(irq);
++ set_extra_move_desc(desc, *mask);
+
- cpus_and(tmp, cfg->domain, mask);
+ cpumask_and(&tmp, &cfg->domain, mask);
dest = cpu_mask_to_apicid(tmp);
irte.vector = cfg->vector;
@@@ -3225,9 -3105,9 +3227,9 @@@
cfg->move_in_progress = 0;
}
- desc->affinity = mask;
- desc = irq_to_desc(irq);
+ cpumask_copy(&desc->affinity, mask);
}
+
#endif
#endif /* CONFIG_SMP */
@@@ -3416,25 -3308,22 +3418,24 @@@ void arch_teardown_msi_irq(unsigned in
#ifdef CONFIG_DMAR
#ifdef CONFIG_SMP
- static void dmar_msi_set_affinity(unsigned int irq, cpumask_t mask)
+ static void dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask)
{
+ struct irq_desc *desc = irq_to_desc(irq);
struct irq_cfg *cfg;
struct msi_msg msg;
unsigned int dest;
cpumask_t tmp;
- struct irq_desc *desc;
- cpus_and(tmp, mask, cpu_online_map);
- if (cpus_empty(tmp))
+ if (!cpumask_intersects(mask, cpu_online_mask))
return;
- if (assign_irq_vector(irq, *mask))
+ cfg = desc->chip_data;
- if (assign_irq_vector(irq, cfg, mask))
++ if (assign_irq_vector(irq, cfg, *mask))
return;
- set_extra_move_desc(desc, mask);
- cfg = irq_cfg(irq);
++ set_extra_move_desc(desc, *mask);
+
- cpus_and(tmp, cfg->domain, mask);
+ cpumask_and(&tmp, &cfg->domain, mask);
dest = cpu_mask_to_apicid(tmp);
dmar_msi_read(irq, &msg);
@@@ -3445,9 -3334,9 +3446,9 @@@
msg.address_lo |= MSI_ADDR_DEST_ID(dest);
dmar_msi_write(irq, &msg);
- desc->affinity = mask;
- desc = irq_to_desc(irq);
+ cpumask_copy(&desc->affinity, mask);
}
+
#endif /* CONFIG_SMP */
struct irq_chip dmar_msi_type = {
@@@ -3479,25 -3368,22 +3480,24 @@@ int arch_setup_dmar_msi(unsigned int ir
#ifdef CONFIG_HPET_TIMER
#ifdef CONFIG_SMP
- static void hpet_msi_set_affinity(unsigned int irq, cpumask_t mask)
+ static void hpet_msi_set_affinity(unsigned int irq, const struct cpumask *mask)
{
+ struct irq_desc *desc = irq_to_desc(irq);
struct irq_cfg *cfg;
- struct irq_desc *desc;
struct msi_msg msg;
unsigned int dest;
cpumask_t tmp;
- cpus_and(tmp, mask, cpu_online_map);
- if (cpus_empty(tmp))
+ if (!cpumask_intersects(mask, cpu_online_mask))
return;
- if (assign_irq_vector(irq, *mask))
+ cfg = desc->chip_data;
- if (assign_irq_vector(irq, cfg, mask))
++ if (assign_irq_vector(irq, cfg, *mask))
return;
- set_extra_move_desc(desc, mask);
- cfg = irq_cfg(irq);
++ set_extra_move_desc(desc, *mask);
+
- cpus_and(tmp, cfg->domain, mask);
+ cpumask_and(&tmp, &cfg->domain, mask);
dest = cpu_mask_to_apicid(tmp);
hpet_msi_read(irq, &msg);
@@@ -3508,9 -3394,9 +3508,9 @@@
msg.address_lo |= MSI_ADDR_DEST_ID(dest);
hpet_msi_write(irq, &msg);
- desc->affinity = mask;
- desc = irq_to_desc(irq);
+ cpumask_copy(&desc->affinity, mask);
}
+
#endif /* CONFIG_SMP */
struct irq_chip hpet_msi_type = {
@@@ -3563,30 -3449,27 +3563,29 @@@ static void target_ht_irq(unsigned int
write_ht_irq_msg(irq, &msg);
}
- static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask)
+ static void set_ht_irq_affinity(unsigned int irq, const struct cpumask *mask)
{
+ struct irq_desc *desc = irq_to_desc(irq);
struct irq_cfg *cfg;
unsigned int dest;
cpumask_t tmp;
- struct irq_desc *desc;
- cpus_and(tmp, mask, cpu_online_map);
- if (cpus_empty(tmp))
+ if (!cpumask_intersects(mask, cpu_online_mask))
return;
- if (assign_irq_vector(irq, *mask))
+ cfg = desc->chip_data;
- if (assign_irq_vector(irq, cfg, mask))
++ if (assign_irq_vector(irq, cfg, *mask))
return;
- set_extra_move_desc(desc, mask);
- cfg = irq_cfg(irq);
++ set_extra_move_desc(desc, *mask);
+
- cpus_and(tmp, cfg->domain, mask);
+ cpumask_and(&tmp, &cfg->domain, mask);
dest = cpu_mask_to_apicid(tmp);
target_ht_irq(irq, dest, cfg->vector);
- desc->affinity = mask;
- desc = irq_to_desc(irq);
+ cpumask_copy(&desc->affinity, mask);
}
+
#endif
static struct irq_chip ht_irq_chip = {
@@@ -3927,10 -3791,10 +3926,10 @@@ void __init setup_ioapic_dest(void
#ifdef CONFIG_INTR_REMAP
if (intr_remapping_enabled)
- set_ir_ioapic_affinity_irq_desc(desc, mask);
- set_ir_ioapic_affinity_irq(irq, &mask);
++ set_ir_ioapic_affinity_irq_desc(desc, &mask);
else
#endif
- set_ioapic_affinity_irq_desc(desc, mask);
- set_ioapic_affinity_irq(irq, &mask);
++ set_ioapic_affinity_irq_desc(desc, &mask);
}
}
^ permalink raw reply
* linux-next: sound tree build failure
From: Stephen Rothwell @ 2008-12-15 4:43 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, Peter Zijlstra, Ingo Molnar
Hi Takashi,
Today's linux-next build (x86_64 allmodconfig) failed like this:
sound/core/hrtimer.c: In function 'snd_hrtimer_open':
sound/core/hrtimer.c:60: error: 'struct hrtimer' has no member named 'cb_mode'
sound/core/hrtimer.c:60: error: 'HRTIMER_CB_IRQSAFE_UNLOCKED' undeclared (first use in this function)
An interaction between commit bbaf5e97337287479eb78dbc3822d9560bbfd2e2
("ALSA: Add hrtimer backend for ALSA timer interface") from the sound
tree and commit ca109491f612aab5c8152207631c0444f63da97f ("hrtimer:
removing all ur callback modes") from the timers tree.
I have added the below fixup for the merge and can carry it as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 15 Dec 2008 15:38:14 +1100
Subject: [PATCH] sound: fixup for timers tree interaction
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
sound/core/hrtimer.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c
index c1d2859..34c7d48 100644
--- a/sound/core/hrtimer.c
+++ b/sound/core/hrtimer.c
@@ -57,7 +57,6 @@ static int snd_hrtimer_open(struct snd_timer *t)
return -ENOMEM;
hrtimer_init(&stime->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
stime->timer = t;
- stime->hrt.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED;
stime->hrt.function = snd_hrtimer_callback;
t->private_data = stime;
return 0;
--
1.6.0.5
^ permalink raw reply related
* linux-next: manual merge of the sound tree
From: Stephen Rothwell @ 2008-12-15 4:25 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, Peter Zijlstra, Ingo Molnar
[-- Attachment #1: Type: text/plain, Size: 578 bytes --]
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/drivers/pcsp/pcsp.c between commit
ca109491f612aab5c8152207631c0444f63da97f ("hrtimer: removing all ur
callback modes") from the timers tree and commit
8a75f4fb28766878893b4335f4b5743ce9b931fe ("ALSA: pcsp - Use
HRTIMER_CB_IRQSAFE_UNLOCKED") from the sound tree.
The former removed the line that the latter modified. I just removed the
line and can carry this fix as necessary.
--
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
* Re: linux-next: manual merge of the mtd tree
From: Stephen Rothwell @ 2008-12-15 4:15 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov
Cc: David Woodhouse, linux-next, Eric Miao, Russell King
In-Reply-To: <20081213100513.05ef28d6.sfr@canb.auug.org.au>
Hi Dmitry,
On Sat, 13 Dec 2008 10:05:13 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 12 Dec 2008 13:29:01 +0300 "Dmitry Eremin-Solenikov" <dbaryshkov@gmail.com> wrote:
> >
> > Sorry for the delay. I've attached the files resulting from the merge
> > of today linux-next/master and mtd/master.
>
> Thanks, I will use them on Monday.
Just copying in these files produced the following diff which I can carry
as necessary. Thanks again.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/arm/mach-pxa/corgi.c
index c5e28a4,b65be8e..0000000
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@@ -542,42 -542,61 +543,92 @@@ err_free_1
static inline void corgi_init_spi(void) {}
#endif
+ static struct mtd_partition sharpsl_nand_partitions[] = {
+ {
+ .name = "System Area",
+ .offset = 0,
+ .size = 7 * 1024 * 1024,
+ },
+ {
+ .name = "Root Filesystem",
+ .offset = 7 * 1024 * 1024,
+ .size = 25 * 1024 * 1024,
+ },
+ {
+ .name = "Home Filesystem",
+ .offset = MTDPART_OFS_APPEND,
+ .size = MTDPART_SIZ_FULL,
+ },
+ };
+
+ static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+
+ static struct nand_bbt_descr sharpsl_bbt = {
+ .options = 0,
+ .offs = 4,
+ .len = 2,
+ .pattern = scan_ff_pattern
+ };
+
+ static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
+ .badblock_pattern = &sharpsl_bbt,
+ .partitions = sharpsl_nand_partitions,
+ .nr_partitions = ARRAY_SIZE(sharpsl_nand_partitions),
+ };
+
+ static struct resource sharpsl_nand_resources[] = {
+ {
+ .start = 0x0C000000,
+ .end = 0x0C000FFF,
+ .flags = IORESOURCE_MEM,
+ },
+ };
+
+ static struct platform_device sharpsl_nand_device = {
+ .name = "sharpsl-nand",
+ .id = -1,
+ .resource = sharpsl_nand_resources,
+ .num_resources = ARRAY_SIZE(sharpsl_nand_resources),
+ .dev.platform_data = &sharpsl_nand_platform_data,
+ };
+
+static struct mtd_partition sharpsl_rom_parts[] = {
+ {
+ .name ="Boot PROM Filesystem",
+ .offset = 0x00120000,
+ .size = MTDPART_SIZ_FULL,
+ },
+};
+
+static struct physmap_flash_data sharpsl_rom_data = {
+ .width = 2,
+ .nr_parts = ARRAY_SIZE(sharpsl_rom_parts),
+ .parts = sharpsl_rom_parts,
+};
+
+static struct resource sharpsl_rom_resources[] = {
+ {
+ .start = 0x00000000,
+ .end = 0x007fffff,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device sharpsl_rom_device = {
+ .name = "physmap-flash",
+ .id = -1,
+ .resource = sharpsl_rom_resources,
+ .num_resources = ARRAY_SIZE(sharpsl_rom_resources),
+ .dev.platform_data = &sharpsl_rom_data,
+};
+
static struct platform_device *devices[] __initdata = {
&corgiscoop_device,
&corgifb_device,
&corgikbd_device,
&corgiled_device,
+ &sharpsl_nand_device,
+ &sharpsl_rom_device,
};
static void corgi_poweroff(void)
diff --cc arch/arm/mach-pxa/poodle.c
index ae88855,a45afdf..0000000
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@@ -414,40 -414,59 +415,90 @@@ static struct pxafb_mach_info poodle_fb
.lcd_conn = LCD_COLOR_TFT_16BPP,
};
+ static struct mtd_partition sharpsl_nand_partitions[] = {
+ {
+ .name = "System Area",
+ .offset = 0,
+ .size = 7 * 1024 * 1024,
+ },
+ {
+ .name = "Root Filesystem",
+ .offset = 7 * 1024 * 1024,
+ .size = 22 * 1024 * 1024,
+ },
+ {
+ .name = "Home Filesystem",
+ .offset = MTDPART_OFS_APPEND,
+ .size = MTDPART_SIZ_FULL,
+ },
+ };
+
+ static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+
+ static struct nand_bbt_descr sharpsl_bbt = {
+ .options = 0,
+ .offs = 4,
+ .len = 2,
+ .pattern = scan_ff_pattern
+ };
+
+ static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
+ .badblock_pattern = &sharpsl_bbt,
+ .partitions = sharpsl_nand_partitions,
+ .nr_partitions = ARRAY_SIZE(sharpsl_nand_partitions),
+ };
+
+ static struct resource sharpsl_nand_resources[] = {
+ {
+ .start = 0x0C000000,
+ .end = 0x0C000FFF,
+ .flags = IORESOURCE_MEM,
+ },
+ };
+
+ static struct platform_device sharpsl_nand_device = {
+ .name = "sharpsl-nand",
+ .id = -1,
+ .resource = sharpsl_nand_resources,
+ .num_resources = ARRAY_SIZE(sharpsl_nand_resources),
+ .dev.platform_data = &sharpsl_nand_platform_data,
+ };
+
+static struct mtd_partition sharpsl_rom_parts[] = {
+ {
+ .name ="Boot PROM Filesystem",
+ .offset = 0x00120000,
+ .size = MTDPART_SIZ_FULL,
+ },
+};
+
+static struct physmap_flash_data sharpsl_rom_data = {
+ .width = 2,
+ .nr_parts = ARRAY_SIZE(sharpsl_rom_parts),
+ .parts = sharpsl_rom_parts,
+};
+
+static struct resource sharpsl_rom_resources[] = {
+ {
+ .start = 0x00000000,
+ .end = 0x007fffff,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device sharpsl_rom_device = {
+ .name = "physmap-flash",
+ .id = -1,
+ .resource = sharpsl_rom_resources,
+ .num_resources = ARRAY_SIZE(sharpsl_rom_resources),
+ .dev.platform_data = &sharpsl_rom_data,
+};
+
static struct platform_device *devices[] __initdata = {
&poodle_locomo_device,
&poodle_scoop_device,
+ &sharpsl_nand_device,
+ &sharpsl_rom_device,
};
static void poodle_poweroff(void)
diff --cc arch/arm/mach-pxa/spitz.c
index 7299d87,7672b09..0000000
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@@ -613,42 -609,60 +614,91 @@@ static struct pxafb_mach_info spitz_pxa
.lcd_conn = LCD_COLOR_TFT_16BPP | LCD_ALTERNATE_MAPPING,
};
+ static struct mtd_partition sharpsl_nand_partitions[] = {
+ {
+ .name = "System Area",
+ .offset = 0,
+ .size = 7 * 1024 * 1024,
+ },
+ {
+ .name = "Root Filesystem",
+ .offset = 7 * 1024 * 1024,
+ },
+ {
+ .name = "Home Filesystem",
+ .offset = MTDPART_OFS_APPEND,
+ .size = MTDPART_SIZ_FULL,
+ },
+ };
+
+ static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+
+ static struct nand_bbt_descr sharpsl_bbt = {
+ .options = 0,
+ .offs = 4,
+ .len = 2,
+ .pattern = scan_ff_pattern
+ };
+
+ static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
+ .badblock_pattern = &sharpsl_bbt,
+ .partitions = sharpsl_nand_partitions,
+ .nr_partitions = ARRAY_SIZE(sharpsl_nand_partitions),
+ };
+
+ static struct resource sharpsl_nand_resources[] = {
+ {
+ .start = 0x0C000000,
+ .end = 0x0C000FFF,
+ .flags = IORESOURCE_MEM,
+ },
+ };
+
+ static struct platform_device sharpsl_nand_device = {
+ .name = "sharpsl-nand",
+ .id = -1,
+ .resource = sharpsl_nand_resources,
+ .num_resources = ARRAY_SIZE(sharpsl_nand_resources),
+ .dev.platform_data = &sharpsl_nand_platform_data,
+ };
+
+static struct mtd_partition sharpsl_rom_parts[] = {
+ {
+ .name ="Boot PROM Filesystem",
+ .offset = 0x00140000,
+ .size = MTDPART_SIZ_FULL,
+ },
+};
+
+static struct physmap_flash_data sharpsl_rom_data = {
+ .width = 2,
+ .nr_parts = ARRAY_SIZE(sharpsl_rom_parts),
+ .parts = sharpsl_rom_parts,
+};
+
+static struct resource sharpsl_rom_resources[] = {
+ {
+ .start = 0x00000000,
+ .end = 0x007fffff,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device sharpsl_rom_device = {
+ .name = "physmap-flash",
+ .id = -1,
+ .resource = sharpsl_rom_resources,
+ .num_resources = ARRAY_SIZE(sharpsl_rom_resources),
+ .dev.platform_data = &sharpsl_rom_data,
+};
+
static struct platform_device *devices[] __initdata = {
&spitzscoop_device,
&spitzkbd_device,
&spitzled_device,
+ &sharpsl_nand_device,
+ &sharpsl_rom_device,
};
static void spitz_poweroff(void)
^ permalink raw reply
* linux-next: manual merge of the net tree
From: Stephen Rothwell @ 2008-12-15 3:44 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Jeff Kirsher, Bruce Allan
Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/ich8lan.c between commit
30bb0e0dce78427f3e5cb728d6b5ea73acbefffa ("e1000e: fix double release of
mutex") from the net-current tree and commit
0285c8dcaeaa73ddadc4f38383e5bbc03c394a29 ("e1000e: cosmetic newline in
debug message") from the net tree.
Trivial context overlap. I fixed it up (see below) and will carry as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/e1000e/ich8lan.c
index d115a6d,92f2ace..0000000
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@@ -1893,8 -1939,7 +1939,8 @@@ static s32 e1000_reset_hw_ich8lan(struc
ctrl |= E1000_CTRL_PHY_RST;
}
ret_val = e1000_acquire_swflag_ich8lan(hw);
+ /* Whether or not the swflag was acquired, we need to reset the part */
- hw_dbg(hw, "Issuing a global reset to ich8lan");
+ hw_dbg(hw, "Issuing a global reset to ich8lan\n");
ew32(CTRL, (ctrl | E1000_CTRL_RST));
msleep(20);
^ permalink raw reply
* linux-next: manual merge of the device-mapper tree
From: Stephen Rothwell @ 2008-12-15 0:58 UTC (permalink / raw)
To: Alasdair G Kergon; +Cc: linux-next, Ingo Molnar, Kiyoshi Ueda
Hi Alasdair,
Today's linux-next merge of the device-mapper tree got a conflict in
drivers/md/dm.c between commit 0bfc24559d7945506184d86739fe365a181f06b7
("blktrace: port to tracepoints, update") from the ftrace tree and commit
758cc022ae793c8418fca30ed1e30466efaae37a ("dm-request-add-caches") from
the device-mapper tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/md/dm.c
index 343094c,50a1f10..0000000
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@@ -52,8 -53,27 +54,29 @@@ struct dm_target_io
union map_info info;
};
+ /*
+ * For request-based dm.
+ * One of these is allocated per request.
+ */
+ struct dm_rq_target_io {
+ struct mapped_device *md;
+ struct dm_target *ti;
+ struct request *orig, clone;
+ int error;
+ union map_info info;
+ };
+
+ /*
+ * For request-based dm.
+ * One of these is allocated per bio.
+ */
+ struct dm_rq_clone_bio_info {
+ struct bio *orig;
+ struct request *rq;
+ };
+
+DEFINE_TRACE(block_bio_complete);
+
union map_info *dm_get_mapinfo(struct bio *bio)
{
if (bio && bio->bi_private)
^ permalink raw reply
* Re: linux-next: Tree for December 12 (drm)
From: Jesse Barnes @ 2008-12-14 19:21 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next@vger.kernel.org, LKML,
airlied@linux.ie
In-Reply-To: <4943405A.4080009@xenotime.net>
On Friday, December 12, 2008 8:55 pm Randy Dunlap wrote:
> Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20081211:
> >
> > Undropped tree:
> > drm
>
> oops ^^^
>
>
> When I2C=n, and drm is built-in or modular, this build error
> happens:
>
> (drm built-in:)
>
> build-r7079.out:(.text+0x47e5f): undefined reference to `i2c_transfer'
> 7080 same
> 7086 same
> 7089 same
> (from gpu/drm/drm_edid.c)
>
>
> (drm modular:)
>
> build-r7103.out:ERROR: "i2c_transfer" [drivers/gpu/drm/drm.ko] undefined!
> (from gpu/drm/drm_edid.c)
Looks like Dave pushed a fix for this by making DRM select the required I2C
bits. Dunno that or depends is preferred these days though...
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox