2.5.64(-ac1) UML broken

[Ro0tSiEgE LKML]

I get this when trying to build UML in 2.5.64-ac1 (tried both
with/without the patch from their site):

  Starting the build. KBUILD_BUILTIN=1 KBUILD_MODULES=
make -f scripts/Makefile.build obj=init
  gcc -Wp,-MD,init/.main.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
-pipe -mpreferred-stack-boundary=2  -Iinclude/asm-i386/mach-default
-fomit-frame-pointer -nostdinc -iwithprefix include   
-DKBUILD_BASENAME=main -DKBUILD_MODNAME=main -c -o init/main.o
init/main.c
In file included from include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:21,
                 from include/linux/spinlock.h:12,
                 from include/linux/mmzone.h:8,
                 from include/linux/gfp.h:4,
                 from include/linux/slab.h:14,
                 from include/linux/proc_fs.h:5,
                 from init/main.c:15:
include/asm/processor.h:65: `CONFIG_X86_L1_CACHE_SHIFT' undeclared here
(not in a function)
include/asm/processor.h:65: requested alignment is not a constant
In file included from include/linux/fs.h:17,
                 from include/linux/proc_fs.h:6,
                 from init/main.c:15:
include/linux/dcache.h:99: `CONFIG_X86_L1_CACHE_SHIFT' undeclared here
(not in a function)
include/linux/dcache.h:99: requested alignment is not a constant
In file included from include/linux/mm.h:197,
                 from include/linux/pagemap.h:7,
                 from include/linux/blkdev.h:10,
                 from include/linux/blk.h:4,
                 from init/main.c:26:
include/linux/page-flags.h:118: `CONFIG_X86_L1_CACHE_SHIFT' undeclared
here (not in a function)
include/linux/page-flags.h:118: requested alignment is not a constant
In file included from include/asm/hardirq.h:6,
                 from include/linux/interrupt.h:9,
                 from include/asm/highmem.h:24,
                 from include/linux/highmem.h:12,
                 from include/linux/pagemap.h:10,
                 from include/linux/blkdev.h:10,
                 from include/linux/blk.h:4,
                 from init/main.c:26:
include/linux/irq.h:65: `CONFIG_X86_L1_CACHE_SHIFT' undeclared here (not
in a function)
include/linux/irq.h:65: requested alignment is not a constant
In file included from include/linux/interrupt.h:9,
                 from include/asm/highmem.h:24,
                 from include/linux/highmem.h:12,
                 from include/linux/pagemap.h:10,
                 from include/linux/blkdev.h:10,
                 from include/linux/blk.h:4,
                 from init/main.c:26:
include/asm/hardirq.h:16: `CONFIG_X86_L1_CACHE_SHIFT' undeclared here
(not in a function)
include/asm/hardirq.h:16: requested alignment is not a constant
make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2