forked fromtorvalds/linux
- Notifications
You must be signed in to change notification settings - Fork1
Commit0e06fb5
committed
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 Kconfig fixes from Thomas Gleixner: "Three patchlets to correct HIGHMEM64G and CMPXCHG64 dependencies in Kconfig when CPU selections are explicitely set to M586 or M686"* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/Kconfig: Explicitly enumerate i686-class CPUs in Kconfig x86/Kconfig: Exclude i586-class CPUs lacking PAE support from the HIGHMEM64G Kconfig group x86/Kconfig: Add missing i586-class CPUs to the X86_CMPXCHG64 Kconfig group2 files changed
+3
-3
lines changedOriginal file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1404 | 1404 |
| |
1405 | 1405 |
| |
1406 | 1406 |
| |
1407 |
| - | |
| 1407 | + | |
1408 | 1408 |
| |
1409 | 1409 |
| |
1410 | 1410 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
374 | 374 |
| |
375 | 375 |
| |
376 | 376 |
| |
377 |
| - | |
| 377 | + | |
378 | 378 |
| |
379 | 379 |
| |
380 | 380 |
| |
| |||
385 | 385 |
| |
386 | 386 |
| |
387 | 387 |
| |
388 |
| - | |
| 388 | + | |
389 | 389 |
| |
390 | 390 |
| |
391 | 391 |
| |
|
0 commit comments
Comments
(0)