[tip:x86/build] x86/build: Remove three unneeded genhdr-y entries

2016-11-27 Thread tip-bot for Paul Bolle 
Commit-ID:  9190e21780dfeff524a67c6e7b806c8a9d496086
Gitweb: http://git.kernel.org/tip/9190e21780dfeff524a67c6e7b806c8a9d496086
Author: Paul Bolle 
AuthorDate: Fri, 25 Nov 2016 13:41:47 +0100
Committer:  Ingo Molnar 
CommitDate: Mon, 28 Nov 2016 07:49:17 +0100

x86/build: Remove three unneeded genhdr-y entries

In x86's include/asm/Kbuild three entries are appended to the genhdr-y make
variable:

genhdr-y += unistd_32.h
genhdr-y += unistd_64.h
genhdr-y += unistd_x32.h

The same entries are also appended to that variable in
include/uapi/asm/Kbuild. So commit:

  10b63956fce7 ("UAPI: Plumb the UAPI Kbuilds into the user header installation 
and checking")

... removed these three entries from include/asm/Kbuild. But, apparently, some
merge conflict resolution re-added them.

The net effect is, in short, that the genhdr-y make variable contains these
file names twice and, as a consequence, that the corresponding headers get
installed twice. And so the build prints:

  INSTALL usr/include/asm/ (65 files)

... while in reality only 62 files are installed in that directory.

Nothing breaks because of all that, but it's a good idea to finally remove
these unneeded entries nevertheless.

Signed-off-by: Paul Bolle 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1480077707-2837-1-git-send-email-pebo...@tiscali.nl
Signed-off-by: Ingo Molnar 
---
 arch/x86/include/asm/Kbuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index 2cfed17..2b892e2 100644
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -6,10 +6,6 @@ generated-y += unistd_32_ia32.h
 generated-y += unistd_64_x32.h
 generated-y += xen-hypercalls.h
 
-genhdr-y += unistd_32.h
-genhdr-y += unistd_64.h
-genhdr-y += unistd_x32.h
-
 generic-y += clkdev.h
 generic-y += cputime.h
 generic-y += dma-contiguous.h

[tip:x86/build] x86/build: Don't use $(LINUXINCLUDE) twice

2016-11-27 Thread tip-bot for Paul Bolle 
Commit-ID:  06cbbac0f57d947656a12c30a0a69d4cf0ac6dea
Gitweb: http://git.kernel.org/tip/06cbbac0f57d947656a12c30a0a69d4cf0ac6dea
Author: Paul Bolle 
AuthorDate: Fri, 25 Nov 2016 13:38:34 +0100
Committer:  Ingo Molnar 
CommitDate: Mon, 28 Nov 2016 07:49:17 +0100

x86/build: Don't use $(LINUXINCLUDE) twice

The make variable KBUILD_CFLAGS contains $(LINUXINCLUDE). But the build
already picks up $(LINUXINCLUDE) from scripts/Makefile.lib. The net effect
is that the (long) list of include directories is used twice.

This is harmless but pointless. So stop using $(LINUXINCLUDE) twice.

Signed-off-by: Paul Bolle 
Cc: Linus Torvalds 
Cc: Masahiro Yamada 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1480077514-2586-1-git-send-email-pebo...@tiscali.nl
Signed-off-by: Ingo Molnar 
---
 arch/x86/realmode/rm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
index 25012ab..4463fa7 100644
--- a/arch/x86/realmode/rm/Makefile
+++ b/arch/x86/realmode/rm/Makefile
@@ -69,7 +69,7 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
 
 # ---
 
-KBUILD_CFLAGS  := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
+KBUILD_CFLAGS  := $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
   -I$(srctree)/arch/x86/boot
 KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
 GCOV_PROFILE := n

[tip:x86/boot] x86/boot/build: Remove always empty $(USERINCLUDE)

2016-11-07 Thread tip-bot for Paul Bolle 
Commit-ID:  0acba3f91823a5e53a54af5dc31fc774b0e64e99
Gitweb: http://git.kernel.org/tip/0acba3f91823a5e53a54af5dc31fc774b0e64e99
Author: Paul Bolle 
AuthorDate: Thu, 3 Nov 2016 10:47:48 +0100
Committer:  Ingo Molnar 
CommitDate: Mon, 7 Nov 2016 07:30:01 +0100

x86/boot/build: Remove always empty $(USERINCLUDE)

Commmit b6eea87fc685:

  ("x86, boot: Explicitly include autoconf.h for hostprogs")

correctly noted:

[...] that because $(USERINCLUDE) isn't exported by
the top-level Makefile it's actually empty in arch/x86/boot/Makefile.

So let's do the sane thing and remove the reference to that make variable.

Signed-off-by: Paul Bolle 
Reviewed-by: Matt Fleming 
Cc: David Howells 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1478166468-9760-1-git-send-email-pebo...@tiscali.nl
Signed-off-by: Ingo Molnar 
---
 arch/x86/boot/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 12ea8f8..0d810fb 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -65,7 +65,7 @@ clean-files += cpustr.h
 
 # ---
 
-KBUILD_CFLAGS  := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
+KBUILD_CFLAGS  := $(REALMODE_CFLAGS) -D_SETUP
 KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
 GCOV_PROFILE := n
 UBSAN_SANITIZE := n

[tip:x86/asm] x86/decoder: Use stderr if insn sanity test fails

2016-10-25 Thread tip-bot for Paul Bolle 
Commit-ID:  bb12d6740f6de393927362f23f833a79d85df384
Gitweb: http://git.kernel.org/tip/bb12d6740f6de393927362f23f833a79d85df384
Author: Paul Bolle 
AuthorDate: Tue, 25 Oct 2016 22:56:05 +0200
Committer:  Ingo Molnar 
CommitDate: Wed, 26 Oct 2016 08:41:06 +0200

x86/decoder: Use stderr if insn sanity test fails

If the instruction sanity test fails, it prints a "Failure" message to
stdout. Make this program behave like the rest of the build and print
that message to stderr.

Signed-off-by: Paul Bolle 
Cc: Andrew Morton 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1477428965-20548-3-git-send-email-pebo...@tiscali.nl
Signed-off-by: Ingo Molnar 
---
 arch/x86/tools/insn_sanity.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/tools/insn_sanity.c b/arch/x86/tools/insn_sanity.c
index ba70ff2..1972565 100644
--- a/arch/x86/tools/insn_sanity.c
+++ b/arch/x86/tools/insn_sanity.c
@@ -269,7 +269,8 @@ int main(int argc, char **argv)
insns++;
}
 
