2016-03-23 01:51:43

by baiyaowei

Subject: [PATCH 1/2] x86/apic: remove declaration of unused hw_nmi_is_cpu_stuck

Commit 10f9014912 ("x86: Cleanup hw_nmi.c cruft") removed unused
code in the hw_nmi.c file because of the redesign of the hardlockup
watchdog but left declaration of hw_nmi_is_cpu_stuck in linux/nmi.h,
so remvoe it.

Signed-off-by: Yaowei Bai <[email protected]>
---
include/linux/nmi.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 7ec5b86..4630eea 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -65,7 +65,6 @@ static inline bool trigger_allbutself_cpu_backtrace(void)
#endif

#ifdef CONFIG_LOCKUP_DETECTOR
-int hw_nmi_is_cpu_stuck(struct pt_regs *);
u64 hw_nmi_get_sample_period(int watchdog_thresh);
extern int nmi_watchdog_enabled;
extern int soft_watchdog_enabled;
--
1.9.1

2016-03-23 01:42:41

by baiyaowei

Subject: [PATCH 2/2] x86/dma: is_device_dma_capable can be boolean

This patch makes is_device_dma_capable return bool to improve
readability due to this particular function only using either
one or zero as its return value.

No functional change.

Signed-off-by: Yaowei Bai <[email protected]>
---
include/linux/dma-mapping.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 5e45cf9..175c20f 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -81,7 +81,7 @@ static inline int valid_dma_direction(int dma_direction)
(dma_direction == DMA_FROM_DEVICE));
}

-static inline int is_device_dma_capable(struct device *dev)
+static inline bool is_device_dma_capable(struct device *dev)
{
return dev->dma_mask != NULL && *dev->dma_mask != DMA_MASK_NONE;
}
--
1.9.1

2016-03-23 11:40:14

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/urgent] x86/apic: Remove declaration of unused hw_nmi_is_cpu_stuck

Commit-ID: f09e3f4fe42caad0c0f59c1489d2b3f512c070b5
Gitweb: http://git.kernel.org/tip/f09e3f4fe42caad0c0f59c1489d2b3f512c070b5
Author: Yaowei Bai <[email protected]>
AuthorDate: Wed, 23 Mar 2016 09:40:09 +0800
Committer: Thomas Gleixner <[email protected]>
CommitDate: Wed, 23 Mar 2016 12:34:17 +0100

x86/apic: Remove declaration of unused hw_nmi_is_cpu_stuck

Commit 10f9014912 ("x86: Cleanup hw_nmi.c cruft") removed unused
code in the hw_nmi.c file because of the redesign of the hardlockup
watchdog but left declaration of hw_nmi_is_cpu_stuck in linux/nmi.h,
so remvoe it.

Signed-off-by: Yaowei Bai <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>

---
include/linux/nmi.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 7ec5b86..4630eea 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -65,7 +65,6 @@ static inline bool trigger_allbutself_cpu_backtrace(void)
#endif

#ifdef CONFIG_LOCKUP_DETECTOR
-int hw_nmi_is_cpu_stuck(struct pt_regs *);
u64 hw_nmi_get_sample_period(int watchdog_thresh);
extern int nmi_watchdog_enabled;
extern int soft_watchdog_enabled;