Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / Documentation / ia64 / err_inject.txt

diff --git a/Documentation/ia64/err_inject.txt b/Documentation/ia64/err_inject.txt
index 26487c172cfccb1d9733e372f2c08e1caf50d0bb..223e4f0582d018254e692b8e83d809fe77dbc400 100644 (file)
--- a/Documentation/ia64/err_inject.txt
+++ b/Documentation/ia64/err_inject.txt
@@ -21,10 +21,10 @@ software test suits to do stressful testing on IPF.
 
 Below is a sample application as part of the whole tool. The sample
 can be used as a working test tool. Or it can be expanded to include
-more features. It also can be a integrated into a libary or other user
+more features. It also can be a integrated into a library or other user
 application to have more thorough test.
 
-The sample application takes err.conf as error configuation input. Gcc
+The sample application takes err.conf as error configuration input. GCC
 compiles the code. After you install err_inject driver, you can run
 this sample application to inject errors.
 
@@ -111,7 +111,7 @@ err_injection_tool.c:
 #define        ERR_DATA_BUFFER_SIZE    3       // Three 8-byte.
 #define PARA_FIELD_NUM         5
 #define MASK_SIZE              (NR_CPUS/64)
-#define PATH_FORMAT "/sys/devices/system/node/node0/cpu%d/err_inject/"
+#define PATH_FORMAT "/sys/devices/system/cpu/cpu%d/err_inject/"
 
 int sched_setaffinity(pid_t pid, unsigned int len, unsigned long *mask);
 
@@ -809,7 +809,7 @@ int err_inj()
        }
 
        /* Create semaphore: If one_lock, one semaphore for all processors.
-          Otherwise, one sempaphore for each processor. */
+          Otherwise, one semaphore for each processor. */
        if (one_lock) {
                if (create_sem(0)) {
                        printf("Can not create semaphore...exit\n");