ARM64: dts: rk3399-box-rev2: enable hdmi uboot logo display

[firefly-linux-kernel-4.4.55.git] / drivers / firewire / core-cdev.c

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 4f73c727a97acd222dbeb1fcab3812092b349b43..36a7c2d89a010e7a567224c89a01a2ebe0c8fd20 100644 (file)
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -486,7 +486,7 @@ static int ioctl_get_info(struct client *client, union ioctl_arg *arg)
 static int add_client_resource(struct client *client,
                               struct client_resource *resource, gfp_t gfp_mask)
 {
-       bool preload = gfp_mask & __GFP_WAIT;
+       bool preload = gfpflags_allow_blocking(gfp_mask);
        unsigned long flags;
        int ret;
 
@@ -1214,9 +1214,9 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg)
        cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME);
 
        switch (a->clk_id) {
-       case CLOCK_REALTIME:      getnstimeofday(&ts);                   break;
-       case CLOCK_MONOTONIC:     do_posix_clock_monotonic_gettime(&ts); break;
-       case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts);                  break;
+       case CLOCK_REALTIME:      getnstimeofday(&ts);  break;
+       case CLOCK_MONOTONIC:     ktime_get_ts(&ts);    break;
+       case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break;
        default:
                ret = -EINVAL;
        }