diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/lru_cache.h | 4 | ||||
-rw-r--r-- | include/linux/vgaarb.h | 4 | ||||
-rw-r--r-- | include/linux/watchdog.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h index 7a71ffad037c..cafc7f99e124 100644 --- a/include/linux/lru_cache.h +++ b/include/linux/lru_cache.h | |||
@@ -52,8 +52,8 @@ We replicate IO (more or less synchronously) to local and remote disk. | |||
52 | 52 | ||
53 | For crash recovery after replication node failure, | 53 | For crash recovery after replication node failure, |
54 | we need to resync all regions that have been target of in-flight WRITE IO | 54 | we need to resync all regions that have been target of in-flight WRITE IO |
55 | (in use, or "hot", regions), as we don't know wether or not those WRITEs have | 55 | (in use, or "hot", regions), as we don't know whether or not those WRITEs |
56 | made it to stable storage. | 56 | have made it to stable storage. |
57 | 57 | ||
58 | To avoid a "full resync", we need to persistently track these regions. | 58 | To avoid a "full resync", we need to persistently track these regions. |
59 | 59 | ||
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 0ee42d9acdc0..2c02f3a8d2ba 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h | |||
@@ -78,7 +78,7 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev, | |||
78 | * This function acquires VGA resources for the given | 78 | * This function acquires VGA resources for the given |
79 | * card and mark those resources locked. If the resource requested | 79 | * card and mark those resources locked. If the resource requested |
80 | * are "normal" (and not legacy) resources, the arbiter will first check | 80 | * are "normal" (and not legacy) resources, the arbiter will first check |
81 | * wether the card is doing legacy decoding for that type of resource. If | 81 | * whether the card is doing legacy decoding for that type of resource. If |
82 | * yes, the lock is "converted" into a legacy resource lock. | 82 | * yes, the lock is "converted" into a legacy resource lock. |
83 | * The arbiter will first look for all VGA cards that might conflict | 83 | * The arbiter will first look for all VGA cards that might conflict |
84 | * and disable their IOs and/or Memory access, including VGA forwarding | 84 | * and disable their IOs and/or Memory access, including VGA forwarding |
@@ -89,7 +89,7 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev, | |||
89 | * This function will block if some conflicting card is already locking | 89 | * This function will block if some conflicting card is already locking |
90 | * one of the required resources (or any resource on a different bus | 90 | * one of the required resources (or any resource on a different bus |
91 | * segment, since P2P bridges don't differenciate VGA memory and IO | 91 | * segment, since P2P bridges don't differenciate VGA memory and IO |
92 | * afaik). You can indicate wether this blocking should be interruptible | 92 | * afaik). You can indicate whether this blocking should be interruptible |
93 | * by a signal (for userland interface) or not. | 93 | * by a signal (for userland interface) or not. |
94 | * Must not be called at interrupt time or in atomic context. | 94 | * Must not be called at interrupt time or in atomic context. |
95 | * If the card already owns the resources, the function succeeds. | 95 | * If the card already owns the resources, the function succeeds. |
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index b7f45d48b2de..87490ac4bd87 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h | |||
@@ -105,7 +105,7 @@ struct watchdog_device { | |||
105 | #define WATCHDOG_NOWAYOUT_INIT_STATUS 0 | 105 | #define WATCHDOG_NOWAYOUT_INIT_STATUS 0 |
106 | #endif | 106 | #endif |
107 | 107 | ||
108 | /* Use the following function to check wether or not the watchdog is active */ | 108 | /* Use the following function to check whether or not the watchdog is active */ |
109 | static inline bool watchdog_active(struct watchdog_device *wdd) | 109 | static inline bool watchdog_active(struct watchdog_device *wdd) |
110 | { | 110 | { |
111 | return test_bit(WDOG_ACTIVE, &wdd->status); | 111 | return test_bit(WDOG_ACTIVE, &wdd->status); |