diff --git a/ChangeLog b/ChangeLog
index b07decc96c..047fa62b22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-20  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/unix/sysv/linux/smp.h: Moved ...
+	* nptl/smp.h: ... here.
+
 	* nptl/sysdeps/unix/sysv/linux/rtld-lowlevel.h: File removed.
 
 	* include/libc-symbols.h (HAVE_CONFIG_H, STDC_HEADERS): New macros.
diff --git a/nptl/sysdeps/unix/sysv/linux/smp.h b/nptl/smp.h
similarity index 94%
rename from nptl/sysdeps/unix/sysv/linux/smp.h
rename to nptl/smp.h
index dda5c35d10..bd734b113a 100644
--- a/nptl/sysdeps/unix/sysv/linux/smp.h
+++ b/nptl/smp.h
@@ -1,4 +1,4 @@
-/* Determine whether the host has multiple processors.  Linux version.
+/* Determine whether the host has multiple processors.  Stub version.
    Copyright (C) 1996-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.