Merge branch 'akpm' (patches from Andrew)

54e514b9 · Linus Torvalds <[email protected]> · 2015-04-17 09:04:38 -04:00

Merge third patchbomb from Andrew Morton:

 - various misc things

 - a couple of lib/ optimisations

 - provide DIV_ROUND_CLOSEST_ULL()

 - checkpatch updates

 - rtc tree

 - befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs

 - ptrace fixes

 - fork() fixes

 - seccomp cleanups

 - more mmap_sem hold time reductions from Davidlohr

* emailed patches from Andrew Morton <[email protected]>: (138 commits)
  proc: show locks in /proc/pid/fdinfo/X
  docs: add missing and new /proc/PID/status file entries, fix typos
  drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
  Documentation/spi/spidev_test.c: fix warning
  drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
  .gitignore: ignore *.tar
  MAINTAINERS: add Mediatek SoC mailing list
  tomoyo: reduce mmap_sem hold for mm->exe_file
  powerpc/oprofile: reduce mmap_sem hold for exe_file
  oprofile: reduce mmap_sem hold for mm->exe_file
  mips: ip32: add platform data hooks to use DS1685 driver
  lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
  x86: switch to using asm-generic for seccomp.h
  sparc: switch to using asm-generic for seccomp.h
  powerpc: switch to using asm-generic for seccomp.h
  parisc: switch to using asm-generic for seccomp.h
  mips: switch to using asm-generic for seccomp.h
  microblaze: use asm-generic for seccomp.h
  arm: use asm-generic for seccomp.h
  seccomp: allow COMPAT sigreturn overrides
  ...

Commit: 54e514b91b95d6441c12a7955addfb9f9d2afc65
Parents: 4fc8adcf · 6c8c9031

Merge commit. Changes below are compared with the first parent: 4fc8adcf.

Changes

157 files changed · +2182 −1543

