diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 10 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 6fdb837d940..71f0fea1058 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -445,16 +445,6 @@ Who: Jan Kiszka <jan.kiszka@web.de> | |||
445 | 445 | ||
446 | ---------------------------- | 446 | ---------------------------- |
447 | 447 | ||
448 | What: xtime, wall_to_monotonic | ||
449 | When: 2.6.36+ | ||
450 | Files: kernel/time/timekeeping.c include/linux/time.h | ||
451 | Why: Cleaning up timekeeping internal values. Please use | ||
452 | existing timekeeping accessor functions to access | ||
453 | the equivalent functionality. | ||
454 | Who: John Stultz <johnstul@us.ibm.com> | ||
455 | |||
456 | ---------------------------- | ||
457 | |||
458 | What: KVM paravirt mmu host support | 448 | What: KVM paravirt mmu host support |
459 | When: January 2011 | 449 | When: January 2011 |
460 | Why: The paravirt mmu host support is slower than non-paravirt mmu, both | 450 | Why: The paravirt mmu host support is slower than non-paravirt mmu, both |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index cbd40593052..71d286307ca 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -73,7 +73,6 @@ parameter is applicable: | |||
73 | MTD MTD (Memory Technology Device) support is enabled. | 73 | MTD MTD (Memory Technology Device) support is enabled. |
74 | NET Appropriate network support is enabled. | 74 | NET Appropriate network support is enabled. |
75 | NUMA NUMA support is enabled. | 75 | NUMA NUMA support is enabled. |
76 | GENERIC_TIME The generic timeofday code is enabled. | ||
77 | NFS Appropriate NFS support is enabled. | 76 | NFS Appropriate NFS support is enabled. |
78 | OSS OSS sound support is enabled. | 77 | OSS OSS sound support is enabled. |
79 | PV_OPS A paravirtualized kernel is enabled. | 78 | PV_OPS A paravirtualized kernel is enabled. |
@@ -470,7 +469,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
470 | clocksource is not available, it defaults to PIT. | 469 | clocksource is not available, it defaults to PIT. |
471 | Format: { pit | tsc | cyclone | pmtmr } | 470 | Format: { pit | tsc | cyclone | pmtmr } |
472 | 471 | ||
473 | clocksource= [GENERIC_TIME] Override the default clocksource | 472 | clocksource= Override the default clocksource |
474 | Format: <string> | 473 | Format: <string> |
475 | Override the default clocksource and use the clocksource | 474 | Override the default clocksource and use the clocksource |
476 | with the name specified. | 475 | with the name specified. |