Message-ID: <20160518135545.GA13773@www.outflux.net>
Date:	Wed, 18 May 2016 06:55:45 -0700
From:	Kees Cook <keescook@...omium.org>
To:	Jonathan Corbet <corbet@....net>
Cc:	Randy Dunlap <rdunlap@...radead.org>, linux-doc@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH] docs: fix "interruptible" misspellings

A common misspelling of "interruptible" is "interruptable". This fixes
them in the tree and adds the two most common variations to spelling.txt.

Suggested-by: Randy Dunlap <rdunlap@...radead.org>
Signed-off-by: Kees Cook <keescook@...omium.org>
---
 Documentation/hid/hiddev.txt          |  2 +-
 Documentation/scsi/ChangeLog.lpfc     |  2 +-
 Documentation/sysrq.txt               |  2 +-
 arch/arc/include/asm/irqflags-arcv2.h |  2 +-
 arch/x86/platform/uv/tlb_uv.c         |  2 +-
 drivers/firmware/qcom_scm-32.c        |  2 +-
 drivers/gpu/drm/radeon/radeon_fence.c | 12 ++++++------
 drivers/hid/Kconfig                   |  2 +-
 drivers/hid/usbhid/Kconfig            |  2 +-
 drivers/input/serio/hil_mlc.c         |  2 +-
 drivers/net/ethernet/amd/nmclan_cs.c  |  4 ++--
 drivers/scsi/aacraid/commsup.c        |  2 +-
 drivers/tty/serial/mux.c              |  2 +-
 fs/ecryptfs/miscdev.c                 |  2 +-
 mm/kmemleak.c                         |  2 +-
 scripts/spelling.txt                  |  2 ++
 sound/soc/intel/atom/sst/sst_pvt.c    |  2 +-
 17 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/Documentation/hid/hiddev.txt b/Documentation/hid/hiddev.txt
index 6e8c9f1d2f22..cf22e3aa5e01 100644
--- a/Documentation/hid/hiddev.txt
+++ b/Documentation/hid/hiddev.txt
@@ -5,7 +5,7 @@ INTRODUCTION
 In addition to the normal input type HID devices, USB also uses the
 human interface device protocols for things that are not really human
 interfaces, but have similar sorts of communication needs. The two big
