34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
|
References: bsc#969377 - xen does not build with GCC 6
|
||
|
|
|
||
|
|
--- xen-4.6.1-testing/xen/arch/x86/cpu/mcheck/non-fatal.c.orig 2016-03-04 15:59:08.000000000 -0700
|
||
|
|
+++ xen-4.6.1-testing/xen/arch/x86/cpu/mcheck/non-fatal.c 2016-03-04 16:00:25.000000000 -0700
|
||
|
|
@@ -94,8 +94,8 @@ static int __init init_nonfatal_mce_chec
|
||
|
|
if (mce_disabled || !mce_available(c))
|
||
|
|
return -ENODEV;
|
||
|
|
|
||
|
|
- if ( __get_cpu_var(poll_bankmask) == NULL )
|
||
|
|
- return -EINVAL;
|
||
|
|
+ if ( __get_cpu_var(poll_bankmask) == NULL )
|
||
|
|
+ return -EINVAL;
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Check for non-fatal errors every MCE_RATE s
|
||
|
|
--- xen-4.6.1-testing/extras/mini-os-remote/lib/sys.c.orig 2016-03-04 15:27:26.000000000 -0700
|
||
|
|
+++ xen-4.6.1-testing/extras/mini-os-remote/lib/sys.c 2016-03-04 15:30:32.000000000 -0700
|
||
|
|
@@ -634,6 +634,7 @@ int closedir(DIR *dir)
|
||
|
|
|
||
|
|
/* We assume that only the main thread calls select(). */
|
||
|
|
|
||
|
|
+#if defined(LIBC_VERBOSE) || defined(LIBC_DEBUG)
|
||
|
|
static const char file_types[] = {
|
||
|
|
[FTYPE_NONE] = 'N',
|
||
|
|
[FTYPE_CONSOLE] = 'C',
|
||
|
|
@@ -646,6 +647,7 @@ static const char file_types[] = {
|
||
|
|
[FTYPE_KBD] = 'K',
|
||
|
|
[FTYPE_FB] = 'G',
|
||
|
|
};
|
||
|
|
+#endif
|
||
|
|
#ifdef LIBC_DEBUG
|
||
|
|
static void dump_set(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout)
|
||
|
|
{
|