* Re: linux-next: manual merge of the kmemcheck tree with the tracing tree
From: Vegard Nossum @ 2009-03-06 8:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Pekka Enberg, Ingo Molnar, linux-next
In-Reply-To: <20090306172721.40347f41.sfr@canb.auug.org.au>
2009/3/6 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi all,
>
> Today's linux-next merge of the kmemcheck tree got a conflict in
> kernel/trace/ring_buffer.c between commit
> a81bd80a0b0a405dc0483e2c428332d69da2c79f ("ring-buffer: use generic
> version of in_nmi") from the tracing tree and commit
> 9b7ff384ee76ced9638ab236db588a6f13916336 ("trace: annotate bitfields in
> struct ring_buffer_event") from the kmemcheck tree.
>
> Just simple 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 kernel/trace/ring_buffer.c
> index f747364,b1f2f60..0000000
> --- a/kernel/trace/ring_buffer.c
> +++ b/kernel/trace/ring_buffer.c
> @@@ -9,7 -7,7 +9,8 @@@
> #include <linux/spinlock.h>
> #include <linux/debugfs.h>
> #include <linux/uaccess.h>
> +#include <linux/hardirq.h>
> + #include <linux/kmemcheck.h>
> #include <linux/module.h>
> #include <linux/percpu.h>
> #include <linux/mutex.h>
>
Isn't it amazing how we both managed to put our new include in exactly
the same spot? :-D
Anyway, thanks for fixing these up, it looks good to me!
Vegard
--
"The animistic metaphor of the bug that maliciously sneaked in while
the programmer was not looking is intellectually dishonest as it
disguises that the error is the programmer's own creation."
-- E. W. Dijkstra, EWD1036
^ permalink raw reply
* linux-next: Tree for March 6
From: Stephen Rothwell @ 2009-03-06 8:13 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10951 bytes --]
Hi all,
Linus' release of -rc7 seems to have stirred people up a bit ...
Changes since 20090305:
Undropped tree:
v4l-dvb
Dropped trees (temporary):
rr (build problem)
The x86 tree lost a conflict.
The tip-core tree gained a conflict against the arm tree.
The tracing tree gained a conflict against each of the cpus4096 and
tip-core trees.
The sched tree gained a conflict against the x86 tree.
The vl4-dvb tree lost its build failure.
The kernel-doc tree gained a conflict against each of the tracing and
timers trees.
The ieee1394 tree gained a conflict against Linus' tree.
The ocfs2 tree lost its conflict.
The net tree gained a conflict against the wireless-current tree.
The cpufreq tree gained a conflict against the x86 tree.
The rr tree gained a conflict against each of the blackfin and x86
trees. It was dropped due to the build failures yesterday.
The kmemcheck tree gained 3 conflicts against the x86 tree and 1 against
the tracing tree.
The iommu tree lost its conflict.
The kmemleak tree gained 3 conflicts against the tip-core tree.
----------------------------------------------------------------------------
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 (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
These builds also have CONFIG_ENABLE_WARN_DEPRECATED,
CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 133 trees (counting Linus' and 18 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
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-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/gpio.c
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
CONFLICT (rename/modify): Merge conflict in arch/arm/plat-pxa/dma.c
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h
Merging xtensa/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c
Merging quilt/usb
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging cpus4096/auto-cpus4096-next
Merging tracing/auto-tracing-next
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (delete/modify): block/blktrace.c deleted in tracing/auto-tracing-next and modified in HEAD. Version HEAD of block/blktrace.c left in tree.
CONFLICT (content): Merge conflict in kernel/irq/handle.c
$ git rm -f block/blktrace.c
Applying: tracing: blktrace merge fix
Merging genirq/auto-genirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in lib/Makefile
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Applying: acpi: update thermal for bus_id removal
Merging nfsd/nfsd-next
Merging ieee1394/for-next
CONFLICT (add/add): Merge conflict in drivers/media/dvb/firewire/firedtv-avc.c
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl3945-base.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt73usb.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in arch/x86/include/asm/timer.h
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/blackfin/kernel/ipipe.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/irq.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-default/setup.c left in tree.
CONFLICT (delete/modify): arch/x86/mach-voyager/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-voyager/setup.c left in tree.
CONFLICT (content): Merge conflict in drivers/firmware/dcdbas.c
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in kernel/module.c
$ git reset --hard
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_proc.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/x86/mm/init_32.c
CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
CONFLICT (content): Merge conflict in mm/Makefile
Applying: kmemcheck: arch/x86/mm/init.c merge fix
Merging generic-ipi/auto-generic-ipi-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
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
CONFLICT (add/add): Merge conflict in drivers/scsi/osd/osd_initiator.c
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in kernel/module.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
CONFLICT (content): Merge conflict in mm/vmalloc.c
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the ieee1394 tree with the tree
From: Stefan Richter @ 2009-03-06 7:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux1394-devel, linux-next
In-Reply-To: <20090306142032.0442213d.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Today's linux-next merge of the ieee1394 tree got a conflict in
> drivers/media/dvb/firewire/firedtv-avc.c between commit
> 154907957f9391b1af997b57507b16c018cc4995 ("firedtv: massive refactoring")
> from Linus' tree and commit 0435392b2594edeba33b2173326e73fdcd67bd50
> ("DVB: firedtv: fix printk format mismatch") from the ieee1394 tree.
>
> I used the latter version.
Thanks. I pushed this conflict resolution into linux1394-2.6.git too now.
--
Stefan Richter
-=====-==--= --== --==-
http://arcgraph.de/sr/
^ permalink raw reply
* linux-next: manual merge of the kmemleak tree with the tip-core tree
From: Stephen Rothwell @ 2009-03-06 7:21 UTC (permalink / raw)
To: Catalin Marinas
Cc: linux-next, Tejun Heo, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin
Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in
include/linux/percpu.h between commit
fbf59bc9d74d1fb30b8e0630743aff2806eafcea ("percpu: implement new dynamic
percpu allocator") from the tip-core tree and commit
a1c9c21c85f5c0bda772419c758bd3f4248ce840 ("kmemleak: Remove some of the
kmemleak false positives") from the kmemleak 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 include/linux/percpu.h
index 545b068,c3b95c0..0000000
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@@ -132,18 -69,25 +132,23 @@@ struct percpu_data
void *ptrs[1];
};
+ /* pointer disguising messes up the kmemleak objects tracking */
+ #ifndef CONFIG_DEBUG_KMEMLEAK
#define __percpu_disguise(pdata) (struct percpu_data *)~(unsigned long)(pdata)
+ #else
+ #define __percpu_disguise(pdata) (struct percpu_data *)(pdata)
+ #endif
-/*
- * Use this to get to a cpu's version of the per-cpu object dynamically
- * allocated. Non-atomic access to the current CPU's version should
- * probably be combined with get_cpu()/put_cpu().
- */
-#define percpu_ptr(ptr, cpu) \
-({ \
- struct percpu_data *__p = __percpu_disguise(ptr); \
- (__typeof__(ptr))__p->ptrs[(cpu)]; \
+
+#define per_cpu_ptr(ptr, cpu) \
+({ \
+ struct percpu_data *__p = __percpu_disguise(ptr); \
+ (__typeof__(ptr))__p->ptrs[(cpu)]; \
})
-extern void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask);
-extern void percpu_free(void *__pdata);
+#endif /* CONFIG_HAVE_DYNAMIC_PER_CPU_AREA */
+
+extern void *__alloc_percpu(size_t size, size_t align);
+extern void free_percpu(void *__pdata);
#else /* CONFIG_SMP */
^ permalink raw reply
* linux-next: manual merge of the kmemleak tree with the tip-core tree
From: Stephen Rothwell @ 2009-03-06 7:19 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-next
Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in
mm/vmalloc.c between commit f0aa6617903648077dffe5cfcf7c4458f4610fa7
("vmalloc: implement vm_area_register_early()") from the tip-core tree
and commit 27e72e01c414e46d39dc87024fa48092d93b77c5 ("kmemleak: Add the
vmalloc memory allocation/freeing hooks") from the kmemleak 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 mm/vmalloc.c
index af58324,40b9040..0000000
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@@ -24,7 -24,7 +24,8 @@@
#include <linux/radix-tree.h>
#include <linux/rcupdate.h>
#include <linux/bootmem.h>
+#include <linux/pfn.h>
+ #include <linux/kmemleak.h>
#include <asm/atomic.h>
#include <asm/uaccess.h>
^ permalink raw reply
* linux-next: manual merge of the kmemleak tree with the tip-core tree
From: Stephen Rothwell @ 2009-03-06 7:17 UTC (permalink / raw)
To: Catalin Marinas
Cc: linux-next, Tejun Heo, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin
Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in
kernel/module.c between commit fbf59bc9d74d1fb30b8e0630743aff2806eafcea
("percpu: implement new dynamic percpu allocator") from the tip-core tree
and commit 6649b74fa7cb64421fce4f3cd4c40b3aa6f3208d ("kmemleak: Add
modules support") from the kmemleak tree.
Juts 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 kernel/module.c
index 6e7621d,92b60e7..0000000
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -51,7 -51,7 +51,8 @@@
#include <linux/tracepoint.h>
#include <linux/ftrace.h>
#include <linux/async.h>
+#include <linux/percpu.h>
+ #include <linux/kmemleak.h>
#if 0
#define DEBUGP printk
^ permalink raw reply
* linux-next: manual merge of the kmemcheck tree with the tracing tree
From: Stephen Rothwell @ 2009-03-06 6:27 UTC (permalink / raw)
To: Vegard Nossum, Pekka Enberg, Ingo Molnar; +Cc: linux-next
Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
kernel/trace/ring_buffer.c between commit
a81bd80a0b0a405dc0483e2c428332d69da2c79f ("ring-buffer: use generic
version of in_nmi") from the tracing tree and commit
9b7ff384ee76ced9638ab236db588a6f13916336 ("trace: annotate bitfields in
struct ring_buffer_event") from the kmemcheck tree.
Just simple 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 kernel/trace/ring_buffer.c
index f747364,b1f2f60..0000000
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@@ -9,7 -7,7 +9,8 @@@
#include <linux/spinlock.h>
#include <linux/debugfs.h>
#include <linux/uaccess.h>
+#include <linux/hardirq.h>
+ #include <linux/kmemcheck.h>
#include <linux/module.h>
#include <linux/percpu.h>
#include <linux/mutex.h>
^ permalink raw reply
* linux-next: manual merge of the kmemcheck tree with the x86 tree
From: Stephen Rothwell @ 2009-03-06 6:24 UTC (permalink / raw)
To: Vegard Nossum, Pekka Enberg, Ingo Molnar; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/init_64.c between commit
f765090a2617b8d9cb73b71e0aa850c29460d8be ("x86: move init_memory_mapping
() to common mm/init.c") from the x86 tree and
commit760932c8607b736504a134ed6feec25e90e089ac ("kmemcheck: (finally)
use 4k pages for identity mapping") from the kmemcheck tree.
I fixed it up as in the tip/master branch.
--
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 kmemcheck tree with the x86 tree
From: Stephen Rothwell @ 2009-03-06 6:19 UTC (permalink / raw)
To: Vegard Nossum, Pekka Enberg, Ingo Molnar; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/init_32.c between various commits from the x86 tree and
commits a7fff94fffaa0cecb923d6c1bb9b7691f608b49a ("Revert "kmemcheck: use
set_memory_4k() instead of disabling PSE"") and
760932c8607b736504a134ed6feec25e90e089ac ("kmemcheck: (finally) use 4k
pages for identity mapping") from the kmemcheck tree.
I fixed it up as in the tip/master branch (patching arch/x86/mm/init.c as
well).
--
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 kmemcheck tree with the x86 tree
From: Stephen Rothwell @ 2009-03-06 6:04 UTC (permalink / raw)
To: Vegard Nossum, Pekka Enberg, Ingo Molnar; +Cc: linux-next
Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/Kconfig between commit 2e9f3bddcbc711bb14d86c6f068a779bf3710247
("bzip2/lzma: make config machinery an arch configurable") from the x86
tree and commit 7df4b20d10108f0c1aa08ed3a7c0bfd9b9014562 ("kmemcheck:
make kconfig accessible for other architectures") from the kmemcheck tree.
Just simple 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 arch/x86/Kconfig
index 5f50c50,467bacc..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -41,9 -40,7 +41,10 @@@ config X8
select HAVE_GENERIC_DMA_COHERENT if X86_32
select HAVE_EFFICIENT_UNALIGNED_ACCESS
select USER_STACKTRACE_SUPPORT
+ select HAVE_KERNEL_GZIP
+ select HAVE_KERNEL_BZIP2
+ select HAVE_KERNEL_LZMA
+ select HAVE_ARCH_KMEMCHECK
config ARCH_DEFCONFIG
string
^ permalink raw reply
* Re: linux-next: rr tree build failure
From: Rusty Russell @ 2009-03-06 5:23 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, David Miller
In-Reply-To: <20090305193352.bb6969cb.sfr@canb.auug.org.au>
On Thursday 05 March 2009 19:03:52 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (sparc64 defconfig) failed like this:
>
> drivers/pci/probe.c: In function 'pci_bus_show_cpuaffinity':
> drivers/pci/probe.c:56: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)
>
> Caused by commit 66ec53ceff39a3daf3b1a3628bca1198bd88c7b3
> ("cpumask:remove-CPU_MASK_ALL_PTR"). 2.6.29-rc2 added cpumask_of_pcibus()
> (which references CPU_MASK_ALL_PTR) to
> arch/sparc/include/asm/topology_64.h .
Hmm, I *did* get that, but somehow lost it from the series file in the patch
shuffle.
cpumask:remove-address-of-CPU_MASK_ALL-sparc.patch
cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL.: sparc
Impact: cleanup
(Thanks to Al Viro for reminding me of this, via Ingo)
CPU_MASK_ALL is the (deprecated) "all bits set" cpumask, defined as so:
#define CPU_MASK_ALL (cpumask_t) { { ... } }
Taking the address of such a temporary is questionable at best,
unfortunately 321a8e9d (cpumask: add CPU_MASK_ALL_PTR macro) added
CPU_MASK_ALL_PTR:
#define CPU_MASK_ALL_PTR (&CPU_MASK_ALL)
Which formalizes this practice. One day gcc could bite us over this
usage (though we seem to have gotten away with it so far).
So replace everywhere which used &CPU_MASK_ALL or CPU_MASK_ALL_PTR
with the modern "cpu_all_mask" (a real struct cpumask *), and remove
CPU_MASK_ALL_PTR altogether.
Also remove the confusing and deprecated large-NR_CPUS-only
"cpu_mask_all".
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Ingo Molnar <mingo@elte.hu>
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Mike Travis <travis@sgi.com>
---
arch/mips/alchemy/common/time.c | 2 +-
arch/sparc/include/asm/topology_64.h | 2 +-
arch/x86/include/asm/es7000/apic.h | 2 +-
arch/x86/include/asm/numaq/apic.h | 2 +-
include/linux/cpumask.h | 6 ------
init/main.c | 7 +------
kernel/kmod.c | 2 +-
kernel/kthread.c | 4 ++--
mm/pdflush.c | 2 +-
9 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h
--- a/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@ -45,7 +45,7 @@ static inline int pcibus_to_node(struct
#define cpumask_of_pcibus(bus) \
(pcibus_to_node(bus) == -1 ? \
- CPU_MASK_ALL_PTR : \
+ cpu_all_mask : \
cpumask_of_node(pcibus_to_node(bus)))
#define SD_NODE_INIT (struct sched_domain) { \
^ permalink raw reply
* Re: linux-next: tree build failure
From: Rusty Russell @ 2009-03-06 5:01 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Mike Travis
In-Reply-To: <20090305184107.0926b4cd.sfr@canb.auug.org.au>
On Thursday 05 March 2009 18:11:07 Stephen Rothwell wrote:
> Caused by commit 6034a37f9dff70fea021bf3a2dcdc356bccb88b3
> ("cpumask:use-cpu_sibling_mask") which introduced uses of
> cpu_sibling_mask which is only defined for x86 ...
Thanks. I've moved that patch back.
I *think* it can use topology_thread_cpumask(), but I have to check that it's defined in all the right cases.
Thanks very much,
Rusty.
^ permalink raw reply
* Re: linux-next: x86 tree build warning
From: Cyrill Gorcunov @ 2009-03-06 5:23 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, linux-next
In-Reply-To: <aa79d98a0903052001w57142b11p5c4dfa228f94c1f7@mail.gmail.com>
On Fri, Mar 6, 2009 at 7:01 AM, Cyrill Gorcunov <gorcunov@gmail.com> wrote:
> On 3/6/09, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> Today's linux-next build (x86_64 allmodconfig) produced this warning:
>>
>> In file included from drivers/char/epca.c:49:
>> drivers/char/digiFep1.h:7:1: warning: "GLOBAL" redefined
>> In file included from include/linux/linkage.h:5,
>> from include/linux/kernel.h:11,
>> from arch/x86/include/asm/system.h:10,
>> from arch/x86/include/asm/processor.h:17,
>> from include/linux/prefetch.h:14,
>> from include/linux/list.h:6,
>> from include/linux/module.h:9,
>> from drivers/char/epca.c:29:
>> arch/x86/include/asm/linkage.h:55:1: warning: this is the location of the
>> previous definition
>>
>> Probably introduced by commit 95695547a7db44b88a7ee36cf5df188de267e99e
>> ("x86: asm linkage - introduce GLOBAL macro") from the x86 tree.
>> --
>> Cheers,
>> Stephen Rothwell sfr@canb.auug.org.au
>> http://www.canb.auug.org.au/~sfr/
>>
>
> Thanks Stephen, i will take a look. Iirc the same macro used as well
> in ia64 arch, weird.
>
I've just checked the sources -- it seems some definitions in
arch/x86/include/asm/linkage.h should be guarded by __ASSEMBLY__ (ie
-- __ALIGN, __ALIGN_STR and eventually GLOBAL). I'll make a patch
today evening (can't get access to linux machine right now). Ingo?
^ permalink raw reply
* linux-next: state of the trees
From: Stephen Rothwell @ 2009-03-06 4:56 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 3220 bytes --]
Hi all,
Given that the release of 2.6.29 and the new merge window is rapidly
approaching, I though I would see what sort of summary I could give of
what is currently in linux-next (and presumably what is destined for
2.6.30).
I have put up two files at
http://kernel.org/pub/linux/kernel/people/sfr/linux-next/next-20090305-{summary,diffstat}
(as well as compressed versions as they are a bit large for the mailing
lists. I chose next-20090305 since it is the first release after
2.6.29-rc7.
The summary from the diffstat looks like this:
4711 files changed, 646856 insertions(+, 216616 deletions(-)
Below is a summary of the state of each tree - the numbers following the
name are the total number of outstanding commits (relative to all the
preceding trees) and the number after doing "git patch-id" matching with
Linus' tree and all the previous trees. Thus the order of the trees
makes a difference to the numbers. No numbers means the tree is empty
relative to all the preceding trees.
The numbers for the kvm tree may be skewed a bit due to the way the tree
is maintained and its patches are sent to Linus.
The v4l-dvb tree is not reflected in the diffstat file above since it
was dropped because of build failures.
origin (Linus' tree)
(These are just outstanding fixes for 2.6.29)
arm-current
m68k-current
powerpc-merge
sparc-current
scsi-rc-fixes
net-current
sound-current
pci-current
wireless-current 2 2
kbuild-current
driver-core.current
usb.current
cpufreq-current
input-current
md-current
audit-current
crypto-current
dwmw2
(From here on down are 2.6.30 candidate changes)
arm 65 65
avr32 2 2
blackfin
cris
ia64
m68k 6 6
m68knommu 33 33
mips
parisc
powerpc 95 94
4xx
galak 5 4
pxa 42 31
s390 49 49
sh 36 36
sparc
x86 513 505
xtensa
driver-core 52 49
usb 66 65
tip-core 42 42
cpus4096 3 3
tracing 179 169
genirq 17 17
safe-poison-pointers 4 4
sched 19 19
stackprotector
timers 5 3
pci 34 33
device-mapper 5 5
hid 9 9
i2c 15 15
jdelvare-hwmon 11 11
kernel-doc 1 1
v4l-dvb 368 367
quota 28 27
jfs 5 5
kbuild
ide 160 160
libata 19 19
nfs 43 43
xfs 41 24
infiniband 25 25
acpi 65 65
nfsd 28 27
ieee1394 112 94
ubi 1 1
kvm 1727 519
dlm 7 7
scsi 48 48
ocfs2 29 20
ext4 22 22
async_tx 15 15
udf 11 11
net 1239 1234
wireless 23 23
mtd
crypto 20 20
vfs
sound 315 314
cpufreq 34 34
v9fs 1 0
rr 101 100
cifs 10 10
mmc 3 1
gfs2 16 16
input 13 13
bkl-removal 4 4
ubifs 2 2
lsm
block
embedded
firmware 8 7
pcmcia
battery 3 3
leds 10 10
backlight 5 5
kgdb 1 1
slab 14 13
uclinux
md 23 23
mfd 21 10
hdlc
drm 34 34
voltage 42 23
security-testing 68 68
lblnet 1 1
ttydev 6 5
agp
kmemcheck 56 56
generic-ipi
oprofile
fastboot
sparseirq
iommu 34 34
uwb
watchdog 17 16
proc 11 11
bdev
dwmw2-iommu
cputime
osd 24 8
fatfs
fuse
jc_docs 1 1
nommu
trivial 23 22
audit
squashfs
omap 23 23
aoe
kmemleak 14 14
staging 403 403
scsi-post-merge
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the rr tree with the blackfin and x86 trees
From: Stephen Rothwell @ 2009-03-06 4:37 UTC (permalink / raw)
To: Rusty Russell
Cc: linux-next, Bryan Wu, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree added conflicts in
arch/blackfin/kernel/ipipe.c and arch/x86/mach-voyager/setup.c. I didn't
bother to work out exactly what is conflicting because I dropped the rr
tree due to the build failures that I assume are still present from
yesterday.
--
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 cpufreq tree with the x86 tree
From: Stephen Rothwell @ 2009-03-06 4:26 UTC (permalink / raw)
To: Dave Jones
Cc: linux-next, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Matthias-Christian Ott
Hi Dave,
Today's linux-next merge of the cpufreq tree got a conflict in
arch/x86/include/asm/timer.h between commit
8e6dafd6c741cd4679b4de3c5d9698851e4fa59c ("x86: refactor x86_quirks
support") from the x86 tree and commit
199785eac892a1fa1b71cc22bec58e8b156d9311 ("[CPUFREQ] p4-clockmod reports
wrong frequency") from the cpufreq 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/x86/include/asm/timer.h
index a81195e,4f5c247..0000000
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@@ -12,9 -11,8 +12,9 @@@ unsigned long native_calibrate_tsc(void
#ifdef CONFIG_X86_32
extern int timer_ack;
- extern int recalibrate_cpu_khz(void);
-#endif
+extern irqreturn_t timer_interrupt(int irq, void *dev_id);
+#endif /* CONFIG_X86_32 */
+ extern int recalibrate_cpu_khz(void);
extern int no_timer_check;
^ permalink raw reply
* Re: linux-next: x86 tree build warning
From: Cyrill Gorcunov @ 2009-03-06 4:01 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, linux-next
In-Reply-To: <20090306114744.faf153c5.sfr@canb.auug.org.au>
On 3/6/09, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
>
> In file included from drivers/char/epca.c:49:
> drivers/char/digiFep1.h:7:1: warning: "GLOBAL" redefined
> In file included from include/linux/linkage.h:5,
> from include/linux/kernel.h:11,
> from arch/x86/include/asm/system.h:10,
> from arch/x86/include/asm/processor.h:17,
> from include/linux/prefetch.h:14,
> from include/linux/list.h:6,
> from include/linux/module.h:9,
> from drivers/char/epca.c:29:
> arch/x86/include/asm/linkage.h:55:1: warning: this is the location of the
> previous definition
>
> Probably introduced by commit 95695547a7db44b88a7ee36cf5df188de267e99e
> ("x86: asm linkage - introduce GLOBAL macro") from the x86 tree.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
Thanks Stephen, i will take a look. Iirc the same macro used as well
in ia64 arch, weird.
^ permalink raw reply
* linux-next: manual merge of the net tree with the wireless-current tree
From: Stephen Rothwell @ 2009-03-06 3:55 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Reinette Chatre, John W. Linville
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
623d563e52d4d4041612e24b33a5610a900dd778 ("iwlwifi: fix error flow in
iwl*_pci_probe") from the wireless-current tree and various commit(s?)
from the net tree.
I used the version of the file from the merge-test branch of the wireless
tree (thanks, John).
--
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 ieee1394 tree with the tree
From: Stephen Rothwell @ 2009-03-06 3:20 UTC (permalink / raw)
To: Stefan Richter, linux1394-devel; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
Hi all,
Today's linux-next merge of the ieee1394 tree got a conflict in
drivers/media/dvb/firewire/firedtv-avc.c between commit
154907957f9391b1af997b57507b16c018cc4995 ("firedtv: massive refactoring")
from Linus' tree and commit 0435392b2594edeba33b2173326e73fdcd67bd50
("DVB: firedtv: fix printk format mismatch") from the ieee1394 tree.
I used the latter version.
--
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 kernel-doc tree with the tracing and timers trees
From: Randy Dunlap @ 2009-03-06 3:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, Eduard - Gabriel Munteanu, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Pekka Enberg
In-Reply-To: <20090306132104.16a0af9d.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Randy,
>
> Today's linux-next merge of the kernel-doc tree got a conflict in
> Documentation/kernel-parameters.txt between commits
> b9ce08c01020eb28bfbfa6faf1c740281c5f418e ("kmemtrace: Core
> implementation") fron the tracing tree and
> b98103a5597b87211a1c74077b06faeac554bedc ("x86: hpet: print HPET
> registers during setup (if hpet=verbose is used)") from the timers tree
> and commit 8e141e0b33e2fd17540881a1ead5103dd229bf81
> ("docum-kernprms-alpha3") from the kernel-doc tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Sounds good. Thanks.
--
~Randy
^ permalink raw reply
* linux-next: v4l-dvb tree build warnings
From: Stephen Rothwell @ 2009-03-06 3:01 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, Igor M. Liplianin
[-- Attachment #1: Type: text/plain, Size: 1400 bytes --]
Hi Mauro,
Today's linux-next build (x86_64 allmodconfig) produced these warnings:
drivers/media/dvb/frontends/stv0900_core.c: In function 'find_inode':
drivers/media/dvb/frontends/stv0900_core.c:65: warning: cast from pointer to integer of different size
drivers/media/dvb/frontends/stv0900_core.c:67: warning: cast from pointer to integer of different size
drivers/media/dvb/frontends/stv0900_core.c:71: warning: cast from pointer to integer of different size
drivers/media/dvb/frontends/stv0900_core.c:73: warning: cast from pointer to integer of different size
drivers/media/dvb/frontends/stv0900_core.c: In function 'stv0900_search':
drivers/media/dvb/frontends/stv0900_core.c:1495: warning: cast from pointer to integer of different size
drivers/media/dvb/frontends/stv0900_core.c: In function 'stv0900_read_status':
drivers/media/dvb/frontends/stv0900_core.c:1610: warning: cast from pointer to integer of different size
drivers/media/dvb/frontends/stv0900_core.c: In function 'stv0900_attach':
drivers/media/dvb/frontends/stv0900_core.c:1923: warning: cast from pointer to integer of different size
Introduced by commit 85b3706579bfb73d7691488ed0e84c38773742aa ("V4L/DVB
(10803): Add core code for ST STV0900 dual demodulator"). Why not use %p
to print pointers?
--
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 tracing tree with the tip-core tree
From: Stephen Rothwell @ 2009-03-06 1:17 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: linux-next, Rusty Russell, Frederic Weisbecker
Hi all,
Today's linux-next merge of the tracing tree got a conflict in
block/blktrace.c between commit 313e458f81ec3852106c5a83830fe0d4f405a71a
("alloc_percpu: add align argument to __alloc_percpu") from the tip-core
tree and commit 2db270a80b8f2238e536876cfb3987af02684df8
("tracing/blktrace: move the tracing file to kernel/trace") from the
tracing tree.
I applied the block/blktrace.c part of the former commit to
kernel/trace/blktrace.c (see below) and can carry this fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index e39679a..d24a10b 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -423,7 +423,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
if (!bt->sequence)
goto err;
- bt->msg_data = __alloc_percpu(BLK_TN_MAX_MSG);
+ bt->msg_data = __alloc_percpu(BLK_TN_MAX_MSG, __alignof__(char));
if (!bt->msg_data)
goto err;
^ permalink raw reply related
* linux-next: manual merge of the sched tree with the x86 tree
From: Stephen Rothwell @ 2009-03-06 1:17 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next, Peter Zijlstra
Hi all,
Today's linux-next merge of the sched tree got a conflict in lib/Makefile
between commit 889c92d21db40be0b7d22a59395060237895bb85 ("bzip2/lzma:
centralize format detection") from the x86 tree and commit
ceacc2c1c85ac498ca4cf297bdfe5b4aaa9fd0e0 ("sched: make plist a library
facility") from the sched 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 lib/Makefile
index 1173a43,902d738..0000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -12,7 -12,7 +12,7 @@@ lib-y := ctype.o string.o vsprintf.o cm
idr.o int_sqrt.o extable.o prio_tree.o \
sha1.o irq_regs.o reciprocal_div.o argv_split.o \
proportions.o prio_heap.o ratelimit.o show_mem.o \
- is_single_threaded.o decompress.o
- is_single_threaded.o plist.o
++ is_single_threaded.o decompress.o plist.o
lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o
^ permalink raw reply
* linux-next: manual merge of the kernel-doc tree with the tracing and timers trees
From: Stephen Rothwell @ 2009-03-06 2:21 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-next, Eduard - Gabriel Munteanu, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Pekka Enberg
Hi Randy,
Today's linux-next merge of the kernel-doc tree got a conflict in
Documentation/kernel-parameters.txt between commits
b9ce08c01020eb28bfbfa6faf1c740281c5f418e ("kmemtrace: Core
implementation") fron the tracing tree and
b98103a5597b87211a1c74077b06faeac554bedc ("x86: hpet: print HPET
registers during setup (if hpet=verbose is used)") from the timers tree
and commit 8e141e0b33e2fd17540881a1ead5103dd229bf81
("docum-kernprms-alpha3") from the kernel-doc 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 Documentation/kernel-parameters.txt
index 2475fb1,0725b91..0000000
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -814,6 -764,14 +768,16 @@@ and is between 256 and 4096 characters
hisax= [HW,ISDN]
See Documentation/isdn/README.HiSax.
+ hlt [BUGS=ARM,SH]
+
+ hpet= [X86-32,HPET] option to control HPET usage
- Format: { enable (default) | disable | force }
++ Format: { enable (default) | disable | force |
++ verbose }
+ disable: disable HPET and use PIT instead
+ force: allow force enabled of undocumented chips (ICH4,
+ VIA, nVidia)
++ verbose: show contents of HPET registers during setup
+
hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot.
hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages.
On x86-64 and powerpc, this option can be specified
@@@ -1056,27 -995,15 +1006,24 @@@
use the HighMem zone if it exists, and the Normal
zone if it does not.
+ kgdboc= [HW] kgdb over consoles.
+ Requires a tty driver that supports console polling.
+ (only serial suported for now)
+ Format: <serial_device>[,baud]
+
+ kmac= [MIPS] korina ethernet MAC address.
+ Configure the RouterBoard 532 series on-chip
+ Ethernet adapter MAC address.
+
+ kmemtrace.enable= [KNL,KMEMTRACE] Format: { yes | no }
+ Controls whether kmemtrace is enabled
+ at boot-time.
+
+ kmemtrace.subbufs=n [KNL,KMEMTRACE] Overrides the number of
+ subbufs kmemtrace's relay channel has. Set this
+ higher than default (KMEMTRACE_N_SUBBUFS in code) if
+ you experience buffer overruns.
+
- movablecore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter
- is similar to kernelcore except it specifies the
- amount of memory used for migratable allocations.
- If both kernelcore and movablecore is specified,
- then kernelcore will be at *least* the specified
- value but may be more. If movablecore on its own
- is specified, the administrator must be careful
- that the amount of memory usable for all allocations
- is not too small.
-
- keepinitrd [HW,ARM]
-
kstack=N [X86-32,X86-64] Print N words from the kernel stack
in oops dumps.
^ permalink raw reply
* Re: linux-next: v4l-dvb tree build failure
From: Mauro Carvalho Chehab @ 2009-03-06 1:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Igor M. Liplianin
In-Reply-To: <20090306110548.9ef01100.sfr@canb.auug.org.au>
On Fri, 6 Mar 2009 11:05:48 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Mauro,
>
> On Thu, 5 Mar 2009 18:51:50 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
> >
> > Fixed.
>
> Thanks.
>
> > From time to time, I got an weird message like this when updating my remote
> > repository:
> >
> > $ git --git-dir /home/v4l/tokernel/bare/linux-next.git push -f origin
> > Counting objects: 194, done.
> > Compressing objects: 100% (70/70), done.
> > Writing objects: 100% (93/93), 14.19 KiB, done.
> > Total 93 (delta 82), reused 24 (delta 23)
> > warning: updating the currently checked out branch; this may cause confusion,
> > as the index and working tree do not reflect changes that are now in HEAD.
> > To ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git
> >
> > What's more weird is that I never touch directly
> > on /home/v4l/tokernel/bare/linux-next.git, since this is just a local bare
> > tree. My procedure is to update the patches on a work tree, then push it to the
> > bare repository and then to kernel.org.
>
> Is there some reason that you repo on kernel.org is not bare as well?
It is bare...
Hmm... at config, it were marked with bare = false, not sure why.
Anyway, I manually Fixed config. It seemed to solve the issue.
Thanks!
Cheers,
Mauro
^ 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