-examples for this are power devices (especially uninterruptable power
+examples for this are power devices (especially uninterruptible power
 supplies) and monitor control on higher end monitors.
 
 To support these disparate requirements, the Linux USB system provides
diff --git a/Documentation/scsi/ChangeLog.lpfc b/Documentation/scsi/ChangeLog.lpfc
index 2f6d595f95e1..ca4b3fd40552 100644
--- a/Documentation/scsi/ChangeLog.lpfc
+++ b/Documentation/scsi/ChangeLog.lpfc
@@ -389,7 +389,7 @@ Changes from 20041220 to 20041229
 	  moved to kthread. kthread_stop() is not able to wake up thread
 	  waiting on a semaphore and "modprobe -r lpfc" is not always
 	  (most of the times) able to complete. Fix is in not using
-	  semaphore for the interruptable sleep.
+	  semaphore for the interruptible sleep.
 	* Small Makefile cleanup - Remove remnants of 2.4 vs. 2.6
 	  determination.
 
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index 13f5619b2203..c0cda0782d98 100644
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -116,7 +116,7 @@ On all -  write a character to /proc/sysrq-trigger.  e.g.:
 'v'	- Forcefully restores framebuffer console
 'v'	- Causes ETM buffer dump [ARM-specific]
 
-'w'	- Dumps tasks that are in uninterruptable (blocked) state.
+'w'	- Dumps tasks that are in uninterruptible (blocked) state.
 
 'x'	- Used by xmon interface on ppc/powerpc platforms.
           Show global PMU Registers on sparc64.
diff --git a/arch/arc/include/asm/irqflags-arcv2.h b/arch/arc/include/asm/irqflags-arcv2.h
index d1ec7f6b31e0..a411dfd95154 100644
--- a/arch/arc/include/asm/irqflags-arcv2.h
+++ b/arch/arc/include/asm/irqflags-arcv2.h
@@ -38,7 +38,7 @@
 #define AUX_IRQ_ACT_BIT_U	31
 
 /*
- * User space should be interruptable even by lowest prio interrupt
+ * User space should be interruptible even by lowest prio interrupt
  * Safe even if actual interrupt priorities is fewer or even one
  */
 #define ARCV2_IRQ_DEF_PRIO	15
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index fdb4d42b4ce5..1c584226ddf6 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1251,7 +1251,7 @@ void process_uv2_message(struct msg_desc *mdp, struct bau_control *bcp)
  *
  * All cores/threads on this hub get this interrupt.
  * The last one to see it does the software ack.
- * (the resource will not be freed until noninterruptable cpus see this
+ * (the resource will not be freed until noninterruptible cpus see this
  *  interrupt; hardware may timeout the s/w ack and reply ERROR)
  */
 void uv_bau_message_interrupt(struct pt_regs *regs)
diff --git a/drivers/firmware/qcom_scm-32.c b/drivers/firmware/qcom_scm-32.c
index 0883292f640f..e59000848917 100644
--- a/drivers/firmware/qcom_scm-32.c
+++ b/drivers/firmware/qcom_scm-32.c
@@ -317,7 +317,7 @@ out:
  * @arg1: first argument
  *
  * This shall only be used with commands that are guaranteed to be
- * uninterruptable, atomic and SMP safe.
+ * uninterruptible, atomic and SMP safe.
  */
 static s32 qcom_scm_call_atomic1(u32 svc, u32 cmd, u32 arg1)
 {
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 7ef075acde9c..0ef25679dcd8 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -471,12 +471,12 @@ static bool radeon_fence_any_seq_signaled(struct radeon_device *rdev, u64 *seq)
  *
  * @rdev: radeon device pointer
  * @target_seq: sequence number(s) we want to wait for
- * @intr: use interruptable sleep
+ * @intr: use interruptible sleep
  * @timeout: maximum time to wait, or MAX_SCHEDULE_TIMEOUT for infinite wait
  *
  * Wait for the requested sequence number(s) to be written by any ring
  * (all asics).  Sequnce number array is indexed by ring id.
- * @intr selects whether to use interruptable (true) or non-interruptable
+ * @intr selects whether to use interruptible (true) or non-interruptible
  * (false) sleep when waiting for the sequence number.  Helper function
  * for radeon_fence_wait_*().
  * Returns remaining time if the sequence number has passed, 0 when
@@ -533,7 +533,7 @@ static long radeon_fence_wait_seq_timeout(struct radeon_device *rdev,
  * @intr: use interruptible sleep
  *
  * Wait for the requested fence to signal (all asics).
- * @intr selects whether to use interruptable (true) or non-interruptable
+ * @intr selects whether to use interruptible (true) or non-interruptible
  * (false) sleep when waiting for the fence.
  * @timeout: maximum time to wait, or MAX_SCHEDULE_TIMEOUT for infinite wait
  * Returns remaining time if the sequence number has passed, 0 when
@@ -573,7 +573,7 @@ long radeon_fence_wait_timeout(struct radeon_fence *fence, bool intr, long timeo
  * @intr: use interruptible sleep
  *
  * Wait for the requested fence to signal (all asics).
- * @intr selects whether to use interruptable (true) or non-interruptable
+ * @intr selects whether to use interruptible (true) or non-interruptible
  * (false) sleep when waiting for the fence.
  * Returns 0 if the fence has passed, error for all other cases.
  */
@@ -592,11 +592,11 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr)
  *
  * @rdev: radeon device pointer
  * @fences: radeon fence object(s)
- * @intr: use interruptable sleep
+ * @intr: use interruptible sleep
  *
  * Wait for any requested fence to signal (all asics).  Fence
  * array is indexed by ring id.  @intr selects whether to use
- * interruptable (true) or non-interruptable (false) sleep when
+ * interruptible (true) or non-interruptible (false) sleep when
  * waiting for the fences. Used by the suballocator.
  * Returns 0 if any fence has passed, error for all other cases.
  */
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 5646ca4b95de..be02c2ccc757 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -41,7 +41,7 @@ config HIDRAW
 	---help---
 	Say Y here if you want to support HID devices (from the USB
 	specification standpoint) that aren't strictly user interface
-	devices, like monitor controls and Uninterruptable Power Supplies.
+	devices, like monitor controls and Uninterruptible Power Supplies.
 
 	This module supports these devices separately using a separate
 	event interface on /dev/hidraw.
diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig
index 0108c5991a04..cff755e69919 100644
--- a/drivers/hid/usbhid/Kconfig
+++ b/drivers/hid/usbhid/Kconfig
@@ -37,7 +37,7 @@ config USB_HIDDEV
 	help
 	  Say Y here if you want to support HID devices (from the USB
 	  specification standpoint) that aren't strictly user interface
-	  devices, like monitor controls and Uninterruptable Power Supplies.
+	  devices, like monitor controls and Uninterruptible Power Supplies.
 
 	  This module supports these devices separately using a separate
 	  event interface on /dev/usb/hiddevX (char 180:96 to 180:111).
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index 65605e4ef3cf..89f69e9410bc 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -893,7 +893,7 @@ static void hil_mlc_serio_close(struct serio *serio)
 
 	serio_set_drvdata(serio, NULL);
 	serio->drv = NULL;
-	/* TODO wake up interruptable */
+	/* TODO wake up interruptible */
 }
 
 static const struct serio_device_id hil_mlc_serio_id = {
diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index 2807e181647b..e039e35f3228 100644
--- a/drivers/net/ethernet/amd/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c
@@ -479,7 +479,7 @@ static void nmclan_detach(struct pcmcia_device *link)
 /* ----------------------------------------------------------------------------
 mace_read
 	Reads a MACE register.  This is bank independent; however, the
-	caller must ensure that this call is not interruptable.  We are
+	caller must ensure that this call is not interruptible.  We are
 	assuming that during normal operation, the MACE is always in
 	bank 0.
 ---------------------------------------------------------------------------- */
@@ -506,7 +506,7 @@ static int mace_read(mace_private *lp, unsigned int ioaddr, int reg)
 /* ----------------------------------------------------------------------------
 mace_write
 	Writes to a MACE register.  This is bank independent; however,
-	the caller must ensure that this call is not interruptable.  We
+	the caller must ensure that this call is not interruptible.  We
 	are assuming that during normal operation, the MACE is always in
 	bank 0.
 ---------------------------------------------------------------------------- */
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 511bbc575062..41716eafbb22 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -607,7 +607,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
 
 	if (wait) {
 		spin_unlock_irqrestore(&fibptr->event_lock, flags);
-		/* Only set for first known interruptable command */
+		/* Only set for first known interruptible command */
 		if (wait < 0) {
 			/*
 			 * *VERY* Dangerous to time out a command, the
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index 8a4be4b73723..51b9797e3b10 100644
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -490,7 +490,7 @@ static int __init mux_probe(struct parisc_device *dev)
 
 		/* The port->timeout needs to match what is present in
 		 * uart_wait_until_sent in serial_core.c.  Otherwise
-		 * the time spent in msleep_interruptable will be very
+		 * the time spent in msleep_interruptible will be very
 		 * long, causing the appearance of a console hang.
 		 */
 		port->timeout   = HZ / 50;
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
index e4141f257495..9c49f405cb25 100644
--- a/fs/ecryptfs/miscdev.c
+++ b/fs/ecryptfs/miscdev.c
@@ -265,7 +265,7 @@ check_list:
 	}
 	if (list_empty(&daemon->msg_ctx_out_queue)) {
 		/* Something else jumped in since the
-		 * wait_event_interruptable() and removed the
+		 * wait_event_interruptible() and removed the
 		 * message from the queue; try again */
 		goto check_list;
 	}
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index e6429926e957..aa2e3fb654ef 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1137,7 +1137,7 @@ static bool update_checksum(struct kmemleak_object *object)
 }
 
 /*
- * Memory scanning is a long process and it needs to be interruptable. This
+ * Memory scanning is a long process and it needs to be interruptible. This
  * function checks whether such interrupt condition occurred.
  */
 static int scan_should_stop(void)
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index 946caf3bd694..34de5e2908f6 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -548,6 +548,7 @@ interrface||interface
 interrrupt||interrupt
 interrup||interrupt
 interrups||interrupts
+interruptable||interruptible
 interruptted||interrupted
 interupted||interrupted
 interupt||interrupt
@@ -1013,6 +1014,7 @@ unexpectd||unexpected
 unexpeted||unexpected
 unfortunatelly||unfortunately
 unifiy||unify
+uninterruptable||uninterruptible
 unintialized||uninitialized
 unknonw||unknown
 unknow||unknown
diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c
index adb32fefd693..4ac6e53a127a 100644
--- a/sound/soc/intel/atom/sst/sst_pvt.c
+++ b/sound/soc/intel/atom/sst/sst_pvt.c
@@ -84,7 +84,7 @@ void sst_set_fw_state_locked(
  * @sst_drv_ctx: Driver context
  * @block: Driver block to wait on
  *
- * This function waits without a timeout (and is interruptable) for a
+ * This function waits without a timeout (and is interruptible) for a
  * given block event
  */
 int sst_wait_interruptible(struct intel_sst_drv *sst_drv_ctx,
-- 
2.6.3


-- 
Kees Cook
Chrome OS & Brillo Security

Powered by blists - more mailing lists