* linux-next: manual merge of the v4l-dvb tree with the davinci tree
From: Stephen Rothwell @ 2009-07-23 0:11 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Chaithrika U S, Manjunath Hadli,
Brijesh Jadav, Kevin Hilman, Hemant Pedanekar
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-davinci/board-dm646x-evm.c between commits
e94c101ce3ef11bc00f8ea5db4b65c4b01874cf8 ("davinci: ASoC: Add the
platform devices for ASP") and 4d6c5c3ec7c9b6d0d055da77c406049f7a663a0c
("davinci: dm646x-evm: Add support for IDE") from the davinci tree and
commit be45110fa4525939a32c0509229a1781c5c3da78 ("arch/arm/mach-davinci:
Platform and board specific setup for DM646x EVM") from the v4l-dvb tree.
I think that these are just overlapping additions (though they my
actually be implementing similar things). I fixed it up (see below) and
can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-davinci/board-dm646x-evm.c
index b1bf18c,eb4bd01..0000000
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@@ -259,35 -220,40 +272,69 @@@ static struct at24_platform_data eeprom
.context = (void *)0x7f00,
};
+static u8 dm646x_iis_serializer_direction[] = {
+ TX_MODE, RX_MODE, INACTIVE_MODE, INACTIVE_MODE,
+};
+
+static u8 dm646x_dit_serializer_direction[] = {
+ TX_MODE,
+};
+
+static struct snd_platform_data dm646x_evm_snd_data[] = {
+ {
+ .tx_dma_offset = 0x400,
+ .rx_dma_offset = 0x400,
+ .op_mode = DAVINCI_MCASP_IIS_MODE,
+ .num_serializer = ARRAY_SIZE(dm646x_iis_serializer_direction),
+ .tdm_slots = 2,
+ .serial_dir = dm646x_iis_serializer_direction,
+ .eventq_no = EVENTQ_0,
+ },
+ {
+ .tx_dma_offset = 0x400,
+ .rx_dma_offset = 0,
+ .op_mode = DAVINCI_MCASP_DIT_MODE,
+ .num_serializer = ARRAY_SIZE(dm646x_dit_serializer_direction),
+ .tdm_slots = 32,
+ .serial_dir = dm646x_dit_serializer_direction,
+ .eventq_no = EVENTQ_0,
+ },
+};
+
+ static struct i2c_client *cpld_client;
+
+ static int cpld_video_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+ {
+ cpld_client = client;
+ return 0;
+ }
+
+ static int __devexit cpld_video_remove(struct i2c_client *client)
+ {
+ cpld_client = NULL;
+ return 0;
+ }
+
+ static const struct i2c_device_id cpld_video_id[] = {
+ { "cpld_video", 0 },
+ { }
+ };
+
+ static struct i2c_driver cpld_video_driver = {
+ .driver = {
+ .name = "cpld_video",
+ },
+ .probe = cpld_video_probe,
+ .remove = cpld_video_remove,
+ .id_table = cpld_video_id,
+ };
+
+ static void evm_init_cpld(void)
+ {
+ i2c_add_driver(&cpld_video_driver);
+ }
+
static struct i2c_board_info __initdata i2c_info[] = {
{
I2C_BOARD_INFO("24c256", 0x50),
@@@ -298,8 -264,8 +345,11 @@@
.platform_data = &pcf_data,
},
{
+ I2C_BOARD_INFO("cpld_reg0", 0x3a),
+ },
++ {
+ I2C_BOARD_INFO("cpld_video", 0x3B),
+ },
};
static struct davinci_i2c_platform_data i2c_pdata = {
@@@ -310,8 -346,8 +430,9 @@@ static struct vpif_config dm646x_vpif_c
static void __init evm_init_i2c(void)
{
davinci_init_i2c(&i2c_pdata);
+ i2c_add_driver(&dm6467evm_cpld_driver);
i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
+ evm_init_cpld();
}
static void __init davinci_map_io(void)
^ permalink raw reply
* linux-next: manual merge of the v4l-dvb tree with the davinci tree
From: Stephen Rothwell @ 2009-07-23 0:11 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Muralidharan Karicheri, Chaithrika U S,
Naresh Medisetty, Kevin Hilman
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-davinci/dm355.c between commit
e94c101ce3ef11bc00f8ea5db4b65c4b01874cf8 ("davinci: ASoC: Add the
platform devices for ASP") from the davinci tree and commit
32a01291c576c302d82a985d91db720dcf8c891b ("V4L/DVB: DM355 platform
changes for vpfe capture driver") from the v4l-dvb tree.
I assume that these are orthogonal changes (though they may not be). I
fixed it up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-davinci/dm355.c
index 3abeb3e,2696df1..0000000
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@@ -628,31 -612,67 +636,92 @@@ static struct platform_device dm355_edm
.resource = edma_resources,
};
+static struct resource dm355_asp1_resources[] = {
+ {
+ .start = DAVINCI_ASP1_BASE,
+ .end = DAVINCI_ASP1_BASE + SZ_8K - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = DAVINCI_DMA_ASP1_TX,
+ .end = DAVINCI_DMA_ASP1_TX,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .start = DAVINCI_DMA_ASP1_RX,
+ .end = DAVINCI_DMA_ASP1_RX,
+ .flags = IORESOURCE_DMA,
+ },
+};
+
+static struct platform_device dm355_asp1_device = {
+ .name = "davinci-asp",
+ .id = 1,
+ .num_resources = ARRAY_SIZE(dm355_asp1_resources),
+ .resource = dm355_asp1_resources,
+};
+
+ static struct resource dm355_vpss_resources[] = {
+ {
+ /* VPSS BL Base address */
+ .name = "vpss",
+ .start = 0x01c70800,
+ .end = 0x01c70800 + 0xff,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ /* VPSS CLK Base address */
+ .name = "vpss",
+ .start = 0x01c70000,
+ .end = 0x01c70000 + 0xf,
+ .flags = IORESOURCE_MEM,
+ },
+ };
+
+ static struct platform_device dm355_vpss_device = {
+ .name = "vpss",
+ .id = -1,
+ .dev.platform_data = "dm355_vpss",
+ .num_resources = ARRAY_SIZE(dm355_vpss_resources),
+ .resource = dm355_vpss_resources,
+ };
+
+ static struct resource vpfe_resources[] = {
+ {
+ .start = IRQ_VDINT0,
+ .end = IRQ_VDINT0,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_VDINT1,
+ .end = IRQ_VDINT1,
+ .flags = IORESOURCE_IRQ,
+ },
+ /* CCDC Base address */
+ {
+ .flags = IORESOURCE_MEM,
+ .start = 0x01c70600,
+ .end = 0x01c70600 + 0x1ff,
+ },
+ };
+
+ static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32);
+ static struct platform_device vpfe_capture_dev = {
+ .name = CAPTURE_DRV_NAME,
+ .id = -1,
+ .num_resources = ARRAY_SIZE(vpfe_resources),
+ .resource = vpfe_resources,
+ .dev = {
+ .dma_mask = &vpfe_capture_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+ };
+
+ void dm355_set_vpfe_config(struct vpfe_config *cfg)
+ {
+ vpfe_capture_dev.dev.platform_data = cfg;
+ }
+
/*----------------------------------------------------------------------*/
static struct map_desc dm355_io_desc[] = {
^ permalink raw reply
* linux-next: manual merge of the v4l-dvb tree with the davinci tree
From: Stephen Rothwell @ 2009-07-23 0:15 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Muralidharan Karicheri, Chaithrika U S,
Naresh Medisetty, Kevin Hilman
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-davinci/dm644x.c between commit
e94c101ce3ef11bc00f8ea5db4b65c4b01874cf8 ("davinci: ASoC: Add the
platform devices for ASP") from the davinci tree and commit
751970533394e56a84289abe6c92605460ada306 ("V4L/DVB: DM6446 platform
changes for vpfe capture driver") from the v4l-dvb tree.
Again, I assume these are orthogonal changes. I fixed it up (see below)
and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-davinci/dm644x.c
index e554aa6,cc8fc78..0000000
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@@ -554,32 -530,59 +554,85 @@@ static struct platform_device dm644x_ed
.resource = edma_resources,
};
+/* DM6446 EVM uses ASP0; line-out is a pair of RCA jacks */
+static struct resource dm644x_asp_resources[] = {
+ {
+ .start = DAVINCI_ASP0_BASE,
+ .end = DAVINCI_ASP0_BASE + SZ_8K - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = DAVINCI_DMA_ASP0_TX,
+ .end = DAVINCI_DMA_ASP0_TX,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .start = DAVINCI_DMA_ASP0_RX,
+ .end = DAVINCI_DMA_ASP0_RX,
+ .flags = IORESOURCE_DMA,
+ },
+};
+
+static struct platform_device dm644x_asp_device = {
+ .name = "davinci-asp",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(dm644x_asp_resources),
+ .resource = dm644x_asp_resources,
+};
+
+ static struct resource dm644x_vpss_resources[] = {
+ {
+ /* VPSS Base address */
+ .name = "vpss",
+ .start = 0x01c73400,
+ .end = 0x01c73400 + 0xff,
+ .flags = IORESOURCE_MEM,
+ },
+ };
+
+ static struct platform_device dm644x_vpss_device = {
+ .name = "vpss",
+ .id = -1,
+ .dev.platform_data = "dm644x_vpss",
+ .num_resources = ARRAY_SIZE(dm644x_vpss_resources),
+ .resource = dm644x_vpss_resources,
+ };
+
+ static struct resource vpfe_resources[] = {
+ {
+ .start = IRQ_VDINT0,
+ .end = IRQ_VDINT0,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_VDINT1,
+ .end = IRQ_VDINT1,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = 0x01c70400,
+ .end = 0x01c70400 + 0xff,
+ .flags = IORESOURCE_MEM,
+ },
+ };
+
+ static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32);
+ static struct platform_device vpfe_capture_dev = {
+ .name = CAPTURE_DRV_NAME,
+ .id = -1,
+ .num_resources = ARRAY_SIZE(vpfe_resources),
+ .resource = vpfe_resources,
+ .dev = {
+ .dma_mask = &vpfe_capture_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+ };
+
+ void dm644x_set_vpfe_config(struct vpfe_config *cfg)
+ {
+ vpfe_capture_dev.dev.platform_data = cfg;
+ }
+
/*----------------------------------------------------------------------*/
static struct map_desc dm644x_io_desc[] = {
^ permalink raw reply
* linux-next: manual merge of the sound tree with the davinci tree
From: Stephen Rothwell @ 2009-07-23 1:21 UTC (permalink / raw)
To: Takashi Iwai
Cc: linux-next, linux-kernel, Chaithrika U S, Pavel Kiryukhin,
Naresh Medisetty, Steve Chen, Mark Brown, Sudhakar Rajashekhara,
Kevin Hilman
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/davinci/davinci-evm.c between commit
95d0d986d09ac25a5b9f2bf28f289ab0823e86d5 ("davinci: EDMA: multiple CCs,
channel mapping and API changes") from the davinci tree and commit
04f80f5c486b39446af44e218dba90ec210d61ca ("ASoC: Add machine driver
support for DM646x") from the sound tree.
The latter removes the code modified by the former. I have just used the
latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: async_tx tree build failure
From: Stephen Rothwell @ 2009-07-23 2:00 UTC (permalink / raw)
To: Dan Williams; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 845 bytes --]
Hi Dan,
Since next-20090623, the linux-next build (i386 allmodconfig) has failed
like this:
crypto/async_tx/async_xor.c: In function ‘async_xor_init’:
crypto/async_tx/async_xor.c:310: error: size of array ‘type name’ is negative
The failing line is this:
BUILD_BUG_ON(sizeof(dma_addr_t) > sizeof(struct page *));
in async_xor_init() introduced by commit
0036731c88fdb5bf4f04a796a30b5e445fc57f54 ("async_tx: kill tx_set_src and
tx_set_dest methods") in Feb, 2008.
Bisecting in the next-20090623 tree pointed to commit
3c30a9ca1fb95214e60e3bf43957971df6668033 ("dmaengine: move HIGHMEM64G
restriction to ASYNC_TX_DMA") from the async_tx tree. This is now commit
f3c56e57f66a73a241299dbec1ad55491aa0e403.
--
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: kgdb tree fetch failure
From: Jason Wessel @ 2009-07-23 3:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090723090956.e6024af4.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Jason,
>
> Today's linux-next fetch of the kgdb tree failed like this:
>
> kgdb: git
> fatal: Couldn't find remote ref refs/heads/kgdb-next
> fatal: The remote end hung up unexpectedly
>
> So I will use the kgdb tree from yesterday (which actually dates from
> May).
>
>
In the several years I have been using git, I have never seen it get
corrupted until today.
My local git repository completely bailed, so I am going to reconstruct
the kgdb branches from a new clone. There was no obvious way to recover
my archive.
Here is what it said:
% git push --force
ssh://master.kernel.org/staging/jwessel/linux-2.6-kgdb.git kgdb-next
fatal: bad object 4be3bd7849165e7efa6b0b35a23d6a3598d97465
error: pack-objects died with strange error
error: failed to push some refs to
'ssh://master.kernel.org/staging/jwessel/linux-2.6-kgdb.git'
I'll leave the archive around for a while, as it is nothing more than a
science project as a curiosity of how you recover from such a state.
Jason.
^ permalink raw reply
* Re: linux-next: kgdb tree fetch failure
From: Stephen Rothwell @ 2009-07-23 3:38 UTC (permalink / raw)
To: Jason Wessel; +Cc: linux-next, linux-kernel
In-Reply-To: <4A67D36D.8070209@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
Hi Jason,
On Wed, 22 Jul 2009 22:05:17 -0500 Jason Wessel <jason.wessel@windriver.com> wrote:
>
> In the several years I have been using git, I have never seen it get
> corrupted until today.
Ouch!
> My local git repository completely bailed, so I am going to reconstruct
> the kgdb branches from a new clone. There was no obvious way to recover
> my archive.
OK, thanks.
--
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: kgdb tree fetch failure
From: Jason Wessel @ 2009-07-23 3:48 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090723133842.30ae062b.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Jason,
>
>
>> My local git repository completely bailed, so I am going to reconstruct
>> the kgdb branches from a new clone. There was no obvious way to recover
>> my archive.
>>
>
>
As luck would have it, the pull of 2.6.31-rc4 magically fixed the local
archive, so kgdb-next branch is back in sync and updated.
Thanks,
Jason.
^ permalink raw reply
* Re: linux-next: async_tx tree build failure
From: Dan Williams @ 2009-07-23 4:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20090723120004.fac867eb.sfr@canb.auug.org.au>
On Wed, 2009-07-22 at 19:00 -0700, Stephen Rothwell wrote:
> Hi Dan,
>
> Since next-20090623, the linux-next build (i386 allmodconfig) has failed
> like this:
>
> crypto/async_tx/async_xor.c: In function ‘async_xor_init’:
> crypto/async_tx/async_xor.c:310: error: size of array ‘type name’ is negative
>
> The failing line is this:
>
> BUILD_BUG_ON(sizeof(dma_addr_t) > sizeof(struct page *));
>
> in async_xor_init() introduced by commit
> 0036731c88fdb5bf4f04a796a30b5e445fc57f54 ("async_tx: kill tx_set_src and
> tx_set_dest methods") in Feb, 2008.
>
> Bisecting in the next-20090623 tree pointed to commit
> 3c30a9ca1fb95214e60e3bf43957971df6668033 ("dmaengine: move HIGHMEM64G
> restriction to ASYNC_TX_DMA") from the async_tx tree. This is now commit
> f3c56e57f66a73a241299dbec1ad55491aa0e403.
Gah, yes that commit was half baked. I have pushed out an updated tree
with the following fix:
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 95fe2c8..90dd3f8 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -300,7 +300,7 @@ EXPORT_SYMBOL_GPL(async_xor_zero_sum);
static int __init async_xor_init(void)
{
- #ifdef CONFIG_DMA_ENGINE
+ #ifdef CONFIG_ASYNC_TX_DMA
/* To conserve stack space the input src_list (array of page pointers)
* is reused to hold the array of dma addresses passed to the driver.
* This conversion is only possible when dma_addr_t is less than the
Thanks,
Dan
^ permalink raw reply related
* Re: linux-next: async_tx tree build failure
From: Stephen Rothwell @ 2009-07-23 5:17 UTC (permalink / raw)
To: Dan Williams; +Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <1248323620.24951.2.camel@dwillia2-linux.ch.intel.com>
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
Hi Dan,
On Wed, 22 Jul 2009 21:33:40 -0700 Dan Williams <dan.j.williams@intel.com> wrote:
>
> Gah, yes that commit was half baked. I have pushed out an updated tree
> with the following fix:
Thanks.
--
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 sound tree with the davinci tree
From: Takashi Iwai @ 2009-07-23 6:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Chaithrika U S, Pavel Kiryukhin,
Naresh Medisetty, Steve Chen, Mark Brown, Sudhakar Rajashekhara,
Kevin Hilman
In-Reply-To: <20090723112110.e42430e9.sfr@canb.auug.org.au>
At Thu, 23 Jul 2009 11:21:10 +1000,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> Today's linux-next merge of the sound tree got a conflict in
> sound/soc/davinci/davinci-evm.c between commit
> 95d0d986d09ac25a5b9f2bf28f289ab0823e86d5 ("davinci: EDMA: multiple CCs,
> channel mapping and API changes") from the davinci tree and commit
> 04f80f5c486b39446af44e218dba90ec210d61ca ("ASoC: Add machine driver
> support for DM646x") from the sound tree.
>
> The latter removes the code modified by the former. I have just used the
> latter.
Thanks. I'll try to resolve the conflict in the sound tree,
e.g. pulling the affecting commit of davinci tree into for-next
branch.
Takashi
^ permalink raw reply
* linux-next: Tree for July 23
From: Stephen Rothwell @ 2009-07-23 6:32 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7688 bytes --]
Hi all,
Changes since 20090722:
This tree fails to build for powerpc allyesconfig (final link problem).
The v4l-dvb tree gained 4 conflicts against the davinci tree.
The sound tree gained a conflict against the davinci tree.
I merged an updated version of Linus' tree at the end to get a build fix.
----------------------------------------------------------------------------
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 134 trees (counting Linus' and 19 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 fixes/fixes
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
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/journal.c
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwmc3200wifi/netdev.c
CONFLICT (content): Merge conflict in net/wireless/scan.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/davinci/davinci-evm.c
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
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 mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
$ git reset --hard HEAD^
Merging refs/next/20090713/ttydev
CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c
CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
Merging update origin/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: next: sfi build fails when !CONFIG_ACPI
From: Feng Tang @ 2009-07-23 8:33 UTC (permalink / raw)
To: Randy Dunlap
Cc: Alexander Beregalov, linux-next, Brown, Len,
Linux Kernel Mailing List, linux-acpi@vger.kernel.org
In-Reply-To: <20090722150617.13c24350.randy.dunlap@oracle.com>
On Thu, 23 Jul 2009 06:06:17 +0800
Randy Dunlap <randy.dunlap@oracle.com> wrote:
> On Thu, 16 Jul 2009 12:48:01 +0400 Alexander Beregalov wrote:
>
> > Hi
> >
> > drivers/sfi/sfi_core.c: In function 'sfi_init':
> > drivers/sfi/sfi_core.c:346: error: 'acpi_disabled' undeclared (first
> > use in this function)
> > drivers/sfi/sfi_core.c:346: error: (Each undeclared identifier is
> > reported only once
> > drivers/sfi/sfi_core.c:346: error: for each function it appears in.)
> >
> >
> > $ grep ACPI .config
> > # Power management and ACPI options
> > --
>
> next-20090722 still fails on x86_32 when SFI=y & ACPI=n:
>
> arch/x86/pci/mmconfig_32.c:34: error: invalid use of undefined type
> 'struct acpi_mcfg_allocation' arch/x86/pci/mmconfig_32.c:34: error:
> dereferencing pointer to incomplete type
> arch/x86/pci/mmconfig_32.c:35: error: dereferencing pointer to
> incomplete type arch/x86/pci/mmconfig_32.c:36: error: dereferencing
> pointer to incomplete type arch/x86/pci/mmconfig_32.c:37: error:
> dereferencing pointer to incomplete type
> arch/x86/pci/mmconfig_32.c:38: error: dereferencing pointer to
> incomplete type
>
> config is attached.
Hi Randy,
Thanks for the catch. Could you try the following patch? thanks!
- Feng
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 25a0d9f..e89bf33 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -557,15 +557,15 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
i -= sizeof(struct acpi_mcfg_allocation);
};
if (pci_mmcfg_config_num == 0) {
- printk(KERN_ERR PREFIX "MMCONFIG has no entries\n");
+ printk(KERN_ERR "PCI: MMCONFIG has no entries\n");
return -ENODEV;
}
config_size = pci_mmcfg_config_num * sizeof(*pci_mmcfg_config);
pci_mmcfg_config = kmalloc(config_size, GFP_KERNEL);
if (!pci_mmcfg_config) {
- printk(KERN_WARNING PREFIX
- "No memory for MCFG config tables\n");
+ printk(KERN_WARNING
+ "PCI: No memory for MCFG config tables\n");
return -ENOMEM;
}
@@ -576,8 +576,8 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
for (i = 0; i < pci_mmcfg_config_num; ++i) {
if ((pci_mmcfg_config[i].address > 0xFFFFFFFF) &&
!acpi_mcfg_64bit_base_addr) {
- printk(KERN_ERR PREFIX
- "MMCONFIG not in low 4GB of memory\n");
+ printk(KERN_ERR
+ "PCI: MMCONFIG not in low 4GB of memory\n");
kfree(pci_mmcfg_config);
pci_mmcfg_config_num = 0;
return -ENODEV;
@@ -609,7 +609,9 @@ static void __init __pci_mmcfg_init(int early)
if (!known_bridge)
x86_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);
+#ifdef CONFIG_ACPI
pci_mmcfg_reject_broken(early);
+#endif
if ((pci_mmcfg_config_num == 0) ||
(pci_mmcfg_config == NULL) ||
diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
index 8b2d561..f10a7e9 100644
--- a/arch/x86/pci/mmconfig_32.c
+++ b/arch/x86/pci/mmconfig_32.c
@@ -11,9 +11,9 @@
#include <linux/pci.h>
#include <linux/init.h>
-#include <linux/acpi.h>
#include <asm/e820.h>
#include <asm/pci_x86.h>
+#include <acpi/acpi.h>
/* Assume systems with more busses have correct MCFG */
#define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
index 356d0a2..3c645bb 100644
--- a/include/linux/sfi_acpi.h
+++ b/include/linux/sfi_acpi.h
@@ -50,8 +50,10 @@ extern int sfi_acpi_table_parse(char *signature, char *oem_id,
static inline int x86_table_parse(char *signature,
int (*handler)(struct acpi_table_header *))
{
+#ifdef CONFIG_ACPI
if (!acpi_table_parse(signature, handler))
return 0;
+#endif
return sfi_acpi_table_parse(signature, NULL, NULL, handler);
}
>
> ---
> ~Randy
> LPC 2009, Sept. 23-25, Portland, Oregon
> http://linuxplumbersconf.org/2009/
^ permalink raw reply related
* Re: next: sfi build fails when !CONFIG_ACPI
From: Alexander Beregalov @ 2009-07-23 8:43 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next, Feng Tang, Linux Kernel Mailing List, linux-acpi
In-Reply-To: <a4423d670907170657o2c68c479j9b4810af5adad29f@mail.gmail.com>
2009/7/17 Alexander Beregalov <a.beregalov@gmail.com>:
> 2009/7/17 Len Brown <lenb@kernel.org>:
>>> drivers/sfi/sfi_core.c: In function 'sfi_init':
>>> drivers/sfi/sfi_core.c:346: error: 'acpi_disabled' undeclared (first
>>> use in this function)
>>> drivers/sfi/sfi_core.c:346: error: (Each undeclared identifier is
>>> reported only once
>>> drivers/sfi/sfi_core.c:346: error: for each function it appears in.)
>>>
>>>
>>> $ grep ACPI .config
>>> # Power management and ACPI options
>>
>> It builds for me.
>> Please send me the complete failing .config
>
> Attached (x86_64)
Still fails for me in the same way,
X86_64
next-20090723
^ permalink raw reply
* Re: next: sfi build fails when !CONFIG_ACPI
From: Feng Tang @ 2009-07-23 10:15 UTC (permalink / raw)
To: Alexander Beregalov
Cc: Len Brown, linux-next, Linux Kernel Mailing List,
linux-acpi@vger.kernel.org
In-Reply-To: <a4423d670907230143l78f324dewefa4cb8990ef4266@mail.gmail.com>
On Thu, 23 Jul 2009 16:43:30 +0800
Alexander Beregalov <a.beregalov@gmail.com> wrote:
> 2009/7/17 Alexander Beregalov <a.beregalov@gmail.com>:
> > 2009/7/17 Len Brown <lenb@kernel.org>:
> >>> drivers/sfi/sfi_core.c: In function 'sfi_init':
> >>> drivers/sfi/sfi_core.c:346: error: 'acpi_disabled' undeclared
> >>> (first use in this function)
> >>> drivers/sfi/sfi_core.c:346: error: (Each undeclared identifier is
> >>> reported only once
> >>> drivers/sfi/sfi_core.c:346: error: for each function it appears
> >>> in.)
> >>>
> >>>
> >>> $ grep ACPI .config
> >>> # Power management and ACPI options
> >>
> >> It builds for me.
> >> Please send me the complete failing .config
> >
> > Attached (x86_64)
>
> Still fails for me in the same way,
> X86_64
> next-20090723
sorry for the late response, please try the following patch:
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c
index 62e2f98..fa66824 100644
--- a/drivers/sfi/sfi_core.c
+++ b/drivers/sfi/sfi_core.c
@@ -361,9 +361,6 @@ static __init int sfi_find_syst(void)
void __init sfi_init(void)
{
- if (!acpi_disabled)
- disable_sfi();
-
if (sfi_disabled)
return;
Thanks,
Feng
^ permalink raw reply related
* Re: next: sfi build fails when !CONFIG_ACPI
From: Alexander Beregalov @ 2009-07-23 11:28 UTC (permalink / raw)
To: Feng Tang
Cc: Len Brown, linux-next, Linux Kernel Mailing List,
linux-acpi@vger.kernel.org
In-Reply-To: <20090723181525.475692d3@feng-desktop>
2009/7/23 Feng Tang <feng.tang@intel.com>:
> On Thu, 23 Jul 2009 16:43:30 +0800
> Alexander Beregalov <a.beregalov@gmail.com> wrote:
>
>> 2009/7/17 Alexander Beregalov <a.beregalov@gmail.com>:
>> > 2009/7/17 Len Brown <lenb@kernel.org>:
>> >>> drivers/sfi/sfi_core.c: In function 'sfi_init':
>> >>> drivers/sfi/sfi_core.c:346: error: 'acpi_disabled' undeclared
>> >>> (first use in this function)
>> >>> drivers/sfi/sfi_core.c:346: error: (Each undeclared identifier is
>> >>> reported only once
>> >>> drivers/sfi/sfi_core.c:346: error: for each function it appears
>> >>> in.)
>> >>>
>> >>>
>> >>> $ grep ACPI .config
>> >>> # Power management and ACPI options
>> >>
>> >> It builds for me.
>> >> Please send me the complete failing .config
>> >
>> > Attached (x86_64)
>>
>> Still fails for me in the same way,
>> X86_64
>> next-20090723
>
> sorry for the late response, please try the following patch:
It obviously works. Thanks
>
> diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c
> index 62e2f98..fa66824 100644
> --- a/drivers/sfi/sfi_core.c
> +++ b/drivers/sfi/sfi_core.c
> @@ -361,9 +361,6 @@ static __init int sfi_find_syst(void)
>
> void __init sfi_init(void)
> {
> - if (!acpi_disabled)
> - disable_sfi();
> -
> if (sfi_disabled)
> return;
>
> Thanks,
> Feng
>
^ permalink raw reply
* Re: next: sfi build fails when !CONFIG_ACPI
From: Randy Dunlap @ 2009-07-23 14:53 UTC (permalink / raw)
To: Feng Tang
Cc: Alexander Beregalov, linux-next, Brown, Len,
Linux Kernel Mailing List, linux-acpi@vger.kernel.org
In-Reply-To: <20090723163322.615e1f8e@feng-desktop>
On Thu, 23 Jul 2009 16:33:22 +0800 Feng Tang wrote:
> On Thu, 23 Jul 2009 06:06:17 +0800
> Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> > On Thu, 16 Jul 2009 12:48:01 +0400 Alexander Beregalov wrote:
> >
> > > Hi
> > >
> > > drivers/sfi/sfi_core.c: In function 'sfi_init':
> > > drivers/sfi/sfi_core.c:346: error: 'acpi_disabled' undeclared (first
> > > use in this function)
> > > drivers/sfi/sfi_core.c:346: error: (Each undeclared identifier is
> > > reported only once
> > > drivers/sfi/sfi_core.c:346: error: for each function it appears in.)
> > >
> > >
> > > $ grep ACPI .config
> > > # Power management and ACPI options
> > > --
> >
> > next-20090722 still fails on x86_32 when SFI=y & ACPI=n:
> >
> > arch/x86/pci/mmconfig_32.c:34: error: invalid use of undefined type
> > 'struct acpi_mcfg_allocation' arch/x86/pci/mmconfig_32.c:34: error:
> > dereferencing pointer to incomplete type
> > arch/x86/pci/mmconfig_32.c:35: error: dereferencing pointer to
> > incomplete type arch/x86/pci/mmconfig_32.c:36: error: dereferencing
> > pointer to incomplete type arch/x86/pci/mmconfig_32.c:37: error:
> > dereferencing pointer to incomplete type
> > arch/x86/pci/mmconfig_32.c:38: error: dereferencing pointer to
> > incomplete type
> >
> > config is attached.
> Hi Randy,
>
> Thanks for the catch. Could you try the following patch? thanks!
Works for me. Thanks.
> - Feng
>
> diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
> index 25a0d9f..e89bf33 100644
> --- a/arch/x86/pci/mmconfig-shared.c
> +++ b/arch/x86/pci/mmconfig-shared.c
> @@ -557,15 +557,15 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
> i -= sizeof(struct acpi_mcfg_allocation);
> };
> if (pci_mmcfg_config_num == 0) {
> - printk(KERN_ERR PREFIX "MMCONFIG has no entries\n");
> + printk(KERN_ERR "PCI: MMCONFIG has no entries\n");
> return -ENODEV;
> }
>
> config_size = pci_mmcfg_config_num * sizeof(*pci_mmcfg_config);
> pci_mmcfg_config = kmalloc(config_size, GFP_KERNEL);
> if (!pci_mmcfg_config) {
> - printk(KERN_WARNING PREFIX
> - "No memory for MCFG config tables\n");
> + printk(KERN_WARNING
> + "PCI: No memory for MCFG config tables\n");
> return -ENOMEM;
> }
>
> @@ -576,8 +576,8 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)
> for (i = 0; i < pci_mmcfg_config_num; ++i) {
> if ((pci_mmcfg_config[i].address > 0xFFFFFFFF) &&
> !acpi_mcfg_64bit_base_addr) {
> - printk(KERN_ERR PREFIX
> - "MMCONFIG not in low 4GB of memory\n");
> + printk(KERN_ERR
> + "PCI: MMCONFIG not in low 4GB of memory\n");
> kfree(pci_mmcfg_config);
> pci_mmcfg_config_num = 0;
> return -ENODEV;
> @@ -609,7 +609,9 @@ static void __init __pci_mmcfg_init(int early)
> if (!known_bridge)
> x86_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg);
>
> +#ifdef CONFIG_ACPI
> pci_mmcfg_reject_broken(early);
> +#endif
>
> if ((pci_mmcfg_config_num == 0) ||
> (pci_mmcfg_config == NULL) ||
> diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
> index 8b2d561..f10a7e9 100644
> --- a/arch/x86/pci/mmconfig_32.c
> +++ b/arch/x86/pci/mmconfig_32.c
> @@ -11,9 +11,9 @@
>
> #include <linux/pci.h>
> #include <linux/init.h>
> -#include <linux/acpi.h>
> #include <asm/e820.h>
> #include <asm/pci_x86.h>
> +#include <acpi/acpi.h>
>
> /* Assume systems with more busses have correct MCFG */
> #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
> diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
> index 356d0a2..3c645bb 100644
> --- a/include/linux/sfi_acpi.h
> +++ b/include/linux/sfi_acpi.h
> @@ -50,8 +50,10 @@ extern int sfi_acpi_table_parse(char *signature, char *oem_id,
> static inline int x86_table_parse(char *signature,
> int (*handler)(struct acpi_table_header *))
> {
> +#ifdef CONFIG_ACPI
> if (!acpi_table_parse(signature, handler))
> return 0;
> +#endif
>
> return sfi_acpi_table_parse(signature, NULL, NULL, handler);
> }
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* Re: linux-next: Tree for July 23
From: Kamalesh Babulal @ 2009-07-23 16:25 UTC (permalink / raw)
To: gregkh; +Cc: Stephen Rothwell, devel, linux-next, LKML
In-Reply-To: <20090723163201.6951a44b.sfr@canb.auug.org.au>
Hi Greg,
next-20090723 randconfig build breaks at
drivers/staging/android/lowmemorykiller.c: In function '__check_cost':
drivers/staging/android/lowmemorykiller.c:60: error: 'lowmem_shrinker' undeclared (first use in this function)
drivers/staging/android/lowmemorykiller.c:60: error: (Each undeclared identifier is reported only once
drivers/staging/android/lowmemorykiller.c:60: error: for each function it appears in.)
drivers/staging/android/lowmemorykiller.c: At top level:
drivers/staging/android/lowmemorykiller.c:60: error: 'lowmem_shrinker' undeclared here (not in a function)
drivers/staging/android/lowmemorykiller.c:60: warning: type defaults to 'int' in declaration of 'type name'
make[3]: *** [drivers/staging/android/lowmemorykiller.o] Error 1
make[2]: *** [drivers/staging/android] Error 2
make[1]: *** [drivers/staging] Error 2
I have tested the patch for the build failure only.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
--- linux/drivers/staging/android/lowmemorykiller.c 2009-07-23 12:15:59.000000000 -0400
+++ linux/drivers/staging/android/~lowmemorykiller.c 2009-07-23 12:17:46.000000000 -0400
@@ -57,13 +57,6 @@ static int lowmem_minfree_size = 4;
printk(x); \
} while (0)
-module_param_named(cost, lowmem_shrinker.seeks, int, S_IRUGO | S_IWUSR);
-module_param_array_named(adj, lowmem_adj, int, &lowmem_adj_size,
- S_IRUGO | S_IWUSR);
-module_param_array_named(minfree, lowmem_minfree, uint, &lowmem_minfree_size,
- S_IRUGO | S_IWUSR);
-module_param_named(debug_level, lowmem_debug_level, uint, S_IRUGO | S_IWUSR);
-
static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
{
struct task_struct *p;
@@ -155,6 +148,13 @@ static struct shrinker lowmem_shrinker =
.seeks = DEFAULT_SEEKS * 16
};
+module_param_named(cost, lowmem_shrinker.seeks, int, S_IRUGO | S_IWUSR);
+module_param_array_named(adj, lowmem_adj, int, &lowmem_adj_size,
+ S_IRUGO | S_IWUSR);
+module_param_array_named(minfree, lowmem_minfree, uint, &lowmem_minfree_size,
+ S_IRUGO | S_IWUSR);
+module_param_named(debug_level, lowmem_debug_level, uint, S_IRUGO | S_IWUSR);
+
static int __init lowmem_init(void)
{
register_shrinker(&lowmem_shrinker);
Kamalesh
^ permalink raw reply
* Re: linux-next: manual merge of the sound tree with the davinci tree
From: Kevin Hilman @ 2009-07-23 17:54 UTC (permalink / raw)
To: Takashi Iwai
Cc: Stephen Rothwell, linux-next, linux-kernel, Chaithrika U S,
Pavel Kiryukhin, Naresh Medisetty, Steve Chen, Mark Brown,
Sudhakar Rajashekhara
In-Reply-To: <s5hvdlkvsk6.wl%tiwai@suse.de>
Takashi Iwai <tiwai@suse.de> writes:
> At Thu, 23 Jul 2009 11:21:10 +1000,
> Stephen Rothwell wrote:
>>
>> Hi Takashi,
>>
>> Today's linux-next merge of the sound tree got a conflict in
>> sound/soc/davinci/davinci-evm.c between commit
>> 95d0d986d09ac25a5b9f2bf28f289ab0823e86d5 ("davinci: EDMA: multiple CCs,
>> channel mapping and API changes") from the davinci tree and commit
>> 04f80f5c486b39446af44e218dba90ec210d61ca ("ASoC: Add machine driver
>> support for DM646x") from the sound tree.
>>
>> The latter removes the code modified by the former. I have just used the
>> latter.
>
> Thanks. I'll try to resolve the conflict in the sound tree,
> e.g. pulling the affecting commit of davinci tree into for-next
> branch.
I've taken care of this in the DaVinci for-next branch.
I dropped the davinci changes that change code that were then dropped
by the asoc changes.
Kevin
^ permalink raw reply
* Re: linux-next: manual merge of the v4l-dvb tree with the davinci tree
From: Kevin Hilman @ 2009-07-23 22:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mauro Carvalho Chehab, linux-next, linux-kernel, Chaithrika U S,
Manjunath Hadli, Brijesh Jadav, Hemant Pedanekar
In-Reply-To: <20090723101121.d21a575d.sfr@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> arch/arm/mach-davinci/board-dm646x-evm.c between commits
> e94c101ce3ef11bc00f8ea5db4b65c4b01874cf8 ("davinci: ASoC: Add the
> platform devices for ASP") and 4d6c5c3ec7c9b6d0d055da77c406049f7a663a0c
> ("davinci: dm646x-evm: Add support for IDE") from the davinci tree and
> commit be45110fa4525939a32c0509229a1781c5c3da78 ("arch/arm/mach-davinci:
> Platform and board specific setup for DM646x EVM") from the v4l-dvb tree.
>
> I think that these are just overlapping additions (though they my
> actually be implementing similar things). I fixed it up (see below) and
> can carry the fixes as necessary.
I can confirm that these are just overlapping additions.
Kevin
(davinci platform maintainer)
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-davinci/board-dm646x-evm.c
> index b1bf18c,eb4bd01..0000000
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@@ -259,35 -220,40 +272,69 @@@ static struct at24_platform_data eeprom
> .context = (void *)0x7f00,
> };
>
> +static u8 dm646x_iis_serializer_direction[] = {
> + TX_MODE, RX_MODE, INACTIVE_MODE, INACTIVE_MODE,
> +};
> +
> +static u8 dm646x_dit_serializer_direction[] = {
> + TX_MODE,
> +};
> +
> +static struct snd_platform_data dm646x_evm_snd_data[] = {
> + {
> + .tx_dma_offset = 0x400,
> + .rx_dma_offset = 0x400,
> + .op_mode = DAVINCI_MCASP_IIS_MODE,
> + .num_serializer = ARRAY_SIZE(dm646x_iis_serializer_direction),
> + .tdm_slots = 2,
> + .serial_dir = dm646x_iis_serializer_direction,
> + .eventq_no = EVENTQ_0,
> + },
> + {
> + .tx_dma_offset = 0x400,
> + .rx_dma_offset = 0,
> + .op_mode = DAVINCI_MCASP_DIT_MODE,
> + .num_serializer = ARRAY_SIZE(dm646x_dit_serializer_direction),
> + .tdm_slots = 32,
> + .serial_dir = dm646x_dit_serializer_direction,
> + .eventq_no = EVENTQ_0,
> + },
> +};
> +
> + static struct i2c_client *cpld_client;
> +
> + static int cpld_video_probe(struct i2c_client *client,
> + const struct i2c_device_id *id)
> + {
> + cpld_client = client;
> + return 0;
> + }
> +
> + static int __devexit cpld_video_remove(struct i2c_client *client)
> + {
> + cpld_client = NULL;
> + return 0;
> + }
> +
> + static const struct i2c_device_id cpld_video_id[] = {
> + { "cpld_video", 0 },
> + { }
> + };
> +
> + static struct i2c_driver cpld_video_driver = {
> + .driver = {
> + .name = "cpld_video",
> + },
> + .probe = cpld_video_probe,
> + .remove = cpld_video_remove,
> + .id_table = cpld_video_id,
> + };
> +
> + static void evm_init_cpld(void)
> + {
> + i2c_add_driver(&cpld_video_driver);
> + }
> +
> static struct i2c_board_info __initdata i2c_info[] = {
> {
> I2C_BOARD_INFO("24c256", 0x50),
> @@@ -298,8 -264,8 +345,11 @@@
> .platform_data = &pcf_data,
> },
> {
> + I2C_BOARD_INFO("cpld_reg0", 0x3a),
> + },
> ++ {
> + I2C_BOARD_INFO("cpld_video", 0x3B),
> + },
> };
>
> static struct davinci_i2c_platform_data i2c_pdata = {
> @@@ -310,8 -346,8 +430,9 @@@ static struct vpif_config dm646x_vpif_c
> static void __init evm_init_i2c(void)
> {
> davinci_init_i2c(&i2c_pdata);
> + i2c_add_driver(&dm6467evm_cpld_driver);
> i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
> + evm_init_cpld();
> }
>
> static void __init davinci_map_io(void)
^ permalink raw reply
* Re: linux-next: manual merge of the v4l-dvb tree with the davinci tree
From: Kevin Hilman @ 2009-07-23 22:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mauro Carvalho Chehab, linux-next, linux-kernel,
Muralidharan Karicheri, Chaithrika U S, Naresh Medisetty
In-Reply-To: <20090723101113.ed6fc12c.sfr@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> arch/arm/mach-davinci/dm355.c between commit
> e94c101ce3ef11bc00f8ea5db4b65c4b01874cf8 ("davinci: ASoC: Add the
> platform devices for ASP") from the davinci tree and commit
> 32a01291c576c302d82a985d91db720dcf8c891b ("V4L/DVB: DM355 platform
> changes for vpfe capture driver") from the v4l-dvb tree.
>
> I assume that these are orthogonal changes (though they may not be). I
> fixed it up (see below) and can carry the fixes as necessary.
I can confirm these are overlapping changes.
Kevin
(davinci platform maintainer)
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-davinci/dm355.c
> index 3abeb3e,2696df1..0000000
> --- a/arch/arm/mach-davinci/dm355.c
> +++ b/arch/arm/mach-davinci/dm355.c
> @@@ -628,31 -612,67 +636,92 @@@ static struct platform_device dm355_edm
> .resource = edma_resources,
> };
>
> +static struct resource dm355_asp1_resources[] = {
> + {
> + .start = DAVINCI_ASP1_BASE,
> + .end = DAVINCI_ASP1_BASE + SZ_8K - 1,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = DAVINCI_DMA_ASP1_TX,
> + .end = DAVINCI_DMA_ASP1_TX,
> + .flags = IORESOURCE_DMA,
> + },
> + {
> + .start = DAVINCI_DMA_ASP1_RX,
> + .end = DAVINCI_DMA_ASP1_RX,
> + .flags = IORESOURCE_DMA,
> + },
> +};
> +
> +static struct platform_device dm355_asp1_device = {
> + .name = "davinci-asp",
> + .id = 1,
> + .num_resources = ARRAY_SIZE(dm355_asp1_resources),
> + .resource = dm355_asp1_resources,
> +};
> +
> + static struct resource dm355_vpss_resources[] = {
> + {
> + /* VPSS BL Base address */
> + .name = "vpss",
> + .start = 0x01c70800,
> + .end = 0x01c70800 + 0xff,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + /* VPSS CLK Base address */
> + .name = "vpss",
> + .start = 0x01c70000,
> + .end = 0x01c70000 + 0xf,
> + .flags = IORESOURCE_MEM,
> + },
> + };
> +
> + static struct platform_device dm355_vpss_device = {
> + .name = "vpss",
> + .id = -1,
> + .dev.platform_data = "dm355_vpss",
> + .num_resources = ARRAY_SIZE(dm355_vpss_resources),
> + .resource = dm355_vpss_resources,
> + };
> +
> + static struct resource vpfe_resources[] = {
> + {
> + .start = IRQ_VDINT0,
> + .end = IRQ_VDINT0,
> + .flags = IORESOURCE_IRQ,
> + },
> + {
> + .start = IRQ_VDINT1,
> + .end = IRQ_VDINT1,
> + .flags = IORESOURCE_IRQ,
> + },
> + /* CCDC Base address */
> + {
> + .flags = IORESOURCE_MEM,
> + .start = 0x01c70600,
> + .end = 0x01c70600 + 0x1ff,
> + },
> + };
> +
> + static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32);
> + static struct platform_device vpfe_capture_dev = {
> + .name = CAPTURE_DRV_NAME,
> + .id = -1,
> + .num_resources = ARRAY_SIZE(vpfe_resources),
> + .resource = vpfe_resources,
> + .dev = {
> + .dma_mask = &vpfe_capture_dma_mask,
> + .coherent_dma_mask = DMA_BIT_MASK(32),
> + },
> + };
> +
> + void dm355_set_vpfe_config(struct vpfe_config *cfg)
> + {
> + vpfe_capture_dev.dev.platform_data = cfg;
> + }
> +
> /*----------------------------------------------------------------------*/
>
> static struct map_desc dm355_io_desc[] = {
^ permalink raw reply
* Re: linux-next: manual merge of the sound tree with the davinci tree
From: Takashi Iwai @ 2009-07-23 23:10 UTC (permalink / raw)
To: Kevin Hilman
Cc: Stephen Rothwell, linux-next, linux-kernel, Chaithrika U S,
Pavel Kiryukhin, Naresh Medisetty, Steve Chen, Mark Brown,
Sudhakar Rajashekhara
In-Reply-To: <873a8ni8t7.fsf@deeprootsystems.com>
At Thu, 23 Jul 2009 10:54:44 -0700,
Kevin Hilman wrote:
>
> Takashi Iwai <tiwai@suse.de> writes:
>
> > At Thu, 23 Jul 2009 11:21:10 +1000,
> > Stephen Rothwell wrote:
> >>
> >> Hi Takashi,
> >>
> >> Today's linux-next merge of the sound tree got a conflict in
> >> sound/soc/davinci/davinci-evm.c between commit
> >> 95d0d986d09ac25a5b9f2bf28f289ab0823e86d5 ("davinci: EDMA: multiple CCs,
> >> channel mapping and API changes") from the davinci tree and commit
> >> 04f80f5c486b39446af44e218dba90ec210d61ca ("ASoC: Add machine driver
> >> support for DM646x") from the sound tree.
> >>
> >> The latter removes the code modified by the former. I have just used the
> >> latter.
> >
> > Thanks. I'll try to resolve the conflict in the sound tree,
> > e.g. pulling the affecting commit of davinci tree into for-next
> > branch.
>
> I've taken care of this in the DaVinci for-next branch.
>
> I dropped the davinci changes that change code that were then dropped
> by the asoc changes.
Ah, great. Then I revert a fix merge in my for-next branch and keep
only pure ASoC things.
Thanks!
Takashi
^ permalink raw reply
* Re: linux-next: manual merge of the sound tree with the davinci tree
From: Stephen Rothwell @ 2009-07-24 0:38 UTC (permalink / raw)
To: Kevin Hilman
Cc: Takashi Iwai, linux-next, linux-kernel, Chaithrika U S,
Pavel Kiryukhin, Naresh Medisetty, Steve Chen, Mark Brown,
Sudhakar Rajashekhara
In-Reply-To: <873a8ni8t7.fsf@deeprootsystems.com>
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
Hi Kevin,
On Thu, 23 Jul 2009 10:54:44 -0700 Kevin Hilman <khilman@deeprootsystems.com> wrote:
>
> I've taken care of this in the DaVinci for-next branch.
>
> I dropped the davinci changes that change code that were then dropped
> by the asoc changes.
Thanks.
--
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 v4l-dvb tree with the davinci tree
From: Stephen Rothwell @ 2009-07-24 0:56 UTC (permalink / raw)
To: Kevin Hilman
Cc: Mauro Carvalho Chehab, linux-next, linux-kernel, Chaithrika U S,
Manjunath Hadli, Brijesh Jadav, Hemant Pedanekar
In-Reply-To: <87d47rhwy2.fsf@deeprootsystems.com>
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
Hi Kevin,
On Thu, 23 Jul 2009 15:11:01 -0700 Kevin Hilman <khilman@deeprootsystems.com> wrote:
>
> I can confirm that these are just overlapping additions.
Thanks.
--
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 sound tree with the davinci tree
From: Stephen Rothwell @ 2009-07-24 1:12 UTC (permalink / raw)
To: Takashi Iwai
Cc: Kevin Hilman, linux-next, linux-kernel, Chaithrika U S,
Pavel Kiryukhin, Naresh Medisetty, Steve Chen, Mark Brown,
Sudhakar Rajashekhara
In-Reply-To: <s5h7hxzngg5.wl%tiwai@suse.de>
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
Hi Takashi, Kevin,
On Fri, 24 Jul 2009 01:10:50 +0200 Takashi Iwai <tiwai@suse.de> wrote:
>
> At Thu, 23 Jul 2009 10:54:44 -0700,
> Kevin Hilman wrote:
> >
> > I've taken care of this in the DaVinci for-next branch.
> >
> > I dropped the davinci changes that change code that were then dropped
> > by the asoc changes.
>
> Ah, great. Then I revert a fix merge in my for-next branch and keep
> only pure ASoC things.
Thanks.
--
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
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