forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'driver-core-next' into Linux 3.2

Browse source 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2012-01-06 11:42:52 -08:00
commit ff4b8a57f0
518 changed files with 3167 additions and 6887 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/xen/balloon.h
View file

@ -29,11 +29,11 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages,
bool highmem);
void free_xenballooned_pages(int nr_pages, struct page **pages);
struct sys_device;
struct device;
#ifdef CONFIG_XEN_SELFBALLOONING
extern int register_xen_selfballooning(struct sys_device *sysdev);
extern int register_xen_selfballooning(struct device *dev);
#else
static inline int register_xen_selfballooning(struct sys_device *sysdev)
static inline int register_xen_selfballooning(struct device *dev)
{
return -ENOSYS;
}