-   fprintf(stdout, "%s: %s: decoded and checked %d %s instructions with %d 
errors (seed:0x%x)\n",
+   fprintf((errors) ? stderr : stdout,
+   "%s: %s: decoded and checked %d %s instructions with %d errors 
(seed:0x%x)\n",
prog,
(errors) ? "Failure" : "Success",
insns,

[tip:x86/asm] x86/decoder: Use stdout if insn decoder test is successful

2016-10-25 Thread tip-bot for Paul Bolle 
Commit-ID:  bdcc18b548b8f1fab23c097724c6f32daac03185
Gitweb: http://git.kernel.org/tip/bdcc18b548b8f1fab23c097724c6f32daac03185
Author: Paul Bolle 
AuthorDate: Tue, 25 Oct 2016 22:56:04 +0200
Committer:  Ingo Molnar 
CommitDate: Wed, 26 Oct 2016 08:41:06 +0200

x86/decoder: Use stdout if insn decoder test is successful

If the instruction decoder test ran successful it prints a message like
this to stderr:
Succeed: decoded and checked 1767380 instructions

But, as described in "console mode programming user interface guidelines
version 101" which doesn't exist, programs should use stderr for errors
or warnings. We're told about a successful run here, so the instruction
decoder test should use stdout.

Let's fix the typo too, while we're at it.

Signed-off-by: Paul Bolle 
Cc: Andrew Morton 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1477428965-20548-2-git-send-email-pebo...@tiscali.nl
Signed-off-by: Ingo Molnar 
---
 arch/x86/tools/test_get_len.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/tools/test_get_len.c b/arch/x86/tools/test_get_len.c
index 56f04db..ecf31e0 100644
--- a/arch/x86/tools/test_get_len.c
+++ b/arch/x86/tools/test_get_len.c
@@ -167,7 +167,7 @@ int main(int argc, char **argv)
fprintf(stderr, "Warning: decoded and checked %d"
" instructions with %d warnings\n", insns, warnings);
else
-   fprintf(stderr, "Succeed: decoded and checked %d"
+   fprintf(stdout, "Success: decoded and checked %d"
" instructions\n", insns);
return 0;
 }

[tip:x86/cleanups] lguest: Read offset of device_cap later

2016-06-10 Thread tip-bot for Paul Bolle 
Commit-ID:  cf2cf0f50c14e86e04cda2c684357eed77922666
Gitweb: http://git.kernel.org/tip/cf2cf0f50c14e86e04cda2c684357eed77922666
Author: Paul Bolle 
AuthorDate: Thu, 3 Mar 2016 13:01:41 +0100
Committer:  Thomas Gleixner 
CommitDate: Fri, 10 Jun 2016 11:39:09 +0200

lguest: Read offset of device_cap later

Read the offset of the capability with type VIRTIO_PCI_CAP_DEVICE_CFG
only when we're sure we're going to need it. Which is when all checks
have passed and we know we have a virtio console with an emerg_wr field.

Signed-off-by: Paul Bolle 
Cc: Rusty Russell 
Cc: lgu...@lists.ozlabs.org
Link: 
http://lkml.kernel.org/r/1457006501-5377-3-git-send-email-pebo...@tiscali.nl
Signed-off-by: Thomas Gleixner 

---
 arch/x86/lguest/boot.c | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 146d11c..25da5bc8 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1233,8 +1233,6 @@ static void write_bar_via_cfg(u32 cfg_offset, u32 off, 
u32 val)
 static void probe_pci_console(void)
 {
u8 cap, common_cap = 0, device_cap = 0;
-   /* Offset within BAR0 */
-   u32 device_offset;
u32 device_len;
 
/* Avoid recursive printk into here. */
@@ -1258,21 +1256,16 @@ static void probe_pci_console(void)
u8 vndr = read_pci_config_byte(0, 1, 0, cap);
if (vndr == PCI_CAP_ID_VNDR) {
u8 type, bar;
-   u32 offset;
 
type = read_pci_config_byte(0, 1, 0,
cap + offsetof(struct virtio_pci_cap, cfg_type));
bar = read_pci_config_byte(0, 1, 0,
cap + offsetof(struct virtio_pci_cap, bar));
-   offset = read_pci_config(0, 1, 0,
-   cap + offsetof(struct virtio_pci_cap, offset));
 
switch (type) {
case VIRTIO_PCI_CAP_DEVICE_CFG:
-   if (bar == 0) {
+   if (bar == 0)
device_cap = cap;
-   device_offset = offset;
-   }
break;
case VIRTIO_PCI_CAP_PCI_CFG:
console_access_cap = cap;
@@ -1302,7 +1295,8 @@ static void probe_pci_console(void)
return;
}
 
-   console_cfg_offset = device_offset;
+   console_cfg_offset = read_pci_config(0, 1, 0,
+   device_cap + offsetof(struct virtio_pci_cap, offset));
printk(KERN_INFO "lguest: Console via virtio-pci emerg_wr\n");
 }

[tip:x86/cleanups] lguest: Read length of device_cap later

2016-06-10 Thread tip-bot for Paul Bolle 
Commit-ID:  7faf90ef995ea470f32f43810266ece8ac8ba6c7
Gitweb: http://git.kernel.org/tip/7faf90ef995ea470f32f43810266ece8ac8ba6c7
Author: Paul Bolle 
AuthorDate: Thu, 3 Mar 2016 13:01:40 +0100
Committer:  Thomas Gleixner 
CommitDate: Fri, 10 Jun 2016 11:39:09 +0200

lguest: Read length of device_cap later

Read the length of the capability with type VIRTIO_PCI_CAP_DEVICE_CFG
only when we're sure we're going to need it. Which is just before the
check whether the virtio console actually has an emerg_wr field.

Signed-off-by: Paul Bolle 
Cc: Rusty Russell 
Cc: lgu...@lists.ozlabs.org
Link: 
http://lkml.kernel.org/r/1457006501-5377-2-git-send-email-pebo...@tiscali.nl
Signed-off-by: Thomas Gleixner 

---
 arch/x86/lguest/boot.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 3847e73..146d11c 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1258,7 +1258,7 @@ static void probe_pci_console(void)
u8 vndr = read_pci_config_byte(0, 1, 0, cap);
if (vndr == PCI_CAP_ID_VNDR) {
u8 type, bar;
-   u32 offset, length;
+   u32 offset;
 
type = read_pci_config_byte(0, 1, 0,
cap + offsetof(struct virtio_pci_cap, cfg_type));
@@ -1266,15 +1266,12 @@ static void probe_pci_console(void)
cap + offsetof(struct virtio_pci_cap, bar));
offset = read_pci_config(0, 1, 0,
cap + offsetof(struct virtio_pci_cap, offset));
-   length = read_pci_config(0, 1, 0,
-   cap + offsetof(struct virtio_pci_cap, length));
 
switch (type) {
case VIRTIO_PCI_CAP_DEVICE_CFG:
if (bar == 0) {
device_cap = cap;
device_offset = offset;
-   device_len = length;
}
break;
case VIRTIO_PCI_CAP_PCI_CFG:
@@ -1297,6 +1294,8 @@ static void probe_pci_console(void)
 * emerg_wr.  If it doesn't support VIRTIO_CONSOLE_F_EMERG_WRITE
 * it should ignore the access.
 */
+   device_len = read_pci_config(0, 1, 0,
+   device_cap + offsetof(struct virtio_pci_cap, length));
if (device_len < (offsetof(struct virtio_console_config, emerg_wr)
  + sizeof(u32))) {
printk(KERN_ERR "lguest: console missing emerg_wr field\n");

[tip:x86/urgent] x86: Remove unused variable "polling"

2014-07-16 Thread tip-bot for Paul Bolle 
Commit-ID:  d3f44fbabe55132832e152606365adb640296378
Gitweb: http://git.kernel.org/tip/d3f44fbabe55132832e152606365adb640296378
Author: Paul Bolle 
AuthorDate: Mon, 30 Jun 2014 16:32:29 +0200
Committer:  Ingo Molnar 
CommitDate: Wed, 16 Jul 2014 12:58:47 +0200

x86: Remove unused variable "polling"

Compile tested. "polling" is unused since commit f80c5b39b80a
("sched/idle, x86: Switch from TS_POLLING to TIF_POLLING_NRFLAG").

Signed-off-by: Paul Bolle 
Signed-off-by: Peter Zijlstra 
Cc: Jiri Kosina 
Link: http://lkml.kernel.org/r/1404138749.2978.6.camel@x41
Signed-off-by: Ingo Molnar 
---
 arch/x86/kernel/apm_32.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index f3a1f04..5848744 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -841,7 +841,6 @@ static int apm_do_idle(void)
u32 eax;
u8 ret = 0;
int idled = 0;
-   int polling;
int err = 0;
 
if (!need_resched()) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:x86/cleanups] x86/mce: Remove check for CONFIG_X86_MCE_P4THERMAL

2013-05-31 Thread tip-bot for Paul Bolle 
Commit-ID:  71c69f7f4b67150e10cdfcad217d464f1821b3c6
Gitweb: http://git.kernel.org/tip/71c69f7f4b67150e10cdfcad217d464f1821b3c6
Author: Paul Bolle 
AuthorDate: Wed, 29 May 2013 20:57:30 +0200
Committer:  Ingo Molnar 
CommitDate: Fri, 31 May 2013 13:12:35 +0200

x86/mce: Remove check for CONFIG_X86_MCE_P4THERMAL

The Kconfig symbol X86_MCE_P4THERMAL was removed in v2.6.32.
Remove a useless check for its macro, as it will now always
evaluate to false.

Signed-off-by: Paul Bolle 
Link: http://lkml.kernel.org/r/1369853850.23034.28.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar 
---
 arch/x86/kernel/apic/apic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 904611b..1600b1c 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2302,7 +2302,7 @@ static void lapic_resume(void)
apic_write(APIC_SPIV, apic_pm_state.apic_spiv);
apic_write(APIC_LVT0, apic_pm_state.apic_lvt0);
apic_write(APIC_LVT1, apic_pm_state.apic_lvt1);
-#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)
+#if defined(CONFIG_X86_MCE_INTEL)
if (maxlvt >= 5)
apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr);
 #endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:core/locking] locking: Fix copy/paste errors of " ARCH_INLINE_*_UNLOCK_BH"

2013-05-28 Thread tip-bot for Paul Bolle 
Commit-ID:  4eedb77a9cd8f2e68b31c8b9a20524a50727c16f
Gitweb: http://git.kernel.org/tip/4eedb77a9cd8f2e68b31c8b9a20524a50727c16f
Author: Paul Bolle 
AuthorDate: Fri, 17 May 2013 10:51:33 +0200
Committer:  Ingo Molnar 
CommitDate: Tue, 28 May 2013 08:50:00 +0200

locking: Fix copy/paste errors of "ARCH_INLINE_*_UNLOCK_BH"

The Kconfig symbols ARCH_INLINE_READ_UNLOCK_IRQ,
ARCH_INLINE_SPIN_UNLOCK_IRQ, and ARCH_INLINE_WRITE_UNLOCK_IRQ were added
in v2.6.33, but have never actually been used. Ingo Molnar spotted that
this is caused by three identical copy/paste erros. Eg, the Kconfig
entry for

INLINE_READ_UNLOCK_IRQ

has an (optional) dependency on:

ARCH_INLINE_READ_UNLOCK_BH

were it apparently should depend on:

ARCH_INLINE_READ_UNLOCK_IRQ

instead. Likewise for the Kconfig entries for INLINE_SPIN_UNLOCK_IRQ and
INLINE_WRITE_UNLOCK_IRQ. Fix these three errors.

This never really caused any real problems as these symbols are set (or
unset) in a group - but it's worth fixing it nevertheless.

Reported-by: Ingo Molnar 
Signed-off-by: Paul Bolle 
Signed-off-by: Peter Zijlstra 
Link: http://lkml.kernel.org/r/1368780693.1350.228.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar 
---
 kernel/Kconfig.locks | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
index 44511d1..d2b32ac 100644
--- a/kernel/Kconfig.locks
+++ b/kernel/Kconfig.locks
@@ -138,7 +138,7 @@ config INLINE_SPIN_UNLOCK_BH
 
 config INLINE_SPIN_UNLOCK_IRQ
def_bool y
-   depends on !PREEMPT || ARCH_INLINE_SPIN_UNLOCK_BH
+   depends on !PREEMPT || ARCH_INLINE_SPIN_UNLOCK_IRQ
 
 config INLINE_SPIN_UNLOCK_IRQRESTORE
def_bool y
@@ -175,7 +175,7 @@ config INLINE_READ_UNLOCK_BH
 
 config INLINE_READ_UNLOCK_IRQ
def_bool y
-   depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_BH
+   depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_IRQ
 
 config INLINE_READ_UNLOCK_IRQRESTORE
def_bool y
@@ -212,7 +212,7 @@ config INLINE_WRITE_UNLOCK_BH
 
 config INLINE_WRITE_UNLOCK_IRQ
def_bool y
-   depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK_BH
+   depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK_IRQ
 
 config INLINE_WRITE_UNLOCK_IRQRESTORE
def_bool y
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:x86/mm] x86/mm/fixmap: Remove unused FIX_CYCLONE_TIMER

2013-04-14 Thread tip-bot for Paul Bolle 
Commit-ID:  a7e6567585e513cb4e44387831cb75eb5b562cbb
Gitweb: http://git.kernel.org/tip/a7e6567585e513cb4e44387831cb75eb5b562cbb
Author: Paul Bolle 
AuthorDate: Thu, 11 Apr 2013 18:49:42 +0200
Committer:  Ingo Molnar 
CommitDate: Fri, 12 Apr 2013 07:21:18 +0200

x86/mm/fixmap: Remove unused FIX_CYCLONE_TIMER

The last users of FIX_CYCLONE_TIMER were removed in v2.6.18. We
can remove this unneeded constant.

Signed-off-by: Paul Bolle 
Link: http://lkml.kernel.org/r/1365698982.1427.3.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar 
---
 arch/x86/include/asm/fixmap.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index a09c285..83ea2fb 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -107,9 +107,6 @@ enum fixed_addresses {
 #ifdef CONFIG_X86_F00F_BUG
FIX_F00F_IDT,   /* Virtual mapping for IDT */
 #endif
-#ifdef CONFIG_X86_CYCLONE_TIMER
-   FIX_CYCLONE_TIMER, /*cyclone timer register*/
-#endif
 #ifdef CONFIG_X86_32
FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:x86/mm] x86/mm: Re-enable DEBUG_TLBFLUSH for X86_32

2013-04-10 Thread tip-bot for Paul Bolle 
Commit-ID:  cd69aa6b383c6a6373bff2204190cadf451ebcc3
Gitweb: http://git.kernel.org/tip/cd69aa6b383c6a6373bff2204190cadf451ebcc3
Author: Paul Bolle 
AuthorDate: Thu, 14 Mar 2013 12:54:37 +0100
Committer:  Ingo Molnar 
CommitDate: Wed, 10 Apr 2013 14:53:12 +0200

x86/mm: Re-enable DEBUG_TLBFLUSH for X86_32

CONFIG_INVLPG got removed in commit
094ab1db7cb7833cd4c820acd868fc26acf3f08e ("x86, 386 removal:
Remove CONFIG_INVLPG").

That commit left one instance of CONFIG_INVLPG untouched, effectively
disabling DEBUG_TLBFLUSH for X86_32. Since all currently supported
x86 CPUs should now be able to support that option, just drop the entire
sub-dependency.

Signed-off-by: Paul Bolle 
Link: http://lkml.kernel.org/r/1363262077.1335.71.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar 
---
 arch/x86/Kconfig.debug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index b322f12..16f7383 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -131,7 +131,7 @@ config DOUBLEFAULT
 
 config DEBUG_TLBFLUSH
bool "Set upper limit of TLB entries to flush one-by-one"
-   depends on DEBUG_KERNEL && (X86_64 || X86_INVLPG)
+   depends on DEBUG_KERNEL
---help---
 
X86-only for now.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:smp/hotplug] idle: Remove unused ARCH_HAS_DEFAULT_IDLE

2013-04-10 Thread tip-bot for Paul Bolle 
Commit-ID:  781b0e870c72be8a24c074073547e74e7b9bffd6
Gitweb: http://git.kernel.org/tip/781b0e870c72be8a24c074073547e74e7b9bffd6
Author: Paul Bolle 
AuthorDate: Thu, 21 Mar 2013 13:41:23 +0100
Committer:  Ingo Molnar 
CommitDate: Wed, 10 Apr 2013 14:40:46 +0200

idle: Remove unused ARCH_HAS_DEFAULT_IDLE

The Kconfig symbol ARCH_HAS_DEFAULT_IDLE is unused. Commit
a0bfa1373859e9d11dc92561a8667588803e42d8 ("cpuidle: stop
depending on pm_idle") removed the only place were it was
actually used. But it did not remove its Kconfig entries (for sh
and x86). Remove those two entries now.

Signed-off-by: Paul Bolle 
Cc: Len Brown 
Cc: Paul Mundt 
Link: http://lkml.kernel.org/r/1363869683.1390.134.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar 
---
 arch/sh/Kconfig  | 3 ---
 arch/x86/Kconfig | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 853cbc9..0917fc3 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -150,9 +150,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
def_bool n
 
-config ARCH_HAS_DEFAULT_IDLE
-   def_bool y
-
 config NO_IOPORT
def_bool !PCI
depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 422a72b..734152d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -189,9 +189,6 @@ config GENERIC_CALIBRATE_DELAY
 config ARCH_HAS_CPU_RELAX
def_bool y
 
-config ARCH_HAS_DEFAULT_IDLE
-   def_bool y
-
 config ARCH_HAS_CACHE_LINE_SIZE
def_bool y
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:core/locking] lockdep: Silence warning if CONFIG_LOCKDEP isn 't set

2013-02-22 Thread tip-bot for Paul Bolle 
Commit-ID:  5cd3f5affad2109fd1458aab3f6216f2181e26ea
Gitweb: http://git.kernel.org/tip/5cd3f5affad2109fd1458aab3f6216f2181e26ea
Author: Paul Bolle 
AuthorDate: Thu, 24 Jan 2013 21:53:17 +0100
Committer:  Ingo Molnar 
CommitDate: Tue, 19 Feb 2013 08:42:41 +0100

lockdep: Silence warning if CONFIG_LOCKDEP isn't set

Since commit c9a4962881929df7f1ef6e63e1b9da304faca4dd ("nfsd:
make client_lock per net") compiling nfs4state.o without
CONFIG_LOCKDEP set, triggers this GCC warning:

fs/nfsd/nfs4state.c: In function ‘free_client’:
fs/nfsd/nfs4state.c:1051:19: warning: unused variable ‘nn’ 
[-Wunused-variable]

The cause of that warning is that lockdep_assert_held() compiles
away if CONFIG_LOCKDEP is not set. Silence this warning by using
the argument to lockdep_assert_held() as a nop if CONFIG_LOCKDEP
is not set.

Signed-off-by: Paul Bolle 
Cc: Peter Zijlstra 
Cc: Stanislav Kinsbursky 
Cc: J. Bruce Fields 
Link: http://lkml.kernel.org/r/1359060797.1325.33.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar 
--
 include/linux/lockdep.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
 include/linux/lockdep.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 2bca44b..f05631e 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -410,7 +410,7 @@ struct lock_class_key { };
 
 #define lockdep_depth(tsk) (0)
 
-#define lockdep_assert_held(l) do { } while (0)
+#define lockdep_assert_held(l) do { (void)(l); } while (0)
 
 #define lockdep_recursing(tsk) (0)
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:core/locking] lockdep: Silence warning if CONFIG_LOCKDEP isn 't set

2013-01-25 Thread tip-bot for Paul Bolle 
Commit-ID:  61b48fd031db92de6fe74ebba4bc3799bd55c3fa
Gitweb: http://git.kernel.org/tip/61b48fd031db92de6fe74ebba4bc3799bd55c3fa
Author: Paul Bolle 
AuthorDate: Thu, 24 Jan 2013 21:53:17 +0100
Committer:  Ingo Molnar 
CommitDate: Fri, 25 Jan 2013 08:43:57 +0100

lockdep: Silence warning if CONFIG_LOCKDEP isn't set

Since commit c9a4962881929df7f1ef6e63e1b9da304faca4dd ("nfsd:
make client_lock per net") compiling nfs4state.o without
CONFIG_LOCKDEP set, triggers this GCC warning:

fs/nfsd/nfs4state.c: In function ‘free_client’:
fs/nfsd/nfs4state.c:1051:19: warning: unused variable ‘nn’ 
[-Wunused-variable]

The cause of that warning is that lockdep_assert_held() compiles
away if CONFIG_LOCKDEP is not set. Silence this warning by using
the argument to lockdep_assert_held() as a nop if CONFIG_LOCKDEP
is not set.

Signed-off-by: Paul Bolle 
Cc: Peter Zijlstra 
Cc: Stanislav Kinsbursky 
Cc: J. Bruce Fields 
Link: http://lkml.kernel.org/r/1359060797.1325.33.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar 
--
 include/linux/lockdep.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
 include/linux/lockdep.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 2bca44b..f05631e 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -410,7 +410,7 @@ struct lock_class_key { };
 
 #define lockdep_depth(tsk) (0)
 
-#define lockdep_assert_held(l) do { } while (0)
+#define lockdep_assert_held(l) do { (void)(l); } while (0)
 
 #define lockdep_recursing(tsk) (0)
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:x86/cleanups] x86, boot: Remove obsolete and unused constant RAMDISK

2012-08-20 Thread tip-bot for Paul Bolle 
Commit-ID:  0570a365a6b8ccbfe7baa459de2b7396ddf2de90
Gitweb: http://git.kernel.org/tip/0570a365a6b8ccbfe7baa459de2b7396ddf2de90
Author: Paul Bolle 
AuthorDate: Sun, 19 Aug 2012 19:06:43 +0200
Committer:  H. Peter Anvin 
CommitDate: Mon, 20 Aug 2012 11:34:48 -0700

x86, boot: Remove obsolete and unused constant RAMDISK

The named constant RAMDISK is unused. It used to set the (obsolete)
kernel boot header field ram_size, but its usage for that purpose got
dropped in commit 5e47c478b0b69bc9bc3ba544e4b1ca3268f98fef ("x86: remove
zImage support"). Now remove this constant too.

Signed-off-by: Paul Bolle 
Link: http://lkml.kernel.org/r/1345396003.1771.9.camel@x61.thuisdomein
Signed-off-by: H. Peter Anvin 
---
 arch/x86/boot/header.S |4 
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index b4e15dd..2a01744 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -32,10 +32,6 @@ SYSSEG   = 0x1000/* historical 
load address >> 4 */
 #define SVGA_MODE ASK_VGA
 #endif
 
-#ifndef RAMDISK
-#define RAMDISK 0
-#endif
-
 #ifndef ROOT_RDONLY
 #define ROOT_RDONLY 1
 #endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/