[PATCH] x86: fix HPET compiler error when not using CONFIG_PCI_MSI

[PATCH] x86: fix HPET compiler error when not using CONFIG_PCI_MSI

[Steven Noonan]

Added dummy function for hpet_setup_msi_irq().

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
---
 arch/x86/kernel/hpet.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 01005ae..422c577 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -635,6 +635,10 @@ static int hpet_cpuhp_notify(struct notifier_block *n,
 }
 #else
 
+static int hpet_setup_msi_irq(unsigned int irq)
+{
+	return 0;
+}
 void hpet_msi_capability_lookup(unsigned int start_timer)
 {
 	return;
-- 
1.6.0.1

[PATCH] init/initramfs.c: unused function when compiling without CONFIG_BLK_DEV_RAM

[Steven Noonan]

Fixing compiler warning when the kernel isn't compiled with support
for RAM block devices enabled.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
---
 init/initramfs.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/init/initramfs.c b/init/initramfs.c
index da8d030..2f056e2 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -512,6 +512,7 @@ skip:
 	initrd_end = 0;
 }
 
+#ifdef CONFIG_BLK_DEV_RAM
 #define BUF_SIZE 1024
 static void __init clean_rootfs(void)
 {
@@ -558,6 +559,7 @@ static void __init clean_rootfs(void)
 	sys_close(fd);
 	kfree(buf);
 }
+#endif
 
 static int __init populate_rootfs(void)
 {
-- 
1.6.0.1

[PATCH] x86: unused variable in dma_alloc_coherent_gfp_flags()

[Steven Noonan]

Fixed a warning caused by a badly placed ifdef.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
---
 include/asm-x86/dma-mapping.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index a072ae6..8bb3108 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -255,9 +255,9 @@ static inline unsigned long dma_alloc_coherent_mask(struct device *dev,
 
 static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)
 {
+#ifdef CONFIG_X86_64
 	unsigned long dma_mask = dma_alloc_coherent_mask(dev, gfp);
 
-#ifdef CONFIG_X86_64
 	if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))
 		gfp |= GFP_DMA32;
 #endif
-- 
1.6.0.1

Re: [PATCH] x86: unused variable in dma_alloc_coherent_gfp_flags()

[Ingo Molnar]

* Steven Noonan <steven@uplinklabs.net> wrote:

> Fixed a warning caused by a badly placed ifdef.
> 
> Signed-off-by: Steven Noonan <steven@uplinklabs.net>

applied to tip/x86/iommu - thanks Steven,

	Ingo

Re: [PATCH] x86: unused variable in dma_alloc_coherent_gfp_flags()

[FUJITA Tomonori]

On Tue, 9 Sep 2008 08:57:36 +0200
Ingo Molnar <mingo@elte.hu> wrote:

> 
> * Steven Noonan <steven@uplinklabs.net> wrote:
> 
> > Fixed a warning caused by a badly placed ifdef.
> > 
> > Signed-off-by: Steven Noonan <steven@uplinklabs.net>
> 
> applied to tip/x86/iommu - thanks Steven,

Did you apply the same patch yesterday?

http://lkml.org/lkml/2008/9/8/274

Re: [PATCH] x86: unused variable in dma_alloc_coherent_gfp_flags()

[Ingo Molnar]

* FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> wrote:

> On Tue, 9 Sep 2008 08:57:36 +0200
> Ingo Molnar <mingo@elte.hu> wrote:
> 
> > 
> > * Steven Noonan <steven@uplinklabs.net> wrote:
> > 
> > > Fixed a warning caused by a badly placed ifdef.
> > > 
> > > Signed-off-by: Steven Noonan <steven@uplinklabs.net>
> > 
> > applied to tip/x86/iommu - thanks Steven,
> 
> Did you apply the same patch yesterday?
> 
> http://lkml.org/lkml/2008/9/8/274

yes, but i havent pushed it out in time yesterday night. In such 
scenarios i generally zap the patch i generated and replace it with the 
fix that is being sent against the last publicly available tree. That is 
what happened here too. This makes it all symmetric and fair (i as a 
maintainer have no time advantage to get fixes in first) and it also 
teaches me to push out fixes faster :-)

	Ingo

Re: [PATCH] init/initramfs.c: unused function when compiling without CONFIG_BLK_DEV_RAM

[Ingo Molnar]

* Steven Noonan <steven@uplinklabs.net> wrote:

> Fixing compiler warning when the kernel isn't compiled with support
> for RAM block devices enabled.
> 
> Signed-off-by: Steven Noonan <steven@uplinklabs.net>

applied to tip/fastboot - thanks Steven!

	Ingo

Re: [PATCH] x86: fix HPET compiler error when not using CONFIG_PCI_MSI

[Ingo Molnar]

* Steven Noonan <steven@uplinklabs.net> wrote:

> Added dummy function for hpet_setup_msi_irq().
> 
> Signed-off-by: Steven Noonan <steven@uplinklabs.net>

applied to tip/timers/hpet-percpu - thanks Steven.

I'm wondering, what is the compiler error you got? I havent seen any in 
my testing.

	Ingo

Re: [PATCH] x86: fix HPET compiler error when not using CONFIG_PCI_MSI

[Steven Noonan]

On Tue, 9 Sep 2008, Ingo Molnar wrote:

> 
> I'm wondering, what is the compiler error you got? I havent seen any in 
> my testing.
> 
> 	Ingo
> 

Actually, it was technically a compiler warning and link error.

The compiler warning was "hpet_setup_msi_irq used but never defined", and 
then when trying to link, it threw the linker error "undefined reference 
to hpet_setup_msi_irq".

- Steven