File	Status	Add	Del	Content
.gitignore	modified	+1	−0	View file
Documentation/CodingStyle	modified	+13	−0	View file
Documentation/SubmittingPatches	modified	+2	−2	View file
Documentation/devicetree/bindings/rtc/digicolor-rtc.txt	added	+17	−0	View file
Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt	modified	+5	−0	View file
Documentation/filesystems/proc.txt	modified	+12	−3	View file
Documentation/spi/spidev_test.c	modified	+2	−2	View file
Documentation/sysctl/kernel.txt	modified	+21	−0	View file
MAINTAINERS	modified	+2	−0	View file
arch/alpha/include/asm/processor.h	modified	+1	−0	View file
arch/arc/kernel/troubleshoot.c	modified	+1	−2	View file
arch/arm/include/asm/Kbuild	modified	+1	−0	View file
arch/arm/include/asm/seccomp.h	deleted	+0	−11	View before deletion
arch/microblaze/include/asm/seccomp.h	modified	+1	−7	View file
arch/mips/configs/ip32_defconfig	modified	+2	−1	View file
arch/mips/include/asm/mach-ip32/mc146818rtc.h	deleted	+0	−36	View before deletion
arch/mips/include/asm/seccomp.h	modified	+2	−5	View file
arch/mips/sgi-ip32/ip32-platform.c	modified	+39	−7	View file
arch/mips/sgi-ip32/ip32-reset.c	modified	+39	−92	View file
arch/parisc/include/asm/Kbuild	modified	+1	−0	View file
arch/parisc/include/asm/seccomp.h	deleted	+0	−16	View before deletion
arch/powerpc/include/uapi/asm/seccomp.h → arch/powerpc/include/asm/seccomp.h	renamed	+2	−8	View file
arch/powerpc/include/uapi/asm/Kbuild	modified	+0	−1	View file
arch/powerpc/oprofile/cell/spu_task_sync.c	modified	+8	−5	View file
arch/sparc/include/asm/seccomp.h	modified	+3	−8	View file
arch/x86/include/asm/seccomp.h	modified	+18	−3	View file
arch/x86/include/asm/seccomp_32.h	deleted	+0	−11	View before deletion
arch/x86/include/asm/seccomp_64.h	deleted	+0	−17	View before deletion
drivers/clk/bcm/clk-kona.c	modified	+7	−21	View file
drivers/clk/bcm/clk-kona.h	modified	+0	−1	View file
drivers/cpuidle/governors/menu.c	modified	+1	−7	View file
drivers/gpu/drm/i915/intel_drv.h	modified	+0	−3	View file
drivers/gpu/drm/i915/intel_panel.c	modified	+1	−0	View file
drivers/hwmon/ina2xx.c	modified	+3	−14	View file
drivers/hwmon/lm85.c	modified	+8	−18	View file
drivers/hwmon/w83795.c	modified	+3	−5	View file
drivers/media/dvb-frontends/cxd2820r_c.c	modified	+1	−1	View file
drivers/media/dvb-frontends/cxd2820r_core.c	modified	+0	−6	View file
drivers/media/dvb-frontends/cxd2820r_priv.h	modified	+0	−2	View file
drivers/media/dvb-frontends/cxd2820r_t.c	modified	+1	−1	View file
drivers/media/dvb-frontends/cxd2820r_t2.c	modified	+1	−1	View file
drivers/memstick/core/mspro_block.c	modified	+2	−1	View file
drivers/oprofile/buffer_sync.c	modified	+16	−14	View file
drivers/rtc/Kconfig	modified	+13	−3	View file
drivers/rtc/Makefile	modified	+1	−0	View file
drivers/rtc/class.c	modified	+3	−3	View file
drivers/rtc/hctosys.c	modified	+4	−2	View file
drivers/rtc/interface.c	modified	+3	−2	View file
drivers/rtc/rtc-ab-b5ze-s3.c	modified	+1	−1	View file
drivers/rtc/rtc-at91rm9200.c	modified	+2	−2	View file
drivers/rtc/rtc-cmos.c	modified	+4	−2	View file
drivers/rtc/rtc-da9052.c	modified	+76	−21	View file
drivers/rtc/rtc-digicolor.c	added	+227	−0	View file
drivers/rtc/rtc-ds1374.c	modified	+5	−3	View file
drivers/rtc/rtc-ds1685.c	modified	+5	−4	View file
drivers/rtc/rtc-ds3232.c	modified	+4	−2	View file
drivers/rtc/rtc-efi-platform.c	modified	+3	−0	View file
drivers/rtc/rtc-em3027.c	modified	+11	−0	View file
drivers/rtc/rtc-hym8563.c	modified	+6	−6	View file
drivers/rtc/rtc-m41t80.c	modified	+4	−2	View file
drivers/rtc/rtc-max77686.c	modified	+4	−2	View file
drivers/rtc/rtc-max8997.c	modified	+5	−3	View file
drivers/rtc/rtc-msm6242.c	modified	+3	−1	View file
drivers/rtc/rtc-omap.c	modified	+55	−13	View file
drivers/rtc/rtc-opal.c	modified	+2	−1	View file
drivers/rtc/rtc-pcf8563.c	modified	+1	−6	View file
drivers/rtc/rtc-s3c.c	modified	+53	−140	View file
drivers/rtc/rtc-s5m.c	modified	+28	−6	View file
drivers/rtc/rtc-stmp3xxx.c	modified	+60	−6	View file
drivers/rtc/rtc-twl.c	modified	+5	−4	View file
drivers/rtc/rtc-x1205.c	modified	+2	−2	View file
drivers/scsi/bfa/bfad.c	modified	+9	−13	View file
firmware/ihex2fw.c	modified	+1	−0	View file
fs/adfs/dir_fplus.c	modified	+1	−0	View file
fs/adfs/super.c	modified	+15	−5	View file
fs/affs/affs.h	modified	+16	−12	View file
fs/affs/amigaffs.c	modified	+2	−1	View file
fs/affs/file.c	modified	+1	−1	View file
fs/affs/inode.c	modified	+18	−14	View file
fs/affs/namei.c	modified	+4	−2	View file
fs/affs/super.c	modified	+24	−19	View file
fs/befs/befs.h	modified	+10	−12	View file
fs/befs/datastream.c	modified	+2	−2	View file
fs/befs/io.c	modified	+1	−1	View file
fs/befs/linuxvfs.c	modified	+8	−8	View file
fs/befs/super.c	modified	+2	−2	View file
fs/bfs/dir.c	modified	+2	−2	View file
fs/binfmt_misc.c	modified	+9	−21	View file
fs/exec.c	modified	+11	−1	View file
fs/fat/cache.c	modified	+0	−2	View file
fs/fat/dir.c	modified	+0	−4	View file
fs/fat/fat.h	modified	+1	−4	View file
fs/fat/fatent.c	modified	+0	−3	View file
fs/fat/file.c	modified	+0	−4	View file
fs/fat/inode.c	modified	+2	−11	View file
fs/fat/misc.c	modified	+0	−4	View file
fs/fat/namei_msdos.c	modified	+0	−2	View file
fs/fat/namei_vfat.c	modified	+0	−2	View file
fs/file.c	modified	+1	−2	View file
fs/hfs/dir.c	modified	+2	−2	View file
fs/hfsplus/bfind.c	modified	+1	−3	View file
fs/hfsplus/catalog.c	modified	+2	−1	View file
fs/hfsplus/dir.c	modified	+2	−2	View file
fs/hfsplus/inode.c	modified	+6	−0	View file
fs/hfsplus/ioctl.c	modified	+5	−7	View file
fs/hfsplus/xattr.c	modified	+61	−25	View file
fs/hfsplus/xattr.h	modified	+8	−14	View file
fs/hfsplus/xattr_security.c	modified	+6	−32	View file
fs/hfsplus/xattr_trusted.c	modified	+5	−32	View file
fs/hfsplus/xattr_user.c	modified	+4	−31	View file
fs/locks.c	modified	+38	−0	View file
fs/nilfs2/alloc.c	modified	+3	−2	View file
fs/nilfs2/bmap.c	modified	+37	−11	View file
fs/nilfs2/bmap.h	modified	+8	−5	View file
fs/nilfs2/btree.c	modified	+63	−0	View file
fs/nilfs2/cpfile.c	modified	+52	−6	View file
fs/nilfs2/direct.c	modified	+17	−0	View file
fs/nilfs2/inode.c	modified	+13	−12	View file
fs/nilfs2/mdt.c	modified	+54	−0	View file
fs/nilfs2/mdt.h	modified	+8	−2	View file
fs/nilfs2/page.c	modified	+10	−14	View file
fs/nilfs2/segment.c	modified	+8	−9	View file
fs/nilfs2/super.c	modified	+1	−1	View file
fs/proc/fd.c	modified	+17	−10	View file
include/asm-generic/seccomp.h	modified	+2	−0	View file
include/linux/bitmap.h	modified	+4	−4	View file
include/linux/bitops.h	modified	+2	−2	View file
include/linux/fs.h	modified	+8	−0	View file
include/linux/kconfig.h	modified	+7	−8	View file
include/linux/kernel.h	modified	+12	−0	View file
include/linux/mfd/samsung/rtc.h	modified	+2	−0	View file
include/linux/mm_types.h	modified	+1	−1	View file
include/linux/sysctl.h	modified	+3	−0	View file
include/linux/util_macros.h	added	+40	−0	View file
include/uapi/asm-generic/errno.h	modified	+10	−1	View file
init/main.c	modified	+2	−2	View file
kernel/fork.c	modified	+107	−34	View file
kernel/gcov/base.c	modified	+4	−1	View file
kernel/pid.c	modified	+8	−7	View file
kernel/ptrace.c	modified	+29	−10	View file
kernel/signal.c	modified	+5	−9	View file
kernel/sys.c	modified	+28	−19	View file
kernel/sysctl.c	modified	+11	−5	View file
lib/Kconfig	modified	+2	−3	View file
lib/Makefile	modified	+1	−1	View file
lib/bitmap.c	modified	+0	−30	View file
lib/cpumask.c	modified	+5	−4	View file
lib/dma-debug.c	modified	+1	−1	View file
lib/find_bit.c	added	+193	−0	View file
lib/find_last_bit.c	modified	+14	−22	View file
lib/find_next_bit.c	deleted	+0	−285	View before deletion
lib/vsprintf.c	modified	+126	−118	View file
scripts/Makefile.kasan	modified	+6	−2	View file
scripts/checkpatch.pl	modified	+141	−23	View file
scripts/spelling.txt	modified	+1	−0	View file
security/tomoyo/util.c	modified	+8	−5	View file
sound/soc/codecs/pcm512x.c	modified	+1	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

.gitignore

View file

diff --git a/.gitignore b/.gitignore
index acb6afe..4ad4a98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@
 *.order
 *.elf
 *.bin
+*.tar
 *.gz
 *.bz2
 *.lzma

Documentation/CodingStyle

View file

diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle
index 449a8a1..4d4f06d 100644
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
@@ -659,6 +659,19 @@ macros using parameters.
 #define CONSTANT 0x4000
 #define CONSTEXP (CONSTANT | 3)
 
+5) namespace collisions when defining local variables in macros resembling
+functions:
+
+#define FOO(x)				\
+({					\
+	typeof(x) ret;			\
+	ret = calc_ret(x);		\
+	(ret);				\
+)}
+
+ret is a common name for a local variable - __foo_ret is less likely
+to collide with an existing variable.
+
 The cpp manual deals with macros exhaustively. The gcc internals manual also
 covers RTL which is used frequently with assembly language in the kernel.
 

Documentation/SubmittingPatches

View file

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 447671b..b03a832 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -614,8 +614,8 @@ The canonical patch message body contains the following:
 
   - An empty line.
 
-  - The body of the explanation, which will be copied to the
-    permanent changelog to describe this patch.
+  - The body of the explanation, line wrapped at 75 columns, which will
+    be copied to the permanent changelog to describe this patch.
 
   - The "Signed-off-by:" lines, described above, which will
     also go in the changelog.

Documentation/devicetree/bindings/rtc/digicolor-rtc.txt

View file

diff --git a/Documentation/devicetree/bindings/rtc/digicolor-rtc.txt b/Documentation/devicetree/bindings/rtc/digicolor-rtc.txt
new file mode 100644
index 0000000..d464986
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/digicolor-rtc.txt
@@ -0,0 +1,17 @@
+Conexant Digicolor Real Time Clock controller
+
+This binding currently supports the CX92755 SoC.
+
+Required properties:
+- compatible: should be "cnxt,cx92755-rtc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: rtc alarm interrupt
+
+Example:
+
+	rtc@f0000c30 {
+		compatible = "cnxt,cx92755-rtc";
+		reg = <0xf0000c30 0x18>;
+		interrupts = <25>;
+	};

Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt

View file

diff --git a/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt b/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
index b800070..fa6a942 100644
--- a/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
+++ b/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
@@ -7,6 +7,11 @@ Required properties:
   region.
 - interrupts: rtc alarm interrupt
 
+Optional properties:
+- stmp,crystal-freq: override crystal frequency as determined from fuse bits.
+  Only <32000> and <32768> are possible for the hardware.  Use <0> for
+  "no crystal".
+
 Example:
 
 rtc@80056000 {

Documentation/filesystems/proc.txt

View file

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index a07ba61..8e36c7e 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -200,12 +200,12 @@ contains details information about the process itself.  Its fields are
 explained in Table 1-4.
 
 (for SMP CONFIG users)
-For making accounting scalable, RSS related information are handled in
-asynchronous manner and the vaule may not be very precise. To see a precise
+For making accounting scalable, RSS related information are handled in an
+asynchronous manner and the value may not be very precise. To see a precise
 snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
 It's slow but very precise.
 
-Table 1-2: Contents of the status files (as of 2.6.30-rc7)
+Table 1-2: Contents of the status files (as of 3.20.0)
 ..............................................................................
  Field                       Content
  Name                        filename of the executable
@@ -213,6 +213,7 @@ Table 1-2: Contents of the status files (as of 2.6.30-rc7)
                              in an uninterruptible wait, Z is zombie,
 			     T is traced or stopped)
  Tgid                        thread group ID
+ Ngid                        NUMA group ID (0 if none)
  Pid                         process id
  PPid                        process id of the parent process
  TracerPid                   PID of process tracing this process (0 if not)
@@ -220,6 +221,10 @@ Table 1-2: Contents of the status files (as of 2.6.30-rc7)
  Gid                         Real, effective, saved set, and  file system GIDs
  FDSize                      number of file descriptor slots currently allocated
  Groups                      supplementary group list
+ NStgid                      descendant namespace thread group ID hierarchy
+ NSpid                       descendant namespace process ID hierarchy
+ NSpgid                      descendant namespace process group ID hierarchy
+ NSsid                       descendant namespace session ID hierarchy
  VmPeak                      peak virtual memory size
  VmSize                      total program size
  VmLck                       locked memory size
@@ -1704,6 +1709,10 @@ A typical output is
 	flags:	0100002
 	mnt_id:	19
 
+All locks associated with a file descriptor are shown in its fdinfo too.
+
+lock:       1: FLOCK  ADVISORY  WRITE 359 00:13:11691 0 EOF
+
 The files such as eventfd, fsnotify, signalfd, epoll among the regular pos/flags
 pair provide additional information particular to the objects they represent.
 

Documentation/spi/spidev_test.c

View file

diff --git a/Documentation/spi/spidev_test.c b/Documentation/spi/spidev_test.c
index 94f574b..135b3f5 100644
--- a/Documentation/spi/spidev_test.c
+++ b/Documentation/spi/spidev_test.c
@@ -80,7 +80,7 @@ static void hex_dump(const void *src, size_t length, size_t line_size, char *pre
  *  Unescape - process hexadecimal escape character
  *      converts shell input "\x23" -> 0x23
  */
-int unespcape(char *_dst, char *_src, size_t len)
+static int unescape(char *_dst, char *_src, size_t len)
 {
 	int ret = 0;
 	char *src = _src;
@@ -304,7 +304,7 @@ int main(int argc, char *argv[])
 		size = strlen(input_tx+1);
 		tx = malloc(size);
 		rx = malloc(size);
-		size = unespcape((char *)tx, input_tx, size);
+		size = unescape((char *)tx, input_tx, size);
 		transfer(fd, tx, rx, size);
 		free(rx);
 		free(tx);

Documentation/sysctl/kernel.txt

View file

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 99d7eb3..c831001 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -872,6 +872,27 @@ can be ORed together:
 
 ==============================================================
 
+threads-max
+
+This value controls the maximum number of threads that can be created
+using fork().
+
+During initialization the kernel sets this value such that even if the
+maximum number of threads is created, the thread structures occupy only
+a part (1/8th) of the available RAM pages.
+
+The minimum value that can be written to threads-max is 20.
+The maximum value that can be written to threads-max is given by the
+constant FUTEX_TID_MASK (0x3fffffff).
+If a value outside of this range is written to threads-max an error
+EINVAL occurs.
+
+The value written is checked against the available RAM pages. If the
+thread structures would occupy too much (more than 1/8th) of the
+available RAM pages threads-max is reduced accordingly.
+
+==============================================================
+
 unknown_nmi_panic:
 
 The value in this file affects behavior of handling NMI. When the

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index bf990f5..f7bbaec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1215,6 +1215,7 @@ F:	arch/arm/mach-orion5x/ts78xx-*
 ARM/Mediatek SoC support
 M:	Matthias Brugger <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
+L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/boot/dts/mt6*
 F:	arch/arm/boot/dts/mt8*
@@ -8183,6 +8184,7 @@ X:	kernel/torture.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:	Alessandro Zummo <[email protected]>
+M:	Alexandre Belloni <[email protected]>
 L:	[email protected]
 Q:	http://patchwork.ozlabs.org/project/rtc-linux/list/
 S:	Maintained

arch/alpha/include/asm/processor.h

View file

diff --git a/arch/alpha/include/asm/processor.h b/arch/alpha/include/asm/processor.h
index b4cf036..43a7559 100644
--- a/arch/alpha/include/asm/processor.h
+++ b/arch/alpha/include/asm/processor.h
@@ -44,6 +44,7 @@ struct task_struct;
 extern unsigned long thread_saved_pc(struct task_struct *);
 
 /* Do necessary setup to start up a newly executed thread.  */
+struct pt_regs;
 extern void start_thread(struct pt_regs *, unsigned long, unsigned long);
 
 /* Free all resources held by a thread. */

arch/arc/kernel/troubleshoot.c

View file

diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index 1badf9b..e00a018 100644
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -52,7 +52,7 @@ static void show_callee_regs(struct callee_regs *cregs)
 	print_reg_file(&(cregs->r13), 13);
 }
 
-void print_task_path_n_nm(struct task_struct *tsk, char *buf)
+static void print_task_path_n_nm(struct task_struct *tsk, char *buf)
 {
 	struct path path;
 	char *path_nm = NULL;
@@ -77,7 +77,6 @@ void print_task_path_n_nm(struct task_struct *tsk, char *buf)
 done:
 	pr_info("Path: %s\n", path_nm);
 }
-EXPORT_SYMBOL(print_task_path_n_nm);
 
 static void show_faulting_vma(unsigned long address, char *buf)
 {

arch/arm/include/asm/Kbuild

View file

diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index eb0f43f..3c4596d 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -21,6 +21,7 @@ generic-y += preempt.h
 generic-y += resource.h
 generic-y += rwsem.h
 generic-y += scatterlist.h
+generic-y += seccomp.h
 generic-y += sections.h
 generic-y += segment.h
 generic-y += sembuf.h

arch/arm/include/asm/seccomp.h

View before deletion

diff --git a/arch/arm/include/asm/seccomp.h b/arch/arm/include/asm/seccomp.h
deleted file mode 100644
index 52b156b..0000000
--- a/arch/arm/include/asm/seccomp.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _ASM_ARM_SECCOMP_H
-#define _ASM_ARM_SECCOMP_H
-
-#include <linux/unistd.h>
-
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
-#endif /* _ASM_ARM_SECCOMP_H */

arch/microblaze/include/asm/seccomp.h

View file

diff --git a/arch/microblaze/include/asm/seccomp.h b/arch/microblaze/include/asm/seccomp.h
index 0d91275..204618a 100644
--- a/arch/microblaze/include/asm/seccomp.h
+++ b/arch/microblaze/include/asm/seccomp.h
@@ -3,14 +3,8 @@
 
 #include <linux/unistd.h>
 
-#define __NR_seccomp_read		__NR_read
-#define __NR_seccomp_write		__NR_write
-#define __NR_seccomp_exit		__NR_exit
 #define __NR_seccomp_sigreturn		__NR_sigreturn
 
-#define __NR_seccomp_read_32		__NR_read
-#define __NR_seccomp_write_32		__NR_write
-#define __NR_seccomp_exit_32		__NR_exit
-#define __NR_seccomp_sigreturn_32	__NR_sigreturn
+#include <asm-generic/seccomp.h>
 
 #endif	/* _ASM_MICROBLAZE_SECCOMP_H */

arch/mips/configs/ip32_defconfig

View file

diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index 70ffe9b..fe48220 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -105,7 +105,8 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
 # CONFIG_RTC_INTF_SYSFS is not set
 # CONFIG_RTC_INTF_PROC is not set
-CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1685_FAMILY=y
+CONFIG_RTC_DRV_DS1685=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y

arch/mips/include/asm/mach-ip32/mc146818rtc.h

View before deletion

diff --git a/arch/mips/include/asm/mach-ip32/mc146818rtc.h b/arch/mips/include/asm/mach-ip32/mc146818rtc.h
deleted file mode 100644
index 6b6bab4..0000000
--- a/arch/mips/include/asm/mach-ip32/mc146818rtc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1998, 2001, 03 by Ralf Baechle
- * Copyright (C) 2000 Harald Koerfgen
- *
- * RTC routines for IP32 style attached Dallas chip.
- */
-#ifndef __ASM_MACH_IP32_MC146818RTC_H
-#define __ASM_MACH_IP32_MC146818RTC_H
-
-#include <asm/ip32/mace.h>
-
-#define RTC_PORT(x)	(0x70 + (x))
-
-static unsigned char CMOS_READ(unsigned long addr)
-{
-	return mace->isa.rtc[addr << 8];
-}
-
-static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
-{
-	mace->isa.rtc[addr << 8] = data;
-}
-
-/*
- * FIXME: Do it right. For now just assume that no one lives in 20th century
- * and no O2 user in 22th century ;-)
- */
-#define mc146818_decode_year(year) ((year) + 2000)
-
-#define RTC_ALWAYS_BCD	0
-
-#endif /* __ASM_MACH_IP32_MC146818RTC_H */

arch/mips/include/asm/seccomp.h

View file

diff --git a/arch/mips/include/asm/seccomp.h b/arch/mips/include/asm/seccomp.h
index f29c75c..1d8a2e2 100644
--- a/arch/mips/include/asm/seccomp.h
+++ b/arch/mips/include/asm/seccomp.h
@@ -2,11 +2,6 @@
 
 #include <linux/unistd.h>
 
-#define __NR_seccomp_read __NR_read
-#define __NR_seccomp_write __NR_write
-#define __NR_seccomp_exit __NR_exit
-#define __NR_seccomp_sigreturn __NR_rt_sigreturn
-
 /*
  * Kludge alert:
  *
@@ -29,4 +24,6 @@
 
 #endif /* CONFIG_MIPS32_O32 */
 
+#include <asm-generic/seccomp.h>
+
 #endif /* __ASM_SECCOMP_H */

arch/mips/sgi-ip32/ip32-platform.c

View file

diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c
index 511e9ff..b522477 100644
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@ -9,10 +9,13 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
+#include <linux/rtc/ds1685.h>
 
 #include <asm/ip32/mace.h>
 #include <asm/ip32/ip32_ints.h>
 
+extern void ip32_prepare_poweroff(void);
+
 #define MACEISA_SERIAL1_OFFS   offsetof(struct sgi_mace, isa.serial1)
 #define MACEISA_SERIAL2_OFFS   offsetof(struct sgi_mace, isa.serial2)
 
@@ -90,18 +93,47 @@ static __init int sgio2btns_devinit(void)
 
 device_initcall(sgio2btns_devinit);
 
-static struct resource sgio2_cmos_rsrc[] = {
+#define MACE_RTC_RES_START (MACE_BASE + offsetof(struct sgi_mace, isa.rtc))
+#define MACE_RTC_RES_END (MACE_RTC_RES_START + 32767)
+
+static struct resource ip32_rtc_resources[] = {
 	{
-		.start = 0x70,
-		.end   = 0x71,
-		.flags = IORESOURCE_IO
+		.start	= MACEISA_RTC_IRQ,
+		.end	= MACEISA_RTC_IRQ,
+		.flags	= IORESOURCE_IRQ
+	}, {
+		.start	= MACE_RTC_RES_START,
+		.end	= MACE_RTC_RES_END,
+		.flags	= IORESOURCE_MEM,
 	}
 };
 
-static __init int sgio2_cmos_devinit(void)
+/* RTC registers on IP32 are each padded by 256 bytes (0x100). */
+static struct ds1685_rtc_platform_data
+ip32_rtc_platform_data[] = {
+	{
+		.regstep = 0x100,
+		.bcd_mode = true,
+		.no_irq = false,
+		.uie_unsupported = false,
+		.alloc_io_resources = true,
+		.plat_prepare_poweroff = ip32_prepare_poweroff,
+	},
+};
+
+struct platform_device ip32_rtc_device = {
+	.name			= "rtc-ds1685",
+	.id			= -1,
+	.dev			= {
+		.platform_data	= ip32_rtc_platform_data,
+	},
+	.num_resources		= ARRAY_SIZE(ip32_rtc_resources),
+	.resource		= ip32_rtc_resources,
+};
+
++static int __init sgio2_rtc_devinit(void)
 {
-	return IS_ERR(platform_device_register_simple("rtc_cmos", -1,
-						      sgio2_cmos_rsrc, 1));
+	return platform_device_register(&ip32_rtc_device);
 }
 
 device_initcall(sgio2_cmos_devinit);

arch/mips/sgi-ip32/ip32-reset.c

View file

diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index 44b3470..8bd415c 100644
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -11,10 +11,11 @@
 #include <linux/compiler.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/notifier.h>
 #include <linux/delay.h>
-#include <linux/ds17287rtc.h>
+#include <linux/rtc/ds1685.h>
 #include <linux/interrupt.h>
 #include <linux/pm.h>
 
@@ -33,53 +34,40 @@
 #define POWERDOWN_FREQ		(HZ / 4)
 #define PANIC_FREQ		(HZ / 8)
 
-static struct timer_list power_timer, blink_timer, debounce_timer;
-static int has_panicked, shuting_down;
+extern struct platform_device ip32_rtc_device;
 
-static void ip32_machine_restart(char *command) __noreturn;
-static void ip32_machine_halt(void) __noreturn;
-static void ip32_machine_power_off(void) __noreturn;
+static struct timer_list power_timer, blink_timer;
+static int has_panicked, shutting_down;
 
-static void ip32_machine_restart(char *cmd)
+static __noreturn void ip32_poweroff(void *data)
 {
-	crime->control = CRIME_CONTROL_HARD_RESET;
-	while (1);
-}
+	void (*poweroff_func)(struct platform_device *) =
+		symbol_get(ds1685_rtc_poweroff);
+
+#ifdef CONFIG_MODULES
+	/* If the first __symbol_get failed, our module wasn't loaded. */
+	if (!poweroff_func) {
+		request_module("rtc-ds1685");
+		poweroff_func = symbol_get(ds1685_rtc_poweroff);
+	}
+#endif
 
-static inline void ip32_machine_halt(void)
-{
-	ip32_machine_power_off();
-}
+	if (!poweroff_func)
+		pr_emerg("RTC not available for power-off.  Spinning forever ...\n");
+	else {
+		(*poweroff_func)((struct platform_device *)data);
+		symbol_put(ds1685_rtc_poweroff);
+	}
 
-static void ip32_machine_power_off(void)
-{
-	unsigned char reg_a, xctrl_a, xctrl_b;
-
-	disable_irq(MACEISA_RTC_IRQ);
-	reg_a = CMOS_READ(RTC_REG_A);
-
-	/* setup for kickstart & wake-up (DS12287 Ref. Man. p. 19) */
-	reg_a &= ~DS_REGA_DV2;
-	reg_a |= DS_REGA_DV1;
-
-	CMOS_WRITE(reg_a | DS_REGA_DV0, RTC_REG_A);
-	wbflush();
-	xctrl_b = CMOS_READ(DS_B1_XCTRL4B)
-		   | DS_XCTRL4B_ABE | DS_XCTRL4B_KFE;
-	CMOS_WRITE(xctrl_b, DS_B1_XCTRL4B);
-	xctrl_a = CMOS_READ(DS_B1_XCTRL4A) & ~DS_XCTRL4A_IFS;
-	CMOS_WRITE(xctrl_a, DS_B1_XCTRL4A);
-	wbflush();
-	/* adios amigos... */
-	CMOS_WRITE(xctrl_a | DS_XCTRL4A_PAB, DS_B1_XCTRL4A);
-	CMOS_WRITE(reg_a, RTC_REG_A);
-	wbflush();
-	while (1);
+	unreachable();
 }
 
-static void power_timeout(unsigned long data)
+static void ip32_machine_restart(char *cmd) __noreturn;
+static void ip32_machine_restart(char *cmd)
 {
-	ip32_machine_power_off();
+	msleep(20);
+	crime->control = CRIME_CONTROL_HARD_RESET;
+	unreachable();
 }
 
 static void blink_timeout(unsigned long data)
@@ -89,44 +77,27 @@ static void blink_timeout(unsigned long data)
 	mod_timer(&blink_timer, jiffies + data);
 }
 
-static void debounce(unsigned long data)
+static void ip32_machine_halt(void)
 {
-	unsigned char reg_a, reg_c, xctrl_a;
-
-	reg_c = CMOS_READ(RTC_INTR_FLAGS);
-	reg_a = CMOS_READ(RTC_REG_A);
-	CMOS_WRITE(reg_a | DS_REGA_DV0, RTC_REG_A);
-	wbflush();
-	xctrl_a = CMOS_READ(DS_B1_XCTRL4A);
-	if ((xctrl_a & DS_XCTRL4A_IFS) || (reg_c & RTC_IRQF )) {
-		/* Interrupt still being sent. */
-		debounce_timer.expires = jiffies + 50;
-		add_timer(&debounce_timer);
-
-		/* clear interrupt source */
-		CMOS_WRITE(xctrl_a & ~DS_XCTRL4A_IFS, DS_B1_XCTRL4A);
-		CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A);
-		return;
-	}
-	CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A);
-
-	if (has_panicked)
-		ip32_machine_restart(NULL);
+	ip32_poweroff(&ip32_rtc_device);
+}
 
-	enable_irq(MACEISA_RTC_IRQ);
+static void power_timeout(unsigned long data)
+{
+	ip32_poweroff(&ip32_rtc_device);
 }
 
-static inline void ip32_power_button(void)
+void ip32_prepare_poweroff(void)
 {
 	if (has_panicked)
 		return;
 
-	if (shuting_down || kill_cad_pid(SIGINT, 1)) {
+	if (shutting_down || kill_cad_pid(SIGINT, 1)) {
 		/* No init process or button pressed twice.  */
-		ip32_machine_power_off();
+		ip32_poweroff(&ip32_rtc_device);
 	}
 
-	shuting_down = 1;
+	shutting_down = 1;
 	blink_timer.data = POWERDOWN_FREQ;
 	blink_timeout(POWERDOWN_FREQ